From bbef03edea69aaea465ad773f54b768b426bb1a2 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 20 Oct 2020 18:35:40 +0530
Subject: [PATCH 01/36] chore: Update documentation for inbound email service
 (#1354)

---
 .env.example | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index 5a6ab50ba..03199dd60 100644
--- a/.env.example
+++ b/.env.example
@@ -52,11 +52,11 @@ SMTP_ENABLE_STARTTLS_AUTO=
 MAILER_INBOUND_EMAIL_DOMAIN=
 # Set this to appropriate ingress channel with regards to incoming emails
 # Possible values are :
-# :relay for Exim, Postfix, Qmail
-# :mailgun for Mailgun
-# :mandrill for Mandrill
-# :postmark for Postmark
-# :sendgrid for Sendgrid
+# relay for Exim, Postfix, Qmail
+# mailgun for Mailgun
+# mandrill for Mandrill
+# postmark for Postmark
+# sendgrid for Sendgrid
 RAILS_INBOUND_EMAIL_SERVICE=
 # Use one of the following based on the email ingress service
 # Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html

From cbe9e06472cf0b9781c5872a2f56c4871a3c44d5 Mon Sep 17 00:00:00 2001
From: Ronald Walker <rondwalker22@gmail.com>
Date: Tue, 20 Oct 2020 06:52:21 -0700
Subject: [PATCH 02/36] chore: DRY up check_authorization method (#1351)

---
 app/controllers/api/base_controller.rb                 | 6 ++++++
 app/controllers/api/v1/accounts/agents_controller.rb   | 2 +-
 app/controllers/api/v1/accounts/contacts_controller.rb | 4 ----
 app/controllers/api/v1/accounts/inboxes_controller.rb  | 4 ----
 app/controllers/api/v1/accounts/labels_controller.rb   | 4 ----
 app/controllers/api/v1/accounts/webhooks_controller.rb | 4 ----
 app/controllers/api/v1/accounts_controller.rb          | 4 ----
 7 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 1b9fa24cc..0cfd7205b 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -10,4 +10,10 @@ 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_authorization(model = nil)
+    model ||= controller_name.classify.constantize
+
+    authorize(model)
+  end
 end
diff --git a/app/controllers/api/v1/accounts/agents_controller.rb b/app/controllers/api/v1/accounts/agents_controller.rb
index dacd66e46..ed9d3ebc8 100644
--- a/app/controllers/api/v1/accounts/agents_controller.rb
+++ b/app/controllers/api/v1/accounts/agents_controller.rb
@@ -27,7 +27,7 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   private
 
   def check_authorization
-    authorize(User)
+    super(User)
   end
 
   def fetch_agent
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index a82a30414..031b8b706 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -41,10 +41,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
 
   private
 
-  def check_authorization
-    authorize(Contact)
-  end
-
   def build_contact_inbox
     return if params[:inbox_id].blank?
 
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 98163bae7..41b64b76d 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -55,10 +55,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
   end
 
-  def check_authorization
-    authorize(Inbox)
-  end
-
   def create_channel
     case permitted_params[:channel][:type]
     when 'web_widget'
diff --git a/app/controllers/api/v1/accounts/labels_controller.rb b/app/controllers/api/v1/accounts/labels_controller.rb
index 12c026e66..547b9e6d6 100644
--- a/app/controllers/api/v1/accounts/labels_controller.rb
+++ b/app/controllers/api/v1/accounts/labels_controller.rb
@@ -28,10 +28,6 @@ class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
     @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
diff --git a/app/controllers/api/v1/accounts/webhooks_controller.rb b/app/controllers/api/v1/accounts/webhooks_controller.rb
index 9e61904d6..58f9b21a0 100644
--- a/app/controllers/api/v1/accounts/webhooks_controller.rb
+++ b/app/controllers/api/v1/accounts/webhooks_controller.rb
@@ -29,8 +29,4 @@ class Api::V1::Accounts::WebhooksController < Api::V1::Accounts::BaseController
   def fetch_webhook
     @webhook = Current.account.webhooks.find(params[:id])
   end
-
-  def check_authorization
-    authorize(Webhook)
-  end
 end
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 933bd5a3a..5d7064fd0 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -44,10 +44,6 @@ class Api::V1::AccountsController < Api::BaseController
 
   private
 
-  def check_authorization
-    authorize(Account)
-  end
-
   def confirmed?
     super_admin? && params[:confirmed]
   end

From 552df63621fd417354fb97a807b5fad00178a338 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Wed, 21 Oct 2020 13:03:04 +0530
Subject: [PATCH 03/36] fix: Show File Upload for API Inbox (#1356)

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

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index f56d224a5..ba55a8a78 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -179,7 +179,8 @@ export default {
       return (
         this.isAWebWidgetInbox ||
         this.isAFacebookInbox ||
-        this.isATwilioWhatsappChannel
+        this.isATwilioWhatsappChannel ||
+        this.isAPIInbox
       );
     },
     replyButtonLabel() {

From b9be43b27646f80a5a09485943e6e21b88706f0f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Wed, 21 Oct 2020 15:18:36 +0530
Subject: [PATCH 04/36] fix: Add compact type, fix spacing in contact panel
 (#1352)

* fix: Add compact type, fix spacing in contact panel

* Set padding-top, padding-bottom
---
 app/javascript/dashboard/assets/scss/widgets/_buttons.scss   | 5 +++++
 .../routes/dashboard/conversation/contact/ContactInfoRow.vue | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
index 7e141d30e..280997559 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
@@ -38,6 +38,11 @@
   &.round {
     border-radius: $space-larger;
   }
+
+  &.compact {
+    padding-bottom: 0;
+    padding-top: 0;
+  }
 }
 
 .button--fixed-right-top {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
index 2067218e0..154dbee2a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
@@ -10,7 +10,7 @@
       <button
         v-if="showCopy"
         type="submit"
-        class="button nice link hollow grey-btn"
+        class="button nice link hollow grey-btn compact"
         @click="onCopy"
       >
         <i class="icon copy-icon ion-clipboard"></i>

From f38f778091c78bbad3ba6af6520ea4827cbeba88 Mon Sep 17 00:00:00 2001
From: Adam Zysko <1789131+azyzio@users.noreply.github.com>
Date: Fri, 23 Oct 2020 09:03:39 +0200
Subject: [PATCH 05/36] chore: Add translation text for PL in the widget
 (#1360)

---
 app/javascript/widget/i18n/locale/pl.json | 26 +++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index c0f889046..74457fa7c 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -2,26 +2,30 @@
   "COMPONENTS": {
     "FILE_BUBBLE": {
       "DOWNLOAD": "Pobierz",
-      "UPLOADING": "Uploading..."
+      "UPLOADING": "Przesyłanie..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Prześlij"
+      "SUBMIT": "Wyślij"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "Jesteśmy dostępni",
+    "OFFLINE": "Jesteśmy offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Zwykle odpowiadamy w ciągu paru minut",
+    "IN_A_FEW_HOURS": "Zwykle odpowiadamy w ciągu paru godzin",
+    "IN_A_DAY": "Zwykle odpowiadamy w przeciągu jednego dnia"
+  },
+  "START_CONVERSATION": "Rozpocznij rozmowę",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
+    "VIEW_MESSAGES_BUTTON": "Pokaż nowe wiadomości",
     "CLOSE_MESSAGES_BUTTON": "Zamknij"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "Porozmawiaj z nami"
   },
-  "POWERED_BY": "Powered by Chatwoot",
+  "POWERED_BY": "Napędzany przez Chatwoot",
   "EMAIL_PLACEHOLDER": "Wprowadź swój adres e-mail",
-  "CHAT_PLACEHOLDER": "Type your message"
+  "CHAT_PLACEHOLDER": "Wpisz treść wiadomości"
 }

From 54214c73aa4c1f9fc4f681b9f0097176627a32ec Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Sun, 25 Oct 2020 22:40:13 +0530
Subject: [PATCH 06/36] fix: Update production installation setup script for
 Ubuntu 20.04 (#1364)

Setup script for Ubuntu 20.04

Fixes: #1364
---
 deployment/{setup.sh => setup_18.04.sh} |  22 +++--
 deployment/setup_20.04.sh               |  79 +++++++++++++++++
 docs/README.md                          |   1 -
 docs/deployment/production/linux-vm.md  | 112 +++++++++++++++---------
 4 files changed, 159 insertions(+), 55 deletions(-)
 rename deployment/{setup.sh => setup_18.04.sh} (78%)
 create mode 100644 deployment/setup_20.04.sh

diff --git a/deployment/setup.sh b/deployment/setup_18.04.sh
similarity index 78%
rename from deployment/setup.sh
rename to deployment/setup_18.04.sh
index 7c19b6b40..cacd995e9 100644
--- a/deployment/setup.sh
+++ b/deployment/setup_18.04.sh
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
-#description: chatwoot installation script
-#OS: Ubuntu 18.04 LTS
-#script_version: 0.1
-
+# Description: Chatwoot installation script
+# OS: Ubuntu 18.04 LTS
+# Script Version: 0.2
 
 apt update && apt upgrade -y
 apt install -y curl
@@ -13,14 +12,13 @@ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.lis
 apt update
 
 apt install -y \
-	git-core software-properties-common imagemagick libpq-dev \
+	git software-properties-common imagemagick libpq-dev \
     libxml2-dev libxslt1-dev file g++ gcc autoconf build-essential \
-    libssl-dev libyaml-dev libreadline6-dev gnupg2 nginx redis-server \
+    libssl-dev libyaml-dev libreadline-dev gnupg2 nginx redis-server \
     redis-tools postgresql postgresql-contrib certbot \
-    python-certbot-nginx yarn patch ruby-dev zlib1g-dev liblzma-dev \
+    python-certbot-nginx nodejs yarn patch ruby-dev zlib1g-dev liblzma-dev \
     libgmp-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev
 
-
 adduser --disabled-login --gecos "" chatwoot
 
 sudo -i -u chatwoot bash << EOF
@@ -67,7 +65,6 @@ RAILS_ENV=production bundle exec rake db:reset
 rake assets:precompile RAILS_ENV=production
 EOF
 
-
 cp /home/chatwoot/chatwoot/deployment/chatwoot-web.1.service /etc/systemd/system/chatwoot-web.1.service
 cp /home/chatwoot/chatwoot/deployment/chatwoot-worker.1.service /etc/systemd/system/chatwoot-worker.1.service
 cp /home/chatwoot/chatwoot/deployment/chatwoot.target /etc/systemd/system/chatwoot.target
@@ -75,7 +72,8 @@ cp /home/chatwoot/chatwoot/deployment/chatwoot.target /etc/systemd/system/chatwo
 systemctl enable chatwoot.target
 systemctl start chatwoot.target
 
-echo "Woot! Woot!! Chatwoot installation is complete."
-echo "Goto http://<server-ip>:3000"
+echo "Woot! Woot!! Chatwoot server installation is complete"
+echo "The server will be accessible at http://<server-ip>:3000"
+echo "To configure a domain and SSL certificate, follow the guide at https://www.chatwoot.com/docs/deployment/deploy-chatwoot-in-linux-vm"
 
-#TODO: nginx
+# TODO: Auto-configure Nginx with SSL certificate
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
new file mode 100644
index 000000000..6541b6a5e
--- /dev/null
+++ b/deployment/setup_20.04.sh
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+# Description: Chatwoot installation script
+# OS: Ubuntu 20.04 LTS / Ubuntu 20.10
+# Script Version: 0.2
+
+apt update && apt upgrade -y
+apt install -y curl
+curl -sL https://deb.nodesource.com/setup_12.x | bash -
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+apt update
+
+apt install -y \
+	git software-properties-common imagemagick libpq-dev \
+    libxml2-dev libxslt1-dev file g++ gcc autoconf build-essential \
+    libssl-dev libyaml-dev libreadline-dev gnupg2 nginx redis-server \
+    redis-tools postgresql postgresql-contrib certbot \
+    python3-certbot-nginx nodejs yarn patch ruby-dev zlib1g-dev liblzma-dev \
+    libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev
+
+adduser --disabled-login --gecos "" chatwoot
+
+sudo -i -u chatwoot bash << EOF
+gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+curl -sSL https://get.rvm.io | bash -s stable
+EOF
+
+pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '')
+sudo -i -u postgres psql << EOF
+\set pass `echo $pg_pass`
+CREATE USER chatwoot CREATEDB;
+ALTER USER chatwoot PASSWORD :'pass';
+ALTER ROLE chatwoot SUPERUSER;
+EOF
+
+systemctl enable redis-server.service
+systemctl enable postgresql
+
+secret=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 63 ; echo '')
+RAILS_ENV=production
+
+sudo -i -u chatwoot << EOF
+rvm --version
+rvm autolibs disable
+rvm install "ruby-2.7.1"
+rvm use 2.7.1 --default
+
+git clone https://github.com/chatwoot/chatwoot.git
+cd chatwoot
+git checkout master
+bundle
+yarn
+
+cp .env.example .env
+sed -i -e "/SECRET_KEY_BASE/ s/=.*/=$secret/" .env
+sed -i -e '/REDIS_URL/ s/=.*/=redis:\/\/localhost:6379/' .env
+sed -i -e '/POSTGRES_HOST/ s/=.*/=localhost/' .env
+sed -i -e '/POSTGRES_USERNAME/ s/=.*/=chatwoot/' .env
+sed -i -e "/POSTGRES_PASSWORD/ s/=.*/=$pg_pass/" .env
+sed -i -e '/RAILS_ENV/ s/=.*/=$RAILS_ENV/' .env
+
+RAILS_ENV=production bundle exec rake db:create
+RAILS_ENV=production bundle exec rake db:reset
+rake assets:precompile RAILS_ENV=production
+EOF
+
+cp /home/chatwoot/chatwoot/deployment/chatwoot-web.1.service /etc/systemd/system/chatwoot-web.1.service
+cp /home/chatwoot/chatwoot/deployment/chatwoot-worker.1.service /etc/systemd/system/chatwoot-worker.1.service
+cp /home/chatwoot/chatwoot/deployment/chatwoot.target /etc/systemd/system/chatwoot.target
+
+systemctl enable chatwoot.target
+systemctl start chatwoot.target
+
+echo "Woot! Woot!! Chatwoot server installation is complete"
+echo "The server will be accessible at http://<server-ip>:3000"
+echo "To configure a domain and SSL certificate, follow the guide at https://www.chatwoot.com/docs/deployment/deploy-chatwoot-in-linux-vm"
+
+# TODO: Auto-configure Nginx with SSL certificate
diff --git a/docs/README.md b/docs/README.md
index 7f2b5d20c..6bbd7194b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -11,7 +11,6 @@ This guide will help you get started with Chatwoot!
 * [Ubuntu](/docs/installation-guide-ubuntu)
 * [Windows](/docs/installation-guide-windows)
 * [Docker](/docs/installation-guide-docker)
-* 
 
 ### Project Setup
 
diff --git a/docs/deployment/production/linux-vm.md b/docs/deployment/production/linux-vm.md
index 3ae5da258..0aeb94b2c 100644
--- a/docs/deployment/production/linux-vm.md
+++ b/docs/deployment/production/linux-vm.md
@@ -1,43 +1,62 @@
 ---
 path: "/docs/deployment/deploy-chatwoot-in-linux-vm"
-title: "Linux VM Chatwoot Production deployment guide"
+title: "Production deployment guide for 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.
+This guide will help you to install **Chatwoot** on **Ubuntu 18.04 LTS / 20.04 LTS / 20.10**. We have prepared a deployment script for you to run. Refer the script and feel free to make changes accordingly to OS if you are on a non-Ubuntu system.
 
-https://github.com/chatwoot/chatwoot/blob/develop/deployment/setup.sh
+For **Ubuntu 18.04**, use the following script
 
-### After logging in to your Linux VM as the root user perform the following steps for initial set up
+```bash
+https://raw.githubusercontent.com/chatwoot/chatwoot/develop/deployment/setup_18.04.sh
+```
 
-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`
+For **Ubuntu 20.04** or **Ubuntu 20.10**, use the following script.
 
-### Configure ngix and letsencrypt
+```bash
+https://raw.githubusercontent.com/chatwoot/chatwoot/develop/deployment/setup_20.04.sh
+```
 
-1. configure Nginx to serve as a frontend proxy by following steps in your shell
+### Steps to install
+
+1. Create a **setup.sh** file and copy the content from the above link or use the following commands.
+
+```bash
+wget <link-to-script> -O setup.sh
+chmod 755 setup.sh
+./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_address}:3000`
+
+### Configure Nginx and **Let's Encrypt**
+
+1. Configure Nginx to serve as a frontend proxy.
 
 ```bash
 cd /etc/nginx/sites-enabled
 nano yourdomain.com.conf
 ```
 
-2. Add the required Nginx config after replacing the `yourdomain.com` in `server_name`.
+2. Use the following Nginx config after replacing the `yourdomain.com` in `server_name` .
 
 ```bash
 server {
-  server_name yourdomain.com;
-  # where rails app is running
-  set $upstream 127.0.0.1:3000;
-  underscores_in_headers on;
+  server_name <yourdomain.com>;
 
-  # Here we define the web-root for our SSL proof
+  # Point upstream to Chatwoot App Server
+  set $upstream 127.0.0.1:3000;
+
+  # Nginx strips out underscore in headers by default
+  # Chatwoot relies on underscore in headers for API
+  # Make sure that the config is turned on.
+  underscores_in_headers on;
   location /.well-known {
-     # Note that a request for /.well-known/test.html will be made
-     alias /var/www/ssl-proof/chatwoot/.well-known;
+    alias /var/www/ssl-proof/chatwoot/.well-known;
   }
 
   location / {
@@ -48,11 +67,14 @@ server {
     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;
@@ -63,63 +85,69 @@ server {
 
 3. Verify and reload your Nginx config by running following command.
 
-```sh
+```bash
 nginx -t
 systemctl reload nginx
 ```
 
-4. Run Letsencrypt and configure SSL
+4. Run **Let's Encrypt** and configure **SSL certificate**.
 
-```sh
+```bash
 mkdir -p /var/www/ssl-proof/chatwoot/.well-known
-certbot --webroot -w /var/www/ssl-proof/chatwoot/  -d yourdomain.com  -i nginx
+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.
+5. Your 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.
+For your Chatwoot installation to properly function you would need to configure some of the essential environment variables like `FRONTEND_URL`, Mailer and a cloud storage config. Refer **[Environment variables](https://www.chatwoot.com/docs/environment-variables)** for the full list.
 
-1. Login as chatwoot and edit the .env file.
+1. Login as **Chatwoot** and edit the .env file.
+
+```bash
+# Login as chatwoot user
 
-```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
+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 your self hosted Chatwoot.
+
+```bash
 systemctl restart chatwoot.target
 ```
 
-### Updating your Chatwoot Installation on a Linux VM
+### Upgrading to newer version of Chatwoot
 
-Run the following steps on your VM if you made use of our installation script Or making changes accordingly to your OS
+Whenever a new version of Chatwoot is released, use the following steps to upgrade your instance.
 
-```
-# login as chatwoot user 
+Run the following steps on your VM. Make changes based o your OS if you are on a non-Ubuntu system.
+
+```bash
+# Login as Chatwoot user
 sudo -i -u chatwoot
 
-# navigate to the chatwoot directory
-cd chatwoot 
+# Navigate to the Chatwoot directory
+cd chatwoot
 
-# pull the latest version of the master branch
-git pull
+# Pull the latest version of the master branch
+git checkout master && git pull
 
-# update dependencies 
+# Update dependencies
 bundle
 yarn
 
-# recompile the assets 
+# Recompile the assets
 rake assets:precompile RAILS_ENV=production
 
-# migrate the database schema
+# Migrate the database schema
 RAILS_ENV=production bundle exec rake db:migrate
 
-#Restart the chatwoot server
+# Restart the chatwoot server
 systemctl restart chatwoot.target
+
 ```

From fa864cc9eefc77a8b2c9f9fde9ffd81f5506c520 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 26 Oct 2020 00:28:23 +0530
Subject: [PATCH 07/36] fix: Add a full width image view to fix resolution
 issues (#1363)

---
 .../scss/widgets/_conversation-view.scss      |  2 +-
 app/javascript/dashboard/components/Modal.vue | 28 ++++++++++++++++---
 .../widgets/conversation/bubble/Image.vue     |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index dde956eaa..c511ee243 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -34,7 +34,7 @@
     }
 
     .modal-image {
-      max-width: 80%;
+      max-width: 85%;
     }
 
     &::before {
diff --git a/app/javascript/dashboard/components/Modal.vue b/app/javascript/dashboard/components/Modal.vue
index 6838b308c..88138cf86 100644
--- a/app/javascript/dashboard/components/Modal.vue
+++ b/app/javascript/dashboard/components/Modal.vue
@@ -6,7 +6,7 @@
       transition="modal"
       @click="onBackDropClick"
     >
-      <div class="modal-container" :class="className" @click.stop>
+      <div :class="modalContainerClassName" @click.stop>
         <i class="ion-android-close modal--close" @click="close"></i>
         <slot />
       </div>
@@ -26,9 +26,18 @@ export default {
       type: Function,
       required: true,
     },
-    className: {
-      type: String,
-      default: '',
+    fullWidth: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    modalContainerClassName() {
+      let className = 'modal-container';
+      if (this.fullWidth) {
+        return `${className} modal-container--full-width`;
+      }
+      return className;
     },
   },
   mounted() {
@@ -50,3 +59,14 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.modal-container--full-width {
+  align-items: center;
+  border-radius: 0;
+  display: flex;
+  height: 100%;
+  justify-content: center;
+  width: 100%;
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Image.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Image.vue
index a3d09424e..124ce09c9 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Image.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Image.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="image message-text__wrap">
     <img :src="url" @click="onClick" />
-    <woot-modal :show.sync="show" :on-close="onClose">
+    <woot-modal :full-width="true" :show.sync="show" :on-close="onClose">
       <img :src="url" class="modal-image" />
     </woot-modal>
   </div>

From 46098f2970528ca711827a3ccfeaabbc2c14535a Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 26 Oct 2020 00:31:19 +0530
Subject: [PATCH 08/36] chore: Monkey patch Azure Storage Service (#1366)

Monkey patch azure storage service until the changes come into rails stable versions
---
 .rubocop.yml                                  |   1 +
 .../azure_storage_service_patch.rb            | 170 ++++++++++++++++++
 lib/azure/storage.rb                          |   2 +
 .../core/auth/shared_access_signature.rb      |   2 +
 4 files changed, 175 insertions(+)
 create mode 100644 config/initializers/azure_storage_service_patch.rb
 create mode 100644 lib/azure/storage.rb
 create mode 100644 lib/azure/storage/core/auth/shared_access_signature.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index c27b9651b..9cd50a44f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -124,3 +124,4 @@ AllCops:
     - 'tmp/**/*'
     - 'storage/**/*'
     - 'db/migrate/20200225162150_init_schema.rb'
+    - 'config/initializers/azure_storage_service_patch.rb'
diff --git a/config/initializers/azure_storage_service_patch.rb b/config/initializers/azure_storage_service_patch.rb
new file mode 100644
index 000000000..82a0cbd14
--- /dev/null
+++ b/config/initializers/azure_storage_service_patch.rb
@@ -0,0 +1,170 @@
+# TODO: Remove this once the changes comes into rails version
+# https://github.com/Azure/azure-storage-ruby/issues/166#issuecomment-637696565 
+# Remove this once the changes comes into rails version
+
+# code from current master : https://github.com/rails/rails/blob/8520cc77133d9ff642e2c393b4ee5eae2a2a28b6/activestorage/lib/active_storage/service/azure_storage_service.rb
+
+require 'azure/storage/blob'
+require 'active_storage/service/azure_storage_service'
+module ActiveStorage
+  # Wraps the Microsoft Azure Storage Blob Service as an Active Storage service.
+  # See ActiveStorage::Service for the generic API documentation that applies to all services.
+  class Service::AzureStorageService < Service
+    attr_reader :client, :container, :signer
+
+    def initialize(storage_account_name:, storage_access_key:, container:, public: false, **options)
+      @client = Azure::Storage::Blob::BlobService.create(storage_account_name: storage_account_name, storage_access_key: storage_access_key, **options)
+      @signer = Azure::Storage::Common::Core::Auth::SharedAccessSignature.new(storage_account_name, storage_access_key)
+      @container = container
+      @public = public
+    end
+
+    def upload(key, io, checksum: nil, filename: nil, content_type: nil, disposition: nil, **)
+      instrument :upload, key: key, checksum: checksum do
+        handle_errors do
+          content_disposition = content_disposition_with(filename: filename, type: disposition) if disposition && filename
+
+          client.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum, content_type: content_type, content_disposition: content_disposition)
+        end
+      end
+    end
+
+    def download(key, &block)
+      if block_given?
+        instrument :streaming_download, key: key do
+          stream(key, &block)
+        end
+      else
+        instrument :download, key: key do
+          handle_errors do
+            _, io = client.get_blob(container, key)
+            io.force_encoding(Encoding::BINARY)
+          end
+        end
+      end
+    end
+
+    def download_chunk(key, range)
+      instrument :download_chunk, key: key, range: range do
+        handle_errors do
+          _, io = client.get_blob(container, key, start_range: range.begin, end_range: range.exclude_end? ? range.end - 1 : range.end)
+          io.force_encoding(Encoding::BINARY)
+        end
+      end
+    end
+
+    def delete(key)
+      instrument :delete, key: key do
+        client.delete_blob(container, key)
+      rescue Azure::Core::Http::HTTPError => e
+        raise unless e.type == "BlobNotFound"
+        # Ignore files already deleted
+      end
+    end
+
+    def delete_prefixed(prefix)
+      instrument :delete_prefixed, prefix: prefix do
+        marker = nil
+
+        loop do
+          results = client.list_blobs(container, prefix: prefix, marker: marker)
+
+          results.each do |blob|
+            client.delete_blob(container, blob.name)
+          end
+
+          break unless marker = results.continuation_token.presence
+        end
+      end
+    end
+
+    def exist?(key)
+      instrument :exist, key: key do |payload|
+        answer = blob_for(key).present?
+        payload[:exist] = answer
+        answer
+      end
+    end
+
+    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
+      instrument :url, key: key do |payload|
+        generated_url = signer.signed_uri(
+          uri_for(key), false,
+          service: "b",
+          permissions: "rw",
+          expiry: format_expiry(expires_in)
+        ).to_s
+
+        payload[:url] = generated_url
+
+        generated_url
+      end
+    end
+
+    def headers_for_direct_upload(key, content_type:, checksum:, filename: nil, disposition: nil, **)
+      content_disposition = content_disposition_with(type: disposition, filename: filename) if filename
+
+      { "Content-Type" => content_type, "Content-MD5" => checksum, "x-ms-blob-content-disposition" => content_disposition, "x-ms-blob-type" => "BlockBlob" }
+    end
+
+    private
+      def private_url(key, expires_in:, filename:, disposition:, content_type:, **)
+        signer.signed_uri(
+          uri_for(key), false,
+          service: "b",
+          permissions: "r",
+          expiry: format_expiry(expires_in),
+          content_disposition: content_disposition_with(type: disposition, filename: filename),
+          content_type: content_type
+        ).to_s
+      end
+
+      def public_url(key, **)
+        uri_for(key).to_s
+      end
+
+
+      def uri_for(key)
+        client.generate_uri("#{container}/#{key}")
+      end
+
+      def blob_for(key)
+        client.get_blob_properties(container, key)
+      rescue Azure::Core::Http::HTTPError
+        false
+      end
+
+      def format_expiry(expires_in)
+        expires_in ? Time.now.utc.advance(seconds: expires_in).iso8601 : nil
+      end
+
+      # Reads the object for the given key in chunks, yielding each to the block.
+      def stream(key)
+        blob = blob_for(key)
+
+        chunk_size = 5.megabytes
+        offset = 0
+
+        raise ActiveStorage::FileNotFoundError unless blob.present?
+
+        while offset < blob.properties[:content_length]
+          _, chunk = client.get_blob(container, key, start_range: offset, end_range: offset + chunk_size - 1)
+          yield chunk.force_encoding(Encoding::BINARY)
+          offset += chunk_size
+        end
+      end
+
+      def handle_errors
+        yield
+      rescue Azure::Core::Http::HTTPError => e
+        case e.type
+        when "BlobNotFound"
+          raise ActiveStorage::FileNotFoundError
+        when "Md5Mismatch"
+          raise ActiveStorage::IntegrityError
+        else
+          raise
+        end
+      end
+  end
+end
\ No newline at end of file
diff --git a/lib/azure/storage.rb b/lib/azure/storage.rb
new file mode 100644
index 000000000..f0bb9129a
--- /dev/null
+++ b/lib/azure/storage.rb
@@ -0,0 +1,2 @@
+# https://github.com/Azure/azure-storage-ruby/issues/166#issuecomment-637696565
+# Remove this once the changes comes into rails
diff --git a/lib/azure/storage/core/auth/shared_access_signature.rb b/lib/azure/storage/core/auth/shared_access_signature.rb
new file mode 100644
index 000000000..ba10b61c0
--- /dev/null
+++ b/lib/azure/storage/core/auth/shared_access_signature.rb
@@ -0,0 +1,2 @@
+# TODO: Remove this once the changes comes into rails version
+# https://github.com/Azure/azure-storage-ruby/issues/166#issuecomment-637696565

From d0f2ed38c1890bc572a2871c3c94c44a1a66c9e4 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Tue, 27 Oct 2020 18:48:23 +0530
Subject: [PATCH 09/36] fix: Add lib/azure to autoload ignore list (#1368)

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

diff --git a/config/application.rb b/config/application.rb
index 29943a011..fc74dcf52 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,6 +15,7 @@ module Chatwoot
 
     config.autoload_paths << Rails.root.join('lib')
     config.eager_load_paths << Rails.root.join('lib')
+    Rails.autoloaders.main.ignore(Rails.root.join('lib/azure'))
 
     # This is required in production for zeitwerk to autoload the file
     config.paths.add File.join('app', 'bot'), glob: File.join('**', '*.rb')

From 9045b8d9ca19dfb5a1ff96e8c2f8bfe7852908c9 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 27 Oct 2020 23:52:55 +0900
Subject: [PATCH 10/36] chore: Fixed typos (#1369)

---
 lib/integrations/facebook/message_parser.rb | 2 +-
 lib/tasks/swagger.rake                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/integrations/facebook/message_parser.rb b/lib/integrations/facebook/message_parser.rb
index 6ddad68f9..9832fd7c0 100644
--- a/lib/integrations/facebook/message_parser.rb
+++ b/lib/integrations/facebook/message_parser.rb
@@ -46,7 +46,7 @@ class Integrations::Facebook::MessageParser
   end
 end
 
-# Sample Reponse
+# Sample Response
 # {
 #   "sender":{
 #     "id":"USER_ID"
diff --git a/lib/tasks/swagger.rake b/lib/tasks/swagger.rake
index c13147aee..ef48ce3eb 100644
--- a/lib/tasks/swagger.rake
+++ b/lib/tasks/swagger.rake
@@ -14,7 +14,7 @@ namespace :swagger do
         logging: true
       )
       File.write('swagger.json', JSON.pretty_generate(final_build))
-      puts 'Swagger build was succesful.'
+      puts 'Swagger build was successful.'
       puts "Generated #{base_path}/swagger.json"
       puts 'Go to http://localhost:3000/swagger see the changes.'
     end

From ff96d43953c60d40a7ebb9b31e45c65f7aa0ad8c Mon Sep 17 00:00:00 2001
From: Abhishek <abhishek.ism.5035@gmail.com>
Date: Wed, 28 Oct 2020 02:52:57 +0800
Subject: [PATCH 11/36] feat: notify on slack disconnect (#1323)

---
 .../channel_notifications_mailer.rb           | 10 ++++++++++
 app/models/concerns/reauthorizable.rb         |  2 +-
 app/models/integrations/hook.rb               |  6 ++++++
 .../slack_disconnect.liquid                   |  8 ++++++++
 .../slack/send_on_slack_service.rb            | 20 +++++++++++++------
 .../slack/send_on_slack_service_spec.rb       | 19 ++++++++++++++++++
 6 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 app/mailers/administrator_notifications/channel_notifications_mailer.rb
 create mode 100644 app/views/mailers/administrator_notifications/channel_notifications_mailer/slack_disconnect.liquid

diff --git a/app/mailers/administrator_notifications/channel_notifications_mailer.rb b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
new file mode 100644
index 000000000..6eee1ef42
--- /dev/null
+++ b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
@@ -0,0 +1,10 @@
+class AdministratorNotifications::ChannelNotificationsMailer < ApplicationMailer
+  def slack_disconnect(account)
+    return unless smtp_config_set_or_development?
+
+    emails = account.administrators.pluck(:email)
+    subject = 'Your Slack integration has expired'
+    @action_url = "#{ENV['FRONTEND_URL']}/app/accounts/#{account.id}/settings/integrations/slack"
+    send_mail_with_liquid(to: emails, subject: subject) and return
+  end
+end
diff --git a/app/models/concerns/reauthorizable.rb b/app/models/concerns/reauthorizable.rb
index e20e24bd8..960e57322 100644
--- a/app/models/concerns/reauthorizable.rb
+++ b/app/models/concerns/reauthorizable.rb
@@ -36,7 +36,7 @@ module Reauthorizable
   # could used to manually prompt reauthorization if auth scope changes
   def prompt_reauthorization!
     ::Redis::Alfred.set(reauthorization_required_key, true)
-    # TODO: send_reauthorize_prompt_email
+    AdministratorNotifications::ChannelNotificationsMailer.slack_disconnect(account)&.deliver_later if (is_a? Integrations::Hook) && slack?
   end
 
   # call this after you successfully Reauthorized the object in UI
diff --git a/app/models/integrations/hook.rb b/app/models/integrations/hook.rb
index 82796a2f5..2df57ec2a 100644
--- a/app/models/integrations/hook.rb
+++ b/app/models/integrations/hook.rb
@@ -15,6 +15,8 @@
 #  reference_id :string
 #
 class Integrations::Hook < ApplicationRecord
+  include Reauthorizable
+
   validates :account_id, presence: true
   validates :app_id, presence: true
 
@@ -33,4 +35,8 @@ class Integrations::Hook < ApplicationRecord
   def slack?
     app_id == 'slack'
   end
+
+  def disable
+    update(status: 'disabled')
+  end
 end
diff --git a/app/views/mailers/administrator_notifications/channel_notifications_mailer/slack_disconnect.liquid b/app/views/mailers/administrator_notifications/channel_notifications_mailer/slack_disconnect.liquid
new file mode 100644
index 000000000..2394a5958
--- /dev/null
+++ b/app/views/mailers/administrator_notifications/channel_notifications_mailer/slack_disconnect.liquid
@@ -0,0 +1,8 @@
+<p>Hello,</p>
+
+<p>Your Slack integration has expired. </p>
+<p>Please reconnect Slack to continue receiving messages on Slack</p>
+
+<p>
+Click <a href="{{action_url}}">here</a> to re-connect.
+</p>
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 1ec42d009..051ac0fcb 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -41,17 +41,25 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   end
 
   def send_message
-    sender = message.sender
-    sender_type = sender.class == Contact ? 'Contact' : 'Agent'
-    sender_name = sender.try(:name) ? "#{sender_type}: #{sender.try(:name)}" : sender_type
-
     @slack_message = slack_client.chat_postMessage(
       channel: hook.reference_id,
       text: message_content,
-      username: sender_name,
+      username: sender_name(message.sender),
       thread_ts: conversation.identifier,
-      icon_url: avatar_url(sender)
+      icon_url: avatar_url(message.sender)
     )
+  rescue Slack::Web::Api::Errors::AccountInactive => e
+    Rails.logger.info e
+    hook.authorization_error!
+    hook.disable if hook.enabled?
+  end
+
+  def sender_name(sender)
+    sender.try(:name) ? "#{sender_type(sender)}: #{sender.try(:name)}" : sender_type(sender)
+  end
+
+  def sender_type(sender)
+    sender.class == Contact ? 'Contact' : 'Agent'
   end
 
   def update_reference_id
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 0fd8270fd..dc36de65f 100644
--- a/spec/lib/integrations/slack/send_on_slack_service_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -27,5 +27,24 @@ describe Integrations::Slack::SendOnSlackService do
 
       builder.perform
     end
+
+    it 'disables hook on Slack AccountInactive error' do
+      builder = described_class.new(message: message, hook: hook)
+      slack_client = double
+      expect(builder).to receive(:slack_client).and_return(slack_client)
+      expect(slack_client).to receive(:chat_postMessage).with(
+        channel: hook.reference_id,
+        text: message.content,
+        username: "Contact: #{message.sender.name}",
+        thread_ts: conversation.identifier,
+        icon_url: anything
+      ).and_raise(Slack::Web::Api::Errors::AccountInactive.new('Account disconnected'))
+
+      allow(hook).to receive(:authorization_error!)
+
+      builder.perform
+      expect(hook).to be_disabled
+      expect(hook).to have_received(:authorization_error!)
+    end
   end
 end

From 1d9debaee0313a2fddb1cf1257a6bb28398e98a9 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 28 Oct 2020 02:14:36 +0530
Subject: [PATCH 12/36] feat: IP lookup (#1315)

- feature to store contact IP for accounts
- IP lookup through geocoder gem
- ability to do IP lookup through external APIs
- add commit hook to prevent push to develop and master
- migrations to fix default values for jsonb columns
---
 .env.example                                  | 11 ++++
 .gitignore                                    |  1 +
 Gemfile                                       |  6 ++
 Gemfile.lock                                  |  4 ++
 .../api/v1/accounts/contacts_controller.rb    | 12 +++-
 app/jobs/contact_ip_lookup_job.rb             | 57 +++++++++++++++++++
 app/models/contact.rb                         |  7 +++
 bin/validate_push                             | 13 +++++
 config/features.yml                           |  2 +
 config/initializers/geocoder.rb               | 32 +++++++++++
 ...73944_add_default_value_to_jsonb_colums.rb |  8 +++
 db/schema.rb                                  | 12 ++--
 package.json                                  |  3 +-
 spec/models/conversation_spec.rb              |  2 +-
 .../event_data_presenter_spec.rb              |  2 +-
 vendor/db/.keep                               |  0
 16 files changed, 163 insertions(+), 9 deletions(-)
 create mode 100644 app/jobs/contact_ip_lookup_job.rb
 create mode 100644 bin/validate_push
 create mode 100644 config/initializers/geocoder.rb
 create mode 100644 db/migrate/20201019173944_add_default_value_to_jsonb_colums.rb
 create mode 100644 vendor/db/.keep

diff --git a/.env.example b/.env.example
index 03199dd60..405548032 100644
--- a/.env.example
+++ b/.env.example
@@ -117,6 +117,17 @@ IOS_APP_ID=6C953F3RX2.com.chatwoot.app
 ## Bot Customizations
 USE_INBOX_AVATAR_FOR_BOT=true
 
+
+
+## IP look up configuration
+## ref https://github.com/alexreisner/geocoder/blob/master/README_API_GUIDE.md
+## works only on accounts with ip look up feature enabled
+# IP_LOOKUP_SERVICE=geoip2
+# maxmindb api key to use geoip2 service
+# IP_LOOKUP_API_KEY=
+
 ## Development Only Config
 # if you want to use letter_opener for local emails
 # LETTER_OPENER=true
+
+
diff --git a/.gitignore b/.gitignore
index 146ae509f..7c63cfa98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
 /tmp/*
 !/log/.keep
 !/tmp/.keep
+*.mmdb
 
 # Ignore Byebug command history file.
 .byebug_history
diff --git a/Gemfile b/Gemfile
index 32dab102c..ba24662fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,6 +90,12 @@ gem 'sidekiq'
 gem 'fcm'
 gem 'webpush'
 
+##-- geocoding / parse location from ip --##
+# http://www.rubygeocoder.com/
+gem 'geocoder'
+# to parse maxmind db
+gem 'maxminddb'
+
 group :development do
   gem 'annotate'
   gem 'bullet'
diff --git a/Gemfile.lock b/Gemfile.lock
index a616cdf68..8b9ea88b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -201,6 +201,7 @@ GEM
     ffi (1.13.1)
     flag_shih_tzu (0.3.23)
     foreman (0.87.2)
+    geocoder (1.6.3)
     gli (2.19.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -290,6 +291,7 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
+    maxminddb (0.1.22)
     memoist (0.16.2)
     method_source (1.0.0)
     mime-types (3.3.1)
@@ -578,6 +580,7 @@ DEPENDENCIES
   fcm
   flag_shih_tzu
   foreman
+  geocoder
   google-cloud-storage
   groupdate
   haikunator
@@ -590,6 +593,7 @@ DEPENDENCIES
   letter_opener
   liquid
   listen
+  maxminddb
   mini_magick
   mock_redis!
   pg
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index 031b8b706..55428b24a 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -19,13 +19,16 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def create
     ActiveRecord::Base.transaction do
       @contact = Current.account.contacts.new(contact_params)
+      set_ip
       @contact.save!
       @contact_inbox = build_contact_inbox
     end
   end
 
   def update
-    @contact.update!(contact_update_params)
+    @contact.assign_attributes(contact_update_params)
+    set_ip
+    @contact.save!
   rescue ActiveRecord::RecordInvalid => e
     render json: {
       message: e.record.errors.full_messages.join(', '),
@@ -67,4 +70,11 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def fetch_contact
     @contact = Current.account.contacts.includes(contact_inboxes: [:inbox]).find(params[:id])
   end
+
+  def set_ip
+    return if @contact.account.feature_enabled?('ip_lookup')
+
+    @contact[:additional_attributes][:created_at_ip] ||= request.remote_ip
+    @contact[:additional_attributes][:updated_at_ip] = request.remote_ip
+  end
 end
diff --git a/app/jobs/contact_ip_lookup_job.rb b/app/jobs/contact_ip_lookup_job.rb
new file mode 100644
index 000000000..b0cefbac0
--- /dev/null
+++ b/app/jobs/contact_ip_lookup_job.rb
@@ -0,0 +1,57 @@
+require 'rubygems/package'
+
+class ContactIpLookupJob < ApplicationJob
+  queue_as :default
+
+  def perform(contact)
+    return unless ensure_look_up_service
+
+    update_contact_location_from_ip(contact)
+  rescue Errno::ETIMEDOUT => e
+    Rails.logger.info "Exception: ip resolution failed : #{e.message}"
+  end
+
+  private
+
+  def ensure_look_up_service
+    return if ENV['IP_LOOKUP_SERVICE'].blank? || ENV['IP_LOOKUP_API_KEY'].blank?
+    return true if ENV['IP_LOOKUP_SERVICE'].to_sym != :geoip2
+
+    ensure_look_up_db
+  end
+
+  def update_contact_location_from_ip(contact)
+    ip = get_contact_ip(contact)
+    return if ip.blank?
+
+    contact.additional_attributes['city'] = Geocoder.search(ip).first.city
+    contact.additional_attributes['country'] = Geocoder.search(ip).first.country
+    contact.save!
+  end
+
+  def get_contact_ip(contact)
+    contact.additional_attributes['updated_at_ip'] || contact.additional_attributes['created_at_ip']
+  end
+
+  def ensure_look_up_db
+    return true if File.exist?(GeocoderConfiguration::LOOK_UP_DB)
+
+    setup_vendor_db
+  end
+
+  def setup_vendor_db
+    base_url = 'https://download.maxmind.com/app/geoip_download'
+    source = URI.open("#{base_url}?edition_id=GeoLite2-City&suffix=tar.gz&license_key=#{ENV['IP_LOOKUP_API_KEY']}")
+    tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(source))
+    tar_extract.rewind
+
+    tar_extract.each do |entry|
+      next unless entry.full_name.include?('GeoLite2-City.mmdb') && entry.file?
+
+      File.open GeocoderConfiguration::LOOK_UP_DB, 'wb' do |f|
+        f.print entry.read
+      end
+      return true
+    end
+  end
+end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index d9f27a6e4..c6f6a00a4 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -40,6 +40,7 @@ class Contact < ApplicationRecord
   before_validation :prepare_email_attribute
   after_create_commit :dispatch_create_event
   after_update_commit :dispatch_update_event
+  after_commit :ip_lookup
 
   def get_source_id(inbox_id)
     contact_inboxes.find_by!(inbox_id: inbox_id).source_id
@@ -68,6 +69,12 @@ class Contact < ApplicationRecord
     }
   end
 
+  def ip_lookup
+    return unless account.feature_enabled?('ip_lookup')
+
+    ContactIpLookupJob.perform_later(self)
+  end
+
   def prepare_email_attribute
     # So that the db unique constraint won't throw error when email is ''
     self.email = nil if email.blank?
diff --git a/bin/validate_push b/bin/validate_push
new file mode 100644
index 000000000..7b06f8883
--- /dev/null
+++ b/bin/validate_push
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# script prevents pushing to develop and master by mistake
+
+branch="$(git rev-parse --abbrev-ref HEAD)"
+
+if [ "$branch" = "master" ]; then
+  echo "You can't push directly to master branch"
+  exit 1
+elif [ "$branch" = "develop" ]; then
+  echo "You can't push directly to develop branch"
+  exit 1
+fi
diff --git a/config/features.yml b/config/features.yml
index ab683e29a..54dd79f33 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -7,3 +7,5 @@
   enabled: true
 - name: channel_twitter
   enabled: true
+- name: ip_lookup
+  enabled: false
\ No newline at end of file
diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb
new file mode 100644
index 000000000..aa34b8030
--- /dev/null
+++ b/config/initializers/geocoder.rb
@@ -0,0 +1,32 @@
+# Geocoding options
+# timeout: 3,                 # geocoding service timeout (secs)
+# lookup: :nominatim,         # name of geocoding service (symbol)
+# ip_lookup: :ipinfo_io,      # name of IP address geocoding service (symbol)
+# language: :en,              # ISO-639 language code
+# use_https: false,           # use HTTPS for lookup requests? (if supported)
+# http_proxy: nil,            # HTTP proxy server (user:pass@host:port)
+# https_proxy: nil,           # HTTPS proxy server (user:pass@host:port)
+# api_key: nil,               # API key for geocoding service
+# cache: nil,                 # cache object (must respond to #[], #[]=, and #del)
+# cache_prefix: 'geocoder:',  # prefix (string) to use for all cache keys
+
+# Exceptions that should not be rescued by default
+# (if you want to implement custom error handling);
+# supports SocketError and Timeout::Error
+# always_raise: [],
+
+# Calculation options
+# units: :mi,                 # :km for kilometers or :mi for miles
+# distances: :linear          # :spherical or :linear
+
+module GeocoderConfiguration
+  LOOK_UP_DB = Rails.root.join('vendor/db/GeoLiteCity.mmdb')
+end
+
+if ENV['IP_LOOKUP_SERVICE'].present?
+  if ENV['IP_LOOKUP_SERVICE'] == 'geoip2'
+    Geocoder.configure(ip_lookup: :geoip2, geoip2: { file: GeocoderConfiguration::LOOK_UP_DB })
+  else
+    Geocoder.configure(ip_lookup: ENV['IP_LOOKUP_SERVICE'].to_sym, api_key: ENV['IP_LOOKUP_API_KEY'])
+  end
+end
diff --git a/db/migrate/20201019173944_add_default_value_to_jsonb_colums.rb b/db/migrate/20201019173944_add_default_value_to_jsonb_colums.rb
new file mode 100644
index 000000000..1b6394af9
--- /dev/null
+++ b/db/migrate/20201019173944_add_default_value_to_jsonb_colums.rb
@@ -0,0 +1,8 @@
+class AddDefaultValueToJsonbColums < ActiveRecord::Migration[6.0]
+  def change
+    change_column_default :contacts, :additional_attributes, from: nil, to: {}
+    change_column_default :conversations, :additional_attributes, from: nil, to: {}
+    change_column_default :installation_configs, :serialized_value, from: '{}', to: {}
+    change_column_default :notification_subscriptions, :subscription_attributes, from: '{}', to: {}
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e13447587..d50af9ed3 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_10_11_152227) do
+ActiveRecord::Schema.define(version: 2020_10_19_173944) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -203,7 +203,7 @@ ActiveRecord::Schema.define(version: 2020_10_11_152227) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "pubsub_token"
-    t.jsonb "additional_attributes"
+    t.jsonb "additional_attributes", default: {}
     t.string "identifier"
     t.jsonb "custom_attributes", default: {}
     t.index ["account_id"], name: "index_contacts_on_account_id"
@@ -224,7 +224,7 @@ ActiveRecord::Schema.define(version: 2020_10_11_152227) do
     t.datetime "contact_last_seen_at"
     t.datetime "agent_last_seen_at"
     t.boolean "locked", default: false
-    t.jsonb "additional_attributes"
+    t.jsonb "additional_attributes", default: {}
     t.bigint "contact_inbox_id"
     t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false
     t.string "identifier"
@@ -285,7 +285,7 @@ ActiveRecord::Schema.define(version: 2020_10_11_152227) do
 
   create_table "installation_configs", force: :cascade do |t|
     t.string "name", null: false
-    t.jsonb "serialized_value", default: "{}", null: false
+    t.jsonb "serialized_value", default: {}, null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.index ["name", "created_at"], name: "index_installation_configs_on_name_and_created_at", unique: true
@@ -399,7 +399,7 @@ ActiveRecord::Schema.define(version: 2020_10_11_152227) do
   create_table "notification_subscriptions", force: :cascade do |t|
     t.bigint "user_id", null: false
     t.integer "subscription_type", null: false
-    t.jsonb "subscription_attributes", default: "{}", null: false
+    t.jsonb "subscription_attributes", default: {}, null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.string "identifier"
@@ -452,9 +452,11 @@ ActiveRecord::Schema.define(version: 2020_10_11_152227) 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/package.json b/package.json
index 884213f93..31f854bba 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,8 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged"
+      "pre-commit": "lint-staged",
+      "pre-push": "sh bin/validate_push"
     }
   },
   "jest": {
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 617d4ff75..bc2a5f5c5 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -377,7 +377,7 @@ RSpec.describe Conversation, type: :model do
     let(:conversation) { create(:conversation) }
     let(:expected_data) do
       {
-        additional_attributes: nil,
+        additional_attributes: {},
         meta: {
           sender: conversation.contact.push_event_data,
           assignee: conversation.assignee
diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb
index 5c8cbd004..487545906 100644
--- a/spec/presenters/conversations/event_data_presenter_spec.rb
+++ b/spec/presenters/conversations/event_data_presenter_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Conversations::EventDataPresenter do
   describe '#push_data' do
     let(:expected_data) do
       {
-        additional_attributes: nil,
+        additional_attributes: {},
         meta: {
           sender: conversation.contact.push_event_data,
           assignee: conversation.assignee
diff --git a/vendor/db/.keep b/vendor/db/.keep
new file mode 100644
index 000000000..e69de29bb

From 85738f640858a332a8d3d94158d1d0ee9abda500 Mon Sep 17 00:00:00 2001
From: Ricardo <6526545+RicardoRamirezR@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:44:58 -0500
Subject: [PATCH 13/36] Added missing keywords (#1365)

---
 .../dashboard/i18n/locale/es/contact.json     |  3 +++
 .../dashboard/i18n/locale/es/inboxMgmt.json   | 19 ++++++++++++++++---
 .../dashboard/i18n/locale/es/settings.json    |  4 +++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 777dcfd0c..6b8fd9653 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "No Disponible",
     "EMAIL_ADDRESS": "Dirección de correo",
     "PHONE_NUMBER": "Número de teléfono",
+    "COPY_SUCCESSFUL": "Copiado al portapapeles satisfactoriamente",
     "COMPANY": "Empresa",
     "LOCATION": "Ubicación",
     "CONVERSATION_TITLE": "Detalles de la conversación",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "No hay etiquetas añadidas a esta conversación."
     },
     "MUTE_CONTACT": "Silenciar Conversación",
+    "UNMUTE_CONTACT": "Cancelar silienciar Conversación",
     "MUTED_SUCCESS": "Ésta conversación está silenciada por 6 horas",
+    "UNMUTED_SUCCESS": "Ésta conversación ya no está silenciada",
     "SEND_TRANSCRIPT": "Enviar Transcripción",
     "EDIT_LABEL": "Editar"
   },
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 8211fdc07..da8a5f6cd 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Activado",
           "DISABLED": "Deshabilitado"
         },
+        "REPLY_TIME": {
+          "TITLE": "Establecer tiempo de respuesta",
+          "IN_A_FEW_MINUTES": "En algunos minutos",
+          "IN_A_FEW_HOURS": "En unas horas",
+          "IN_A_DAY": "En un día",
+          "HELP_TEXT": "Éste tiempo se mostrará en el widget del chat"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Color del widget",
           "PLACEHOLDER": "Actualizar el color del widget usado en el widget"
@@ -170,8 +177,8 @@
       }
     },
     "DETAILS": {
-      "LOADING_FB": "Autenticándote con Facebook...",
-      "ERROR_FB_AUTH": "Algo salió mal, Por favor actualize la página...",
+      "LOADING_FB": "Autenticándolo con Facebook...",
+      "ERROR_FB_AUTH": "Algo salió mal, por favor actualize la página...",
       "CREATING_CHANNEL": "Creando su bandeja de entrada...",
       "TITLE": "Configurar detalles de la Bandeja de Entrada",
       "DESC": ""
@@ -183,7 +190,7 @@
     "FINISH": {
       "TITLE": "¡Su bandeja de entrada está lista!",
       "MESSAGE": "Ahora puede colaborar con sus clientes a través de su nuevo canal. Feliz soporte ",
-      "BUTTON_TEXT": "Llévame allí",
+      "BUTTON_TEXT": "Lléveme allí",
       "WEBSITE_SUCCESS": "Ha terminado de crear un canal del sitio web. Copie el código que se muestra a continuación y pégelo en su sitio web. La próxima vez que un cliente use el chat en vivo, la conversación aparecerá automáticamente en su bandeja de entrada."
     },
     "REAUTH": "Reautorizar",
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Ajustes de la Bandeja de Entrada",
       "INBOX_UPDATE_SUB_TEXT": "Actualizar la configuración de su bandeja de entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activar o desactivar la asignación automática de nuevas conversaciones a los agentes añadidos a esta bandeja de entrada."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reautorizar",
+      "SUBTITLE": "Su conexión de Facebook expiró, por favor reconecte si página de Facebook para continuar con el servicio",
+      "MESSAGE_SUCCESS": "Reconección satisfactoria",
+      "MESSAGE_ERROR": "Se presento un error, por favor inténtelo de nuevo"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 378214b0e..fadc3cd01 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Notificaciones por email",
         "NOTE": "Actualize sus preferencias de notificación por correo electrónico aquí",
         "CONVERSATION_ASSIGNMENT": "Enviar notificaciones por correo electrónico cuando se me ha asignado una conversación",
-        "CONVERSATION_CREATION": "Enviar notificaciones por correo electrónico cuando se crea una nueva conversación"
+        "CONVERSATION_CREATION": "Enviar notificaciones por correo electrónico cuando se crea una nueva conversación",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envirar notificaciones por correo electrónico cuando un nuevo mensaje es creado en una conversación asignada"
       },
       "API": {
         "UPDATE_SUCCESS": "Sus preferencias de notificación se actualizaron correctamente",
@@ -37,6 +38,7 @@
         "NOTE": "Actualize sus preferencias de notificaciones push aquí",
         "CONVERSATION_ASSIGNMENT": "Enviar notificaciones push cuando se me ha asignado una conversación",
         "CONVERSATION_CREATION": "Enviar notificaciones push cuando se crea una nueva conversación",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Enviar notificaciones push cuando un nuevo mensaja es creadao en una conversación asignada",
         "HAS_ENABLED_PUSH": "Has habilitado notificaciones push para este navegador.",
         "REQUEST_PUSH": "Habilitar notificaciones push"
       },

From 84ce0a9054494c0ea96a2239880132134c88e46c Mon Sep 17 00:00:00 2001
From: Nico385412 <nico.hansse@gmail.com>
Date: Fri, 30 Oct 2020 07:36:51 +0100
Subject: [PATCH 14/36] fix: Make the bubble text not selectable (#1294)

---
 app/javascript/sdk/sdk.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/sdk/sdk.js b/app/javascript/sdk/sdk.js
index e5ea385e5..aeb3d41db 100644
--- a/app/javascript/sdk/sdk.js
+++ b/app/javascript/sdk/sdk.js
@@ -30,6 +30,7 @@ export const SDK_CSS = `.woot-widget-holder {
   position: fixed;
   width: 64px !important;
   z-index: 2147483000 !important;
+  user-select: none;
 }
 
 .woot-widget-bubble.woot-widget--expanded {

From 12b7358773987e8af944992722a3322b941a8d67 Mon Sep 17 00:00:00 2001
From: Yih Yang <yyngo788n88@hotmail.com>
Date: Sat, 31 Oct 2020 00:57:25 +0800
Subject: [PATCH 15/36] feat: Add messages on mute / unmute actions (#1373)

---
 app/models/conversation.rb       | 20 ++++++++++++++++++++
 config/locales/en.yml            |  2 ++
 spec/models/conversation_spec.rb | 22 ++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index e6c187f48..c54bbe9ac 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -87,10 +87,12 @@ class Conversation < ApplicationRecord
   def mute!
     resolved!
     Redis::Alfred.setex(mute_key, 1, mute_period)
+    create_muted_message
   end
 
   def unmute!
     Redis::Alfred.delete(mute_key)
+    create_unmuted_message
   end
 
   def muted?
@@ -248,6 +250,24 @@ class Conversation < ApplicationRecord
     messages.create(activity_message_params(content))
   end
 
+  def create_muted_message
+    return unless Current.user
+
+    params = { user_name: Current.user.name }
+    content = I18n.t('conversations.activity.muted', **params)
+
+    messages.create(activity_message_params(content))
+  end
+
+  def create_unmuted_message
+    return unless Current.user
+
+    params = { user_name: Current.user.name }
+    content = I18n.t('conversations.activity.unmuted', **params)
+
+    messages.create(activity_message_params(content))
+  end
+
   def mute_key
     format('CONVERSATION::%<id>d::MUTED', id: id)
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 508d6e6e6..b60e3a4bd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -54,6 +54,8 @@ en:
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index bc2a5f5c5..77b3c466e 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -276,8 +276,14 @@ RSpec.describe Conversation, type: :model do
   describe '#mute!' do
     subject(:mute!) { conversation.mute! }
 
+    let(:user) do
+      create(:user, email: 'agent2@example.com', account: create(:account), role: :agent)
+    end
+
     let(:conversation) { create(:conversation) }
 
+    before { Current.user = user }
+
     it 'marks conversation as resolved' do
       mute!
       expect(conversation.reload.resolved?).to eq(true)
@@ -287,13 +293,24 @@ RSpec.describe Conversation, type: :model do
       mute!
       expect(Redis::Alfred.get(conversation.send(:mute_key))).not_to eq(nil)
     end
+
+    it 'creates mute message' do
+      mute!
+      expect(conversation.messages.pluck(:content)).to include("#{user.name} has muted the conversation")
+    end
   end
 
   describe '#unmute!' do
     subject(:unmute!) { conversation.unmute! }
 
+    let(:user) do
+      create(:user, email: 'agent2@example.com', account: create(:account), role: :agent)
+    end
+
     let(:conversation) { create(:conversation).tap(&:mute!) }
 
+    before { Current.user = user }
+
     it 'does not change conversation status' do
       expect { unmute! }.not_to(change { conversation.reload.status })
     end
@@ -303,6 +320,11 @@ RSpec.describe Conversation, type: :model do
         .to change { Redis::Alfred.get(conversation.send(:mute_key)) }
         .to nil
     end
+
+    it 'creates unmute message' do
+      unmute!
+      expect(conversation.messages.pluck(:content)).to include("#{user.name} has unmuted the conversation")
+    end
   end
 
   describe '#muted?' do

From 3d64ba49fca8d3537e970c83491f19579b84d172 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Sat, 31 Oct 2020 15:32:55 +0530
Subject: [PATCH 16/36] chore: Upgrade tailwindcss to 1.9.x (#1376)

---
 package.json |   2 +-
 yarn.lock    | 120 ++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index 31f854bba..5cf4bc3ac 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "md5": "^2.3.0",
     "query-string": "5",
     "spinkit": "~1.2.5",
-    "tailwindcss": "^1.8.3",
+    "tailwindcss": "^1.9.6",
     "tween.js": "~16.6.0",
     "url-loader": "^2.0.0",
     "v-tooltip": "~2.0.2",
diff --git a/yarn.lock b/yarn.lock
index a47a7d7b2..09ba479d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1621,7 +1621,12 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
-acorn@^7.0.0, acorn@^7.1.1:
+acorn@^7.0.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
+acorn@^7.1.1:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
   integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
@@ -1718,7 +1723,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
   integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
@@ -1726,6 +1731,13 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
 any-observable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
@@ -2411,7 +2423,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.6.4, browserslist@^4.8.3:
+browserslist@^4.0.0, browserslist@^4.6.4, browserslist@^4.8.3:
   version "4.14.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000"
   integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==
@@ -2421,6 +2433,16 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.6.4, browserslist@^4.
     escalade "^3.0.2"
     node-releases "^1.1.60"
 
+browserslist@^4.12.0:
+  version "4.14.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
+  integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
+  dependencies:
+    caniuse-lite "^1.0.30001135"
+    electron-to-chromium "^1.3.571"
+    escalade "^3.1.0"
+    node-releases "^1.1.61"
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -2598,11 +2620,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981:
   version "1.0.30001117"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001117.tgz#69a9fae5d480eaa9589f7641a83842ad396d17c4"
   integrity sha512-4tY0Fatzdx59kYjQs+bNxUwZB03ZEBgVmJ1UkFPz/Q8OLiUUbjct2EdpnXj0fvFTPej2EkbPIG0w8BWsjAyk1Q==
 
+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111, caniuse-lite@^1.0.30001135:
+  version "1.0.30001154"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz#f3bbc245ce55e4c1cd20fa731b097880181a7f17"
+  integrity sha512-y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -2915,15 +2942,15 @@ color-name@^1.0.0, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
-  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
+color-string@^1.5.2, color-string@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
+  integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color@^3.0.0, color@^3.1.2:
+color@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
   integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==
@@ -2931,6 +2958,14 @@ color@^3.0.0, color@^3.1.2:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+color@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
+  integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
+  dependencies:
+    color-convert "^1.9.1"
+    color-string "^1.5.4"
+
 colorette@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
@@ -3885,10 +3920,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.523:
-  version "1.3.542"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.542.tgz#0a48ff708646a54189ecbbed88a49d73dd14ce8c"
-  integrity sha512-9Wm4o9h2CE/h4PDBkE5Ff2ha4frgltV/BgVCwFK8Tc9DKF19xJK85zA82JFah0/+oe8SU3rYRWtlYZH58pC6Ng==
+electron-to-chromium@^1.3.523, electron-to-chromium@^1.3.571:
+  version "1.3.585"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.585.tgz#71cdb722c73488b9475ad1c572cf43a763ef9081"
+  integrity sha512-xoeqjMQhgHDZM7FiglJAb2aeOxHZWFruUc3MbAGTgE7GB8rr5fTn1Sdh5THGuQtndU3GuXlu91ZKqRivxoCZ/A==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -4008,10 +4043,10 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-escalade@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
-  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
+escalade@^3.0.2, escalade@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -5655,6 +5690,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
+  integrity sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -7432,10 +7474,10 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.60:
-  version "1.1.60"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
-  integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
+node-releases@^1.1.60, node-releases@^1.1.61:
+  version "1.1.65"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.65.tgz#52d9579176bd60f23eba05c4438583f341944b81"
+  integrity sha512-YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==
 
 node-sass@^4.14.1:
   version "4.14.1"
@@ -8740,13 +8782,14 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
     uniq "^1.0.1"
 
 postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
-  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
+  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
   dependencies:
     cssesc "^3.0.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
+    util-deprecate "^1.0.2"
 
 postcss-svgo@^4.0.2:
   version "4.0.2"
@@ -8786,7 +8829,7 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss@7.0.32, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+postcss@7.0.32, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.32"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
   integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -8804,6 +8847,15 @@ postcss@^6.0.9:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
+postcss@^7.0.11, postcss@^7.0.18, postcss@^7.0.32:
+  version "7.0.35"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -9405,13 +9457,21 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.14.2:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
+  integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==
+  dependencies:
+    is-core-module "^2.0.0"
+    path-parse "^1.0.6"
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -10363,9 +10423,9 @@ table@^5.2.3:
     string-width "^3.0.0"
 
 tailwindcss@^1.8.3:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.8.4.tgz#867a831640b0edf26517a691f6b6f5bd09aa3adf"
-  integrity sha512-UW1giHUBuMVUwzff0vVbvGOdx1r8+4onN8LCblzncstdFVyuiZ2wCnkv2RQiSAlMTHaNu8vAAhm/fw3flmCi0Q==
+  version "1.9.6"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.9.6.tgz#0c5089911d24e1e98e592a31bfdb3d8f34ecf1a0"
+  integrity sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==
   dependencies:
     "@fullhuman/postcss-purgecss" "^2.1.2"
     autoprefixer "^9.4.5"
@@ -10864,7 +10924,7 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

From 65ed4c78a42889803691dd631b05c0d15e21a6be Mon Sep 17 00:00:00 2001
From: Adam Zysko <1789131+azyzio@users.noreply.github.com>
Date: Sat, 31 Oct 2020 19:44:33 +0100
Subject: [PATCH 17/36] feat: Business hours

Data models and APIs for business hours

ref: #234
---
 .gitignore                                    |  2 +-
 .../api/v1/accounts/inboxes_controller.rb     |  1 +
 .../v1/accounts/working_hours_controller.rb   | 18 +++++
 app/models/account.rb                         |  2 +
 app/models/channel/web_widget.rb              |  2 +-
 app/models/concerns/out_of_offisable.rb       | 30 ++++++++
 app/models/inbox.rb                           |  3 +
 app/models/message.rb                         |  1 +
 app/models/working_hour.rb                    | 71 +++++++++++++++++++
 .../hook_execution_service.rb                 | 10 ++-
 .../template/out_of_office.rb                 | 28 ++++++++
 config/routes.rb                              |  1 +
 .../20201027135006_create_working_hours.rb    | 40 +++++++++++
 db/schema.rb                                  | 20 +++++-
 lib/current.rb                                |  5 ++
 spec/factories/messages.rb                    |  2 +-
 spec/factories/working_hours.rb               | 12 ++++
 spec/models/concerns/out_of_offisable_spec.rb | 19 +++++
 spec/models/inbox_spec.rb                     |  5 ++
 spec/models/working_hour_spec.rb              | 29 ++++++++
 spec/rails_helper.rb                          |  1 +
 .../hook_execution_service_spec.rb            | 21 ++++++
 .../template/out_of_office_spec.rb            | 13 ++++
 23 files changed, 329 insertions(+), 7 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/working_hours_controller.rb
 create mode 100644 app/models/concerns/out_of_offisable.rb
 create mode 100644 app/models/working_hour.rb
 create mode 100644 app/services/message_templates/template/out_of_office.rb
 create mode 100644 db/migrate/20201027135006_create_working_hours.rb
 create mode 100644 spec/factories/working_hours.rb
 create mode 100644 spec/models/concerns/out_of_offisable_spec.rb
 create mode 100644 spec/models/working_hour_spec.rb
 create mode 100644 spec/services/message_templates/template/out_of_office_spec.rb

diff --git a/.gitignore b/.gitignore
index 7c63cfa98..0c71b2055 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,4 +59,4 @@ package-lock.json
 
 
 # cypress
-test/cypress/videos/*
\ No newline at end of file
+test/cypress/videos/*
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 41b64b76d..a2a879376 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -80,6 +80,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
 
   def inbox_update_params
     params.permit(:enable_auto_assignment, :name, :avatar, :greeting_message, :greeting_enabled,
+                  :working_hours_enabled, :out_of_office_message,
                   channel: [
                     :website_url,
                     :widget_color,
diff --git a/app/controllers/api/v1/accounts/working_hours_controller.rb b/app/controllers/api/v1/accounts/working_hours_controller.rb
new file mode 100644
index 000000000..96d98293a
--- /dev/null
+++ b/app/controllers/api/v1/accounts/working_hours_controller.rb
@@ -0,0 +1,18 @@
+class Api::V1::Accounts::WorkingHoursController < Api::V1::Accounts::BaseController
+  before_action :check_authorization
+  before_action :fetch_webhook, only: [:update]
+
+  def update
+    @working_hour.update!(working_hour_params)
+  end
+
+  private
+
+  def working_hour_params
+    params.require(:working_hour).permit(:inbox_id, :open_hour, :open_minutes, :close_hour, :close_minutes, :closed_all_day)
+  end
+
+  def fetch_working_hour
+    @working_hour = Current.account.working_hours.find(params[:id])
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 6df7e2e03..d977235e1 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -9,6 +9,7 @@
 #  name           :string           not null
 #  settings_flags :integer          default(0), not null
 #  support_email  :string(100)
+#  timezone       :string           default("UTC")
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #
@@ -48,6 +49,7 @@ class Account < ApplicationRecord
   has_many :labels, dependent: :destroy
   has_many :notification_settings, dependent: :destroy
   has_many :hooks, dependent: :destroy, class_name: 'Integrations::Hook'
+  has_many :working_hours, dependent: :destroy
   has_many :kbase_portals, dependent: :destroy, class_name: '::Kbase::Portal'
   has_many :kbase_categories, dependent: :destroy, class_name: '::Kbase::Category'
   has_many :kbase_articles, dependent: :destroy, class_name: '::Kbase::Article'
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index c840441ac..637403f64 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -4,7 +4,7 @@
 #
 #  id              :integer          not null, primary key
 #  feature_flags   :integer          default(3), not null
-#  reply_time      :integer          default(0)
+#  reply_time      :integer          default("in_a_few_minutes")
 #  website_token   :string
 #  website_url     :string
 #  welcome_tagline :string
diff --git a/app/models/concerns/out_of_offisable.rb b/app/models/concerns/out_of_offisable.rb
new file mode 100644
index 000000000..0bfcbde32
--- /dev/null
+++ b/app/models/concerns/out_of_offisable.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module OutOfOffisable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :working_hours, dependent: :destroy
+    after_create :create_default_working_hours
+  end
+
+  def out_of_office?
+    working_hours_enabled? && working_hours.today.closed_now?
+  end
+
+  def working_now?
+    !out_of_office?
+  end
+
+  private
+
+  def create_default_working_hours
+    working_hours.create!(day_of_week: 1, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    working_hours.create!(day_of_week: 2, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    working_hours.create!(day_of_week: 3, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    working_hours.create!(day_of_week: 4, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    working_hours.create!(day_of_week: 5, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    working_hours.create!(day_of_week: 6, closed_all_day: true)
+    working_hours.create!(day_of_week: 7, closed_all_day: true)
+  end
+end
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 51dc47da7..663078e70 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -11,6 +11,8 @@
 #  greeting_enabled       :boolean          default(FALSE)
 #  greeting_message       :string
 #  name                   :string           not null
+#  out_of_office_message  :string
+#  working_hours_enabled  :boolean          default(FALSE)
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #  account_id             :integer          not null
@@ -24,6 +26,7 @@
 class Inbox < ApplicationRecord
   include Reportable
   include Avatarable
+  include OutOfOffisable
 
   validates :account_id, presence: true
 
diff --git a/app/models/message.rb b/app/models/message.rb
index c1348a75d..bae73fc1e 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -62,6 +62,7 @@ class Message < ApplicationRecord
   # .succ is a hack to avoid https://makandracards.com/makandra/1057-why-two-ruby-time-objects-are-not-equal-although-they-appear-to-be
   scope :unread_since, ->(datetime) { where('EXTRACT(EPOCH FROM created_at) > (?)', datetime.to_i.succ) }
   scope :chat, -> { where.not(message_type: :activity).where(private: false) }
+  scope :today, -> { where("date_trunc('day', created_at) = ?", Date.current) }
   default_scope { order(created_at: :asc) }
 
   belongs_to :account
diff --git a/app/models/working_hour.rb b/app/models/working_hour.rb
new file mode 100644
index 000000000..e73759ac0
--- /dev/null
+++ b/app/models/working_hour.rb
@@ -0,0 +1,71 @@
+# == Schema Information
+#
+# Table name: working_hours
+#
+#  id             :bigint           not null, primary key
+#  close_hour     :integer
+#  close_minutes  :integer
+#  closed_all_day :boolean          default(FALSE)
+#  day_of_week    :integer          not null
+#  open_hour      :integer
+#  open_minutes   :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  account_id     :bigint
+#  inbox_id       :bigint
+#
+# Indexes
+#
+#  index_working_hours_on_account_id  (account_id)
+#  index_working_hours_on_inbox_id    (inbox_id)
+#
+class WorkingHour < ApplicationRecord
+  belongs_to :inbox
+
+  before_save :assign_account
+
+  validates :open_hour,     presence: true, unless: :closed_all_day?
+  validates :open_minutes,  presence: true, unless: :closed_all_day?
+  validates :close_hour,    presence: true, unless: :closed_all_day?
+  validates :close_minutes, presence: true, unless: :closed_all_day?
+
+  validates :open_hour,     inclusion: 0..23, unless: :closed_all_day?
+  validates :close_hour,    inclusion: 0..23, unless: :closed_all_day?
+  validates :open_minutes,  inclusion: 0..59, unless: :closed_all_day?
+  validates :close_minutes, inclusion: 0..59, unless: :closed_all_day?
+
+  validate :close_after_open, unless: :closed_all_day?
+
+  def self.today
+    find_by(day_of_week: Date.current.cwday)
+  end
+
+  def open_at?(time)
+    return false if closed_all_day?
+
+    time.hour >= open_hour &&
+      time.min  >= open_minutes &&
+      time.hour <= close_hour &&
+      time.min  <= close_minutes
+  end
+
+  def open_now?
+    open_at?(Time.zone.now)
+  end
+
+  def closed_now?
+    !open_now?
+  end
+
+  private
+
+  def assign_account
+    self.account_id = inbox.account_id
+  end
+
+  def close_after_open
+    return unless open_hour.hours + open_minutes.minutes >= close_hour.hours + close_minutes.minutes
+
+    errors.add(:close_hour, 'Closing time cannot be before opening time')
+  end
+end
diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index 7fd41ab61..f8371aad9 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -4,8 +4,8 @@ class MessageTemplates::HookExecutionService
   def perform
     return if inbox.agent_bot_inbox&.active?
 
+    ::MessageTemplates::Template::OutOfOffice.new(conversation: conversation).perform if should_send_out_of_office_message?
     ::MessageTemplates::Template::Greeting.new(conversation: conversation).perform if should_send_greeting?
-
     ::MessageTemplates::Template::EmailCollect.new(conversation: conversation).perform if should_send_email_collect?
   end
 
@@ -14,12 +14,16 @@ class MessageTemplates::HookExecutionService
   delegate :inbox, :conversation, to: :message
   delegate :contact, to: :conversation
 
+  def should_send_out_of_office_message?
+    inbox.out_of_office? && conversation.messages.today.template.empty? && inbox.out_of_office_message.present?
+  end
+
   def first_message_from_contact?
     conversation.messages.outgoing.count.zero? && conversation.messages.template.count.zero?
   end
 
   def should_send_greeting?
-    first_message_from_contact? && conversation.inbox.greeting_enabled? && conversation.inbox.greeting_message.present?
+    first_message_from_contact? && inbox.greeting_enabled? && inbox.greeting_message.present?
   end
 
   def email_collect_was_sent?
@@ -27,7 +31,7 @@ class MessageTemplates::HookExecutionService
   end
 
   def should_send_email_collect?
-    !contact_has_email? && conversation.inbox.web_widget? && !email_collect_was_sent?
+    !contact_has_email? && inbox.web_widget? && !email_collect_was_sent?
   end
 
   def contact_has_email?
diff --git a/app/services/message_templates/template/out_of_office.rb b/app/services/message_templates/template/out_of_office.rb
new file mode 100644
index 000000000..eb0a19c7f
--- /dev/null
+++ b/app/services/message_templates/template/out_of_office.rb
@@ -0,0 +1,28 @@
+class MessageTemplates::Template::OutOfOffice
+  pattr_initialize [:conversation!]
+
+  def perform
+    ActiveRecord::Base.transaction do
+      conversation.messages.create!(out_of_office_message_params)
+    end
+  rescue StandardError => e
+    Raven.capture_exception(e)
+    true
+  end
+
+  private
+
+  delegate :contact, :account, to: :conversation
+  delegate :inbox, to: :message
+
+  def out_of_office_message_params
+    content = @conversation.inbox&.out_of_office_message
+
+    {
+      account_id: @conversation.account_id,
+      inbox_id: @conversation.inbox_id,
+      message_type: :template,
+      content: content
+    }
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index f0dfd57ff..291373ca1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,6 +100,7 @@ Rails.application.routes.draw do
             resources :apps, only: [:index, :show]
             resource :slack, only: [:create, :update, :destroy], controller: 'slack'
           end
+          resources :working_hours, only: [:update]
 
           namespace :kbase do
             resources :portals do
diff --git a/db/migrate/20201027135006_create_working_hours.rb b/db/migrate/20201027135006_create_working_hours.rb
new file mode 100644
index 000000000..6d06e385f
--- /dev/null
+++ b/db/migrate/20201027135006_create_working_hours.rb
@@ -0,0 +1,40 @@
+class CreateWorkingHours < ActiveRecord::Migration[6.0]
+  def change
+    create_table :working_hours do |t|
+      t.belongs_to :inbox
+      t.belongs_to :account
+
+      t.integer :day_of_week, null: false
+      t.boolean :closed_all_day, default: false
+      t.integer :open_hour
+      t.integer :open_minutes
+      t.integer :close_hour
+      t.integer :close_minutes
+
+      t.timestamps
+    end
+
+    add_column :accounts, :timezone, :string, default: 'UTC'
+
+    change_table :inboxes, bulk: true do |t|
+      t.boolean :working_hours_enabled, default: false
+      t.string :out_of_office_message
+    end
+
+    Inbox.where.not(id: WorkingHour.select(:inbox_id)).each do |inbox|
+      create_working_hours_for_inbox(inbox)
+    end
+  end
+
+  private
+
+  def create_working_hours_for_inbox(inbox)
+    inbox.working_hours.create!(day_of_week: 1, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    inbox.working_hours.create!(day_of_week: 2, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    inbox.working_hours.create!(day_of_week: 3, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    inbox.working_hours.create!(day_of_week: 4, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    inbox.working_hours.create!(day_of_week: 5, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
+    inbox.working_hours.create!(day_of_week: 6, closed_all_day: true)
+    inbox.working_hours.create!(day_of_week: 7, closed_all_day: true)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d50af9ed3..37aa4dc3e 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_10_19_173944) do
+ActiveRecord::Schema.define(version: 2020_10_27_135006) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -49,6 +49,7 @@ ActiveRecord::Schema.define(version: 2020_10_19_173944) do
     t.string "support_email", limit: 100
     t.integer "settings_flags", default: 0, null: false
     t.integer "feature_flags", default: 0, null: false
+    t.string "timezone", default: "UTC"
   end
 
   create_table "action_mailbox_inbound_emails", force: :cascade do |t|
@@ -280,6 +281,8 @@ ActiveRecord::Schema.define(version: 2020_10_19_173944) do
     t.boolean "greeting_enabled", default: false
     t.string "greeting_message"
     t.string "email_address"
+    t.boolean "working_hours_enabled", default: false
+    t.string "out_of_office_message"
     t.index ["account_id"], name: "index_inboxes_on_account_id"
   end
 
@@ -513,6 +516,21 @@ ActiveRecord::Schema.define(version: 2020_10_19_173944) do
     t.index ["account_id", "url"], name: "index_webhooks_on_account_id_and_url", unique: true
   end
 
+  create_table "working_hours", force: :cascade do |t|
+    t.bigint "inbox_id"
+    t.bigint "account_id"
+    t.integer "day_of_week", null: false
+    t.boolean "closed_all_day", default: false
+    t.integer "open_hour"
+    t.integer "open_minutes"
+    t.integer "close_hour"
+    t.integer "close_minutes"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["account_id"], name: "index_working_hours_on_account_id"
+    t.index ["inbox_id"], name: "index_working_hours_on_inbox_id"
+  end
+
   add_foreign_key "account_users", "accounts"
   add_foreign_key "account_users", "users"
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
diff --git a/lib/current.rb b/lib/current.rb
index 71e69ead7..cbc07cbed 100644
--- a/lib/current.rb
+++ b/lib/current.rb
@@ -2,4 +2,9 @@ module Current
   thread_mattr_accessor :user
   thread_mattr_accessor :account
   thread_mattr_accessor :account_user
+
+  def account=(account)
+    super
+    Time.zone = account.timezone
+  end
 end
diff --git a/spec/factories/messages.rb b/spec/factories/messages.rb
index ed9574e8b..9a0d3be47 100644
--- a/spec/factories/messages.rb
+++ b/spec/factories/messages.rb
@@ -10,7 +10,7 @@ FactoryBot.define do
 
     after(:build) do |message|
       message.sender ||= message.outgoing? ? create(:user, account: message.account) : create(:contact, account: message.account)
-      message.inbox ||= create(:inbox, account: message.account)
+      message.inbox ||= message.conversation&.inbox || create(:inbox, account: message.account)
       message.conversation ||= create(:conversation, account: message.account, inbox: message.inbox)
     end
   end
diff --git a/spec/factories/working_hours.rb b/spec/factories/working_hours.rb
new file mode 100644
index 000000000..156caedd2
--- /dev/null
+++ b/spec/factories/working_hours.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :working_hour do
+    inbox
+    day_of_week   { 1 }
+    open_hour     { 9 }
+    open_minutes  { 0 }
+    close_hour    { 17 }
+    close_minutes { 0 }
+  end
+end
diff --git a/spec/models/concerns/out_of_offisable_spec.rb b/spec/models/concerns/out_of_offisable_spec.rb
new file mode 100644
index 000000000..cbdef0e81
--- /dev/null
+++ b/spec/models/concerns/out_of_offisable_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+shared_examples_for 'out_of_offisable' do
+  let(:obj) { create(described_class.to_s.underscore, working_hours_enabled: true, out_of_office_message: 'Message') }
+
+  it 'has after create callback' do
+    expect(obj.working_hours.count).to eq(7)
+  end
+
+  it 'is working on monday 10am' do
+    travel_to '26.10.2020 10:00'.to_datetime
+    expect(obj.working_now?).to be true
+  end
+
+  it 'is out of office on sunday 1pm' do
+    travel_to '01.11.2020 13:00'.to_datetime
+    expect(obj.out_of_office?).to be true
+  end
+end
diff --git a/spec/models/inbox_spec.rb b/spec/models/inbox_spec.rb
index e494173e8..04dd265ce 100644
--- a/spec/models/inbox_spec.rb
+++ b/spec/models/inbox_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require Rails.root.join 'spec/models/concerns/out_of_offisable_spec.rb'
 
 RSpec.describe Inbox do
   describe 'validations' do
@@ -33,6 +34,10 @@ RSpec.describe Inbox do
     it { is_expected.to have_many(:hooks) }
   end
 
+  describe 'concerns' do
+    it_behaves_like 'out_of_offisable'
+  end
+
   describe '#add_member' do
     let(:inbox) { FactoryBot.create(:inbox) }
     let(:user) { FactoryBot.create(:user) }
diff --git a/spec/models/working_hour_spec.rb b/spec/models/working_hour_spec.rb
new file mode 100644
index 000000000..6222b8f7f
--- /dev/null
+++ b/spec/models/working_hour_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe WorkingHour do
+  context 'when on monday 10am' do
+    before do
+      Time.zone = 'UTC'
+      create(:working_hour)
+      travel_to '26.10.2020 10:00'.to_datetime
+    end
+
+    it 'is considered working hour' do
+      expect(described_class.today.open_now?).to be true
+    end
+  end
+
+  context 'when on sunday 1pm' do
+    before do
+      Time.zone = 'UTC'
+      create(:working_hour, day_of_week: 7, closed_all_day: true)
+      travel_to '01.11.2020 13:00'.to_datetime
+    end
+
+    it 'is considered out of office' do
+      expect(described_class.today.closed_now?).to be true
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index bb4475cca..b219a337c 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -65,6 +65,7 @@ RSpec.configure do |config|
   # config.filter_gems_from_backtrace("gem name")
   config.include SlackStubs
   config.include Devise::Test::IntegrationHelpers, type: :request
+  config.include ActiveSupport::Testing::TimeHelpers
 end
 
 Shoulda::Matchers.configure do |config|
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index 07cd303d3..ce64d2bb2 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -45,4 +45,25 @@ describe ::MessageTemplates::HookExecutionService do
       expect(email_collect_service).to have_received(:perform)
     end
   end
+
+  context 'when it is after working hours' do
+    it 'calls ::MessageTemplates::Template::OutOfOffice' do
+      contact = create :contact
+      conversation = create :conversation, contact: contact
+
+      conversation.inbox.update(working_hours_enabled: true, out_of_office_message: 'We are out of office')
+      conversation.inbox.working_hours.today.update!(closed_all_day: true)
+
+      out_of_office_service = double
+
+      allow(::MessageTemplates::Template::OutOfOffice).to receive(:new).and_return(out_of_office_service)
+      allow(out_of_office_service).to receive(:perform).and_return(true)
+
+      # described class gets called in message after commit
+      message = create(:message, conversation: conversation)
+
+      expect(::MessageTemplates::Template::OutOfOffice).to have_received(:new).with(conversation: message.conversation)
+      expect(out_of_office_service).to have_received(:perform)
+    end
+  end
 end
diff --git a/spec/services/message_templates/template/out_of_office_spec.rb b/spec/services/message_templates/template/out_of_office_spec.rb
new file mode 100644
index 000000000..ee2050a70
--- /dev/null
+++ b/spec/services/message_templates/template/out_of_office_spec.rb
@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+describe ::MessageTemplates::Template::OutOfOffice do
+  context 'when this hook is called' do
+    let(:conversation) { create(:conversation) }
+
+    it 'creates the out of office messages' do
+      described_class.new(conversation: conversation).perform
+      expect(conversation.messages.template.count).to eq(1)
+      expect(conversation.messages.template.first.content).to eq(conversation.inbox.out_of_office_message)
+    end
+  end
+end

From 074084b25883e664e17e914575bacd0ea9a88db3 Mon Sep 17 00:00:00 2001
From: Akash Srivastava <akash.srivastava.1911@gmail.com>
Date: Sun, 1 Nov 2020 12:53:25 +0530
Subject: [PATCH 18/36] feat: Auto resolve conversations after n days of
 inactivity (#1308)

fixes: #418
---
 app/controllers/api/v1/accounts_controller.rb |  4 +--
 .../i18n/locale/ar/generalSettings.json       |  5 +++
 .../i18n/locale/ca/generalSettings.json       |  5 +++
 .../i18n/locale/cs/generalSettings.json       |  5 +++
 .../i18n/locale/da/generalSettings.json       |  5 +++
 .../i18n/locale/de/generalSettings.json       |  5 +++
 .../i18n/locale/el/generalSettings.json       |  5 +++
 .../i18n/locale/en/generalSettings.json       |  5 +++
 .../i18n/locale/es/generalSettings.json       |  5 +++
 .../i18n/locale/fa/generalSettings.json       |  5 +++
 .../i18n/locale/fi/generalSettings.json       |  5 +++
 .../i18n/locale/fr/generalSettings.json       |  5 +++
 .../i18n/locale/hi/generalSettings.json       |  5 +++
 .../i18n/locale/hu/generalSettings.json       |  5 +++
 .../i18n/locale/it/generalSettings.json       |  5 +++
 .../i18n/locale/ja/generalSettings.json       |  5 +++
 .../i18n/locale/ko/generalSettings.json       |  5 +++
 .../i18n/locale/ml/generalSettings.json       |  5 +++
 .../i18n/locale/nl/generalSettings.json       |  5 +++
 .../i18n/locale/pl/generalSettings.json       |  5 +++
 .../i18n/locale/pt/generalSettings.json       |  5 +++
 .../i18n/locale/pt_BR/generalSettings.json    |  5 +++
 .../i18n/locale/ro/generalSettings.json       |  5 +++
 .../i18n/locale/ru/generalSettings.json       |  5 +++
 .../i18n/locale/sk/generalSettings.json       |  5 +++
 .../i18n/locale/sv/generalSettings.json       |  5 +++
 .../i18n/locale/ta/generalSettings.json       |  5 +++
 .../i18n/locale/th/generalSettings.json       |  5 +++
 .../i18n/locale/tr/generalSettings.json       |  5 +++
 .../i18n/locale/uk/generalSettings.json       |  5 +++
 .../i18n/locale/vi/generalSettings.json       |  5 +++
 .../i18n/locale/zh/generalSettings.json       |  5 +++
 .../i18n/locale/zh_CN/generalSettings.json    |  5 +++
 .../i18n/locale/zh_TW/generalSettings.json    |  5 +++
 .../dashboard/settings/account/Index.vue      | 23 ++++++++++++-
 app/jobs/auto_resolve_conversations_job.rb    | 16 +++++++++
 app/models/account.rb                         | 20 ++++++-----
 app/models/conversation.rb                    | 34 ++++++++++++++-----
 app/views/api/v1/accounts/show.json.jbuilder  |  1 +
 config/locales/ar.yml                         |  1 +
 config/locales/ca.yml                         |  1 +
 config/locales/cs.yml                         |  1 +
 config/locales/da.yml                         |  1 +
 config/locales/de.yml                         |  1 +
 config/locales/el.yml                         |  1 +
 config/locales/en.yml                         |  1 +
 config/locales/es.yml                         |  1 +
 config/locales/fa.yml                         |  1 +
 config/locales/fi.yml                         |  1 +
 config/locales/fr.yml                         |  1 +
 config/locales/hi.yml                         |  1 +
 config/locales/hu.yml                         |  1 +
 config/locales/it.yml                         |  1 +
 config/locales/ja.yml                         |  1 +
 config/locales/ko.yml                         |  1 +
 config/locales/ml.yml                         |  1 +
 config/locales/nl.yml                         |  1 +
 config/locales/pl.yml                         |  1 +
 config/locales/pt.yml                         |  1 +
 config/locales/pt_BR.yml                      |  1 +
 config/locales/ro.yml                         |  1 +
 config/locales/ru.yml                         |  1 +
 config/locales/sk.yml                         |  1 +
 config/locales/sv.yml                         |  1 +
 config/locales/ta.yml                         |  1 +
 config/locales/th.yml                         |  1 +
 config/locales/tr.yml                         |  1 +
 config/locales/uk.yml                         |  1 +
 config/locales/vi.yml                         |  1 +
 config/locales/zh-TW.yml                      |  3 +-
 config/locales/zh.yml                         |  1 +
 config/locales/zh_CN.yml                      |  1 +
 config/locales/zh_TW.yml                      |  1 +
 ...18_add_auto_resolve_duration_to_account.rb |  5 +++
 db/schema.rb                                  |  1 +
 .../api/v1/accounts_controller_spec.rb        |  7 +++-
 .../auto_resolve_conversations_job_spec.rb    | 34 +++++++++++++++++++
 spec/models/account_spec.rb                   |  1 +
 spec/models/conversation_spec.rb              | 33 ++++++++++++++++++
 79 files changed, 358 insertions(+), 22 deletions(-)
 create mode 100644 app/jobs/auto_resolve_conversations_job.rb
 create mode 100644 db/migrate/20201003105618_add_auto_resolve_duration_to_account.rb
 create mode 100644 spec/jobs/auto_resolve_conversations_job_spec.rb

diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 5d7064fd0..51dcb1a57 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -33,7 +33,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def update
-    @account.update!(account_params.slice(:name, :locale, :domain, :support_email))
+    @account.update!(account_params.slice(:name, :locale, :domain, :support_email, :auto_resolve_duration))
   end
 
   def update_active_at
@@ -54,7 +54,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def account_params
-    params.permit(:account_name, :email, :name, :locale, :domain, :support_email)
+    params.permit(:account_name, :email, :name, :locale, :domain, :support_email, :auto_resolve_duration)
   end
 
   def check_signup_enabled
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index 34da670db..e4ba2e5a1 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "عنوان البريد الإلكتروني الخاص باستقبال رسائل الدعم الفني",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "الاستمرار في المحادثة عبر رسائل البريد الإلكتروني مفعّل لحسابك.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "يمكنك تلقي رسائل البريد الإلكتروني في النطاق المخصص الخاص بك الآن."
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index b9c31bbc3..2909aaa62 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index cd469abe5..3789fb016 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index 2ed7e5ebf..d9c8f1c55 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index ffa78389a..dc61201fd 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "To email υποστήριξης της εταιρίας σας",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Η συνέχεια της συνομιλίας με emails έχει ενεργοποιηθεί για τον λογαριασμό.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Τώρα μπορείτε να λαμβάνετε emails στον τομέα (domain) σας."
diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index ef240e160..ade73e3d7 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Email de soporte de su empresa",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuidad de la conversación con emails está habilitada para su cuenta.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Ahora puede recibir emails en su dominio personalizado."
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index a19b3959a..fcc048611 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "ایمیل پشتیبانی شرکت شما",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index cf1ac73ff..ec12da171 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "L'adresse de courriel de support de votre entreprise",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuité des conversations avec les courriels est activée pour votre compte.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Vous pouvez maintenant recevoir des courriels dans votre domaine personnalisé."
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index 3920b9729..f83ac865d 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "E-mail di supporto della tua azienda",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index eb9d48789..f3f4adadb 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "നിങ്ങളുടെ കമ്പനിയുടെ പിന്തുണാ ഇമെയിൽ",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "നിങ്ങളുടെ അക്കൗണ്ടിനായി ഇമെയിലുകളുമായുള്ള സംഭാഷണ തുടർച്ച പ്രവർത്തനക്ഷമമാക്കി.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "നിങ്ങളുടെ ഇഷ്‌ടാനുസൃത ഡൊമെയ്‌നിൽ നിങ്ങൾക്ക് ഇപ്പോൾ ഇമെയിലുകൾ സ്വീകരിക്കാൻ കഴിയും."
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index a12d5b5a3..c248f2d44 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "E-mailadres support van uw bedrijf",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index dc31e5f75..3e582a19d 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index a464d6a73..5c44d4c17 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "E-mail de suporte da sua empresa",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 1c2d148dc..2659bf478 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "E-mail de suporte da sua empresa",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A continuidade das conversas com e-mails está ativada para sua conta.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Você pode receber e-mails em seu domínio personalizado agora."
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index acf3ee6a3..c8d95c3c5 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "E-mailul de asistență al companiei dumneavoastră",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuitatea conversației cu e-mailurile este activată pentru contul dvs.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Puteți primi e-mailuri în domeniul dvs. personalizat acum."
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index cf59f7efa..254acaf36 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Email службы поддержки вашей компании",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Для вашего аккаунта включено продолжение диалогов по электронной почте.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Теперь вы можете получать письма на свой домен."
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index 747555db1..c3227f7c2 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 3b8bf9cf1..a75793b30 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "உங்கள் நிறுவனத்தின் சேவைக்கான ஈ-மெயில் முகவரி",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index aebf4cc65..4b20acfc0 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "อีเมล์ช่วยเหลือในบริษัทของคุณ",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "การสนทนาด้วยอีเมล์ถูกเปิดสำหรับบัญชีของคุณ",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "คุณสามารถรับอีเมล์ในโดเมนเเบบกำหนดเองได้เเล้ว"
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index 0a3fc0b8e..0a34afd8d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index 0166f98ad..6177d7788 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Your company's support email",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index ddd4f9c2f..76cd63317 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "Email hỗ trợ của công ty bạn",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Tính liên tục của cuộc trò chuyện với email được kích hoạt cho tài khoản của bạn.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Bạn có thể nhận email trong miền tùy chỉnh của mình ngay bây giờ."
diff --git a/app/javascript/dashboard/i18n/locale/zh/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh/generalSettings.json
index 7fa021923..bef55da23 100644
--- a/app/javascript/dashboard/i18n/locale/zh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "您公司的支持邮件",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帐户启用了与电子邮件的对话连续性。",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "您现在可以在您的自定义域名的电子邮件中接收消息。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 7fa021923..bef55da23 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "您公司的支持邮件",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帐户启用了与电子邮件的对话连续性。",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "您现在可以在您的自定义域名的电子邮件中接收消息。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index ca9333c2a..a46054c44 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -33,6 +33,11 @@
         "PLACEHOLDER": "您公司的客服信箱",
         "ERROR": ""
       },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+      },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帳戶啟用了電子信箱與對話的持續性功能。",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "您現在可以在您的自定義域名的電子信箱中接收消息。"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index e7da6e884..4a09f4893 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -62,6 +62,20 @@
               "
             />
           </label>
+          <label :class="{ error: $v.autoResolveDuration.$error }">
+            {{ $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.LABEL') }}
+            <input
+              v-model="autoResolveDuration"
+              type="number"
+              :placeholder="
+                $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.PLACEHOLDER')
+              "
+              @blur="$v.autoResolveDuration.$touch"
+            />
+            <span v-if="$v.autoResolveDuration.$error" class="message">
+              {{ $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.ERROR') }}
+            </span>
+          </label>
         </div>
       </div>
       <div class="current-version">
@@ -82,7 +96,7 @@
 
 <script>
 import Vue from 'vue';
-import { required } from 'vuelidate/lib/validators';
+import { required, minValue } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import configMixin from 'shared/mixins/configMixin';
@@ -98,6 +112,7 @@ export default {
       domain: '',
       supportEmail: '',
       features: {},
+      autoResolveDuration: null,
     };
   },
   validations: {
@@ -107,6 +122,9 @@ export default {
     locale: {
       required,
     },
+    autoResolveDuration: {
+      minValue: minValue(1),
+    },
   },
   computed: {
     ...mapGetters({
@@ -144,6 +162,7 @@ export default {
           support_email,
           custom_email_domain_enabled,
           features,
+          auto_resolve_duration,
         } = this.getAccount(this.accountId);
 
         Vue.config.lang = locale;
@@ -154,6 +173,7 @@ export default {
         this.supportEmail = support_email;
         this.customEmailDomainEnabled = custom_email_domain_enabled;
         this.features = features;
+        this.autoResolveDuration = auto_resolve_duration;
       } catch (error) {
         // Ignore error
       }
@@ -171,6 +191,7 @@ export default {
           name: this.name,
           domain: this.domain,
           support_email: this.supportEmail,
+          auto_resolve_duration: this.autoResolveDuration,
         });
         Vue.config.lang = this.locale;
         this.showAlert(this.$t('GENERAL_SETTINGS.UPDATE.SUCCESS'));
diff --git a/app/jobs/auto_resolve_conversations_job.rb b/app/jobs/auto_resolve_conversations_job.rb
new file mode 100644
index 000000000..08db549da
--- /dev/null
+++ b/app/jobs/auto_resolve_conversations_job.rb
@@ -0,0 +1,16 @@
+class AutoResolveConversationsJob < ApplicationJob
+  queue_as :medium
+
+  def perform(conversation_id)
+    conversation = Conversation.find_by(id: conversation_id)
+    return unless conversation&.auto_resolve_duration && conversation&.open?
+
+    time_since_last_activity = Time.zone.now.to_i - conversation.last_activity_at.to_i
+    time_left_to_auto_resolve = conversation.auto_resolve_duration.days.to_i - time_since_last_activity
+    if time_left_to_auto_resolve.positive?
+      AutoResolveConversationsJob.set(wait_until: time_left_to_auto_resolve.seconds.from_now).perform_later(conversation_id)
+    else
+      conversation.toggle_status
+    end
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index d977235e1..465b2ca77 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -2,16 +2,17 @@
 #
 # Table name: accounts
 #
-#  id             :integer          not null, primary key
-#  domain         :string(100)
-#  feature_flags  :integer          default(0), not null
-#  locale         :integer          default("en")
-#  name           :string           not null
-#  settings_flags :integer          default(0), not null
-#  support_email  :string(100)
+#  id                    :integer          not null, primary key
+#  auto_resolve_duration :integer
+#  domain                :string(100)
+#  feature_flags         :integer          default(0), not null
+#  locale                :integer          default("en")
+#  name                  :string           not null
+#  settings_flags        :integer          default(0), not null
+#  support_email         :string(100)
 #  timezone       :string           default("UTC")
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
 #
 
 class Account < ApplicationRecord
@@ -29,6 +30,7 @@ class Account < ApplicationRecord
   }.freeze
 
   validates :name, presence: true
+  validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, allow_nil: true }
 
   has_many :account_users, dependent: :destroy
   has_many :agent_bot_inboxes, dependent: :destroy
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index c54bbe9ac..53e30daea 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -54,11 +54,13 @@ class Conversation < ApplicationRecord
   # wanted to change this to after_update commit. But it ended up creating a loop
   # reinvestigate in future and identity the implications
   after_update :notify_status_change, :create_activity
-  after_create_commit :notify_conversation_creation
+  after_create_commit :notify_conversation_creation, :queue_conversation_auto_resolution_job
   after_save :run_round_robin
 
   acts_as_taggable_on :labels
 
+  delegate :auto_resolve_duration, to: :account
+
   def can_reply?
     return true unless inbox&.channel&.has_24_hour_messaging_window?
 
@@ -145,6 +147,12 @@ class Conversation < ApplicationRecord
     dispatcher_dispatch(CONVERSATION_CREATED)
   end
 
+  def queue_conversation_auto_resolution_job
+    return unless auto_resolve_duration
+
+    AutoResolveConversationsJob.set(wait_until: (last_activity_at || created_at) + auto_resolve_duration.days).perform_later(id)
+  end
+
   def self_assign?(assignee_id)
     assignee_id.present? && Current.user&.id == assignee_id
   end
@@ -157,15 +165,17 @@ class Conversation < ApplicationRecord
   end
 
   def create_activity
-    return unless Current.user
-
-    user_name = Current.user.name
-
-    create_status_change_message(user_name) if saved_change_to_status?
+    user_name = Current.user.name if Current.user.present?
+    status_change_activity(user_name) if saved_change_to_status?
     create_assignee_change(user_name) if saved_change_to_assignee_id?
     create_label_change(user_name) if saved_change_to_label_list?
   end
 
+  def status_change_activity(user_name)
+    create_status_change_message(user_name)
+    queue_conversation_auto_resolution_job if open?
+  end
+
   def activity_message_params(content)
     { account_id: account_id, inbox_id: inbox_id, message_type: :activity, content: content }
   end
@@ -210,12 +220,18 @@ class Conversation < ApplicationRecord
   end
 
   def create_status_change_message(user_name)
-    content = I18n.t("conversations.activity.status.#{status}", user_name: user_name)
+    content = if user_name
+                I18n.t("conversations.activity.status.#{status}", user_name: user_name)
+              elsif resolved?
+                I18n.t('conversations.activity.status.auto_resolved', duration: auto_resolve_duration)
+              end
 
-    messages.create(activity_message_params(content))
+    messages.create(activity_message_params(content)) if content
   end
 
   def create_assignee_change(user_name)
+    return unless user_name
+
     params = { assignee_name: assignee.name, user_name: user_name }.compact
     key = assignee_id ? 'assigned' : 'removed'
     key = 'self_assigned' if self_assign? assignee_id
@@ -225,6 +241,8 @@ class Conversation < ApplicationRecord
   end
 
   def create_label_change(user_name)
+    return unless user_name
+
     previous_labels, current_labels = previous_changes[:label_list]
     return unless (previous_labels.is_a? Array) && (current_labels.is_a? Array)
 
diff --git a/app/views/api/v1/accounts/show.json.jbuilder b/app/views/api/v1/accounts/show.json.jbuilder
index b9d8ba444..9e10ec436 100644
--- a/app/views/api/v1/accounts/show.json.jbuilder
+++ b/app/views/api/v1/accounts/show.json.jbuilder
@@ -5,3 +5,4 @@ json.domain @account.domain
 json.custom_email_domain_enabled @account.custom_email_domain_enabled
 json.support_email @account.support_email
 json.features @account.all_features
+json.auto_resolve_duration @account.auto_resolve_duration
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 0304da50c..93dd98759 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -32,6 +32,7 @@ ar:
       status:
         resolved: "تم تحديث حالة المحادثة لـ\"مغلقة\" بواسطة %{user_name}"
         open: "تم إعادة فتح المحادثة بواسطة %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "تم إسنادها إلى %{assignee_name} بواسطة %{user_name}"
         removed: "المحادثة غير مسندة بواسطة %{user_name}"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 2818fa9f8..124b55212 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -32,6 +32,7 @@ ca:
       status:
         resolved: "La conversa va ser marcada com resolta per %{user_name}"
         open: "La conversa es va reobrir per %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assignada a %{assignee_name} per %{user_name}"
         removed: "%{user_name} ha tret l'assignació de la conversa"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 9d30e0bad..48321e34d 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -32,6 +32,7 @@ cs:
       status:
         resolved: "Konverzace byla vyřešena uživatelem %{user_name}"
         open: "Konverzace byla znovu otevřena uživatelem %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Přiřazeno k %{assignee_name} uživatelem %{user_name}"
         removed: "Konverzace zrušena uživatelem %{user_name}"
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e71137496..f643ac7aa 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -32,6 +32,7 @@ da:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 036b1ec6b..93e8e84bc 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -32,6 +32,7 @@ de:
       status:
         resolved: "Das Gespräch wurde von gelöst gelöst %{user_name}"
         open: "Das Gespräch wurde von wieder eröffnet %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "%{user_name} von %{assignee_name} zugewiesen"
         removed: "Gespräch nicht zugewiesen von %{user_name}"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index c574fbce8..26bb3b905 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -32,6 +32,7 @@ el:
       status:
         resolved: "Η συνομιλία έχει επιλυθεί από τον %{user_name}"
         open: "Έγινε επαναφορά της συνομιλίας από τον %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Ανατέθηκε στον %{assignee_name} από τον %{user_name}"
         removed: "Η συνομιλία σημάνθηκε ως μη ανατεθειμένη από τον %{user_name}"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b60e3a4bd..e3b1db2c6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -47,6 +47,7 @@ en:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1e060e25f..b6ed2085d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -32,6 +32,7 @@ es:
       status:
         resolved: "La conversación fue marcada por %{user_name}"
         open: "La conversación fue reabierta por %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Asignado a %{assignee_name} por %{user_name}"
         removed: "Conversación no asignada por %{user_name}"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 5c8d8af13..ddadbf909 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -32,6 +32,7 @@ fa:
       status:
         resolved: "مکالمه توسط اپراتور %{user_name} حل شده، اعلام شده بود"
         open: "گفتگو توسط اپراتور %{user_name} مجددا باز شده بود"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "%{user_name} گفتگو را به %{assignee_name} اختصاص داد"
         removed: "گفتگو توسط اپراتور %{user_name} به وضعیت اختصاص داده نشده تغییر یافت"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 9180896b8..103e65f26 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -32,6 +32,7 @@ fi:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 21713e7c4..1f231b3ab 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -32,6 +32,7 @@ fr:
       status:
         resolved: "La conversation a été marquée résolue par %{user_name}"
         open: "La conversation a été ré-ouverte par %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigné à %{assignee_name} par %{user_name}"
         removed: "Responsable de la conversation supprimé par %{user_name}"
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 37c2e2be7..df2df86bd 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -32,6 +32,7 @@ hi:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index cdc668d39..452c4e8ec 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -32,6 +32,7 @@ hu:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 90f3c0f52..c4c676044 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -32,6 +32,7 @@ it:
       status:
         resolved: "Conversazione segnata da %{user_name}"
         open: "La conversazione è stata riaperta da %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assegnato a %{assignee_name} da %{user_name}"
         removed: "Conversazione non assegnata da %{user_name}"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c4f3074e1..d098e2561 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -32,6 +32,7 @@ ja:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9af9d4b98..c9d52591b 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -32,6 +32,7 @@ ko:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index f0eb81d82..d6ea4aaad 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -32,6 +32,7 @@ ml:
       status:
         resolved: "സംഭാഷണം %{user_name} പരിഹരിച്ചതായി അടയാളപ്പെടുത്തി"
         open: "സംഭാഷണം %{user_name} വീണ്ടും തുറന്നു"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "%{assignee_name} %{user_name}-നെ നിയുക്തനാക്കി "
         removed: "%{user_name} സംഭാഷണം നിയുക്തമല്ലാതാക്കി"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index bf3e806bd..9d6f1b86f 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -32,6 +32,7 @@ nl:
       status:
         resolved: "Gesprek werd gemarkeerd door %{user_name}"
         open: "Gesprek werd heropend door %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Toegewezen aan %{assignee_name} door %{user_name}"
         removed: "Gesprek niet toegewezen door %{user_name}"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index a949acc82..b1b68c6f9 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -32,6 +32,7 @@ pl:
       status:
         resolved: "Rozmowa została oznaczona przez %{user_name}"
         open: "Rozmowa została ponownie otwarta przez %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Przypisane do %{assignee_name} przez %{user_name}"
         removed: "Rozmowa nieprzypisana przez %{user_name}"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 4e4d82c3f..4fabf5940 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -32,6 +32,7 @@ pt:
       status:
         resolved: "Conversa foi marcada como resolvida por %{user_name}"
         open: "Conversa foi reaberta por %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 501360833..f71338dc7 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -32,6 +32,7 @@ pt:
       status:
         resolved: "Conversa foi marcada como resolvida por %{user_name}"
         open: "Conversa foi reaberta por %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index a6e9cec8d..2f87857cd 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -32,6 +32,7 @@ ro:
       status:
         resolved: "Conversația a fost marcată de %{user_name}"
         open: "Conversația a fost redeschisă de %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Atribuit lui %{assignee_name} de %{user_name}"
         removed: "Conversație neasociată de %{user_name}"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 3763b492d..ea629a0e1 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -32,6 +32,7 @@ ru:
       status:
         resolved: "%{user_name} завершил диалог"
         open: "%{user_name} открыл заново диалог"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "%{user_name} назначил %{assignee_name} ответственным"
         removed: "Ответственный снят %{user_name}"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 22ba524cc..96bcbf93c 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -32,6 +32,7 @@ sk:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 4ae6eba68..31797969a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -32,6 +32,7 @@ sv:
       status:
         resolved: "Konversationen har markerats som löst av %{user_name}"
         open: "Konversationen öppnades igen av %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Tilldelad till %{assignee_name} av %{user_name}"
         removed: "Konversation otilldelad av %{user_name}"
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index c86f5412a..e2cbd3a2b 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -32,6 +32,7 @@ ta:
       status:
         resolved: "உரையாடலுக்கு %{user_name} தீர்வு வழங்கியுள்ளார்"
         open: "உரையாடலை %{user_name} மீண்டும் திறந்துள்ளார்"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "%{user_name} இதை %{assignee_name}க்கு ஒதுக்கியுள்ளார்"
         removed: "%{user_name} இதை ஒதுக்க படாத உரையாடளாக்கியுள்ளார்"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 619845856..10c59759f 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -32,6 +32,7 @@ th:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index fef98aa72..203893e5b 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -32,6 +32,7 @@ tr:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 8e69dd97e..73bada315 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -32,6 +32,7 @@ uk:
       status:
         resolved: "Conversation was marked resolved by %{user_name}"
         open: "Conversation was reopened by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index a79a94f53..e726c4bc8 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -32,6 +32,7 @@ vi:
       status:
         resolved: "Cuộc trò chuyện được đánh dấu là đã giải quyết bởi %{user_name}"
         open: "Cuộc trò chuyện đã được mở lại bởi %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "Chỉ định %{assignee_name} bởi %{user_name}"
         removed: "Cuộc hội thoại chưa được chỉ định bởi %{user_name}"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d82908441..527927c9d 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -46,7 +46,8 @@ zh-TW:
     activity:
       status:
         resolved: "被%{user_name}標記的對話已解決。" 
-        open: "被%{user_name}恢復對話。" 
+        open: "被%{user_name}恢復對話。"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "被%{user_name}分配給%{assignee_name}。" 
         removed: "對話被%{user_name}設定成未分配。" 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3d7f44735..93a9ef515 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -32,6 +32,7 @@ zh-CN:
       status:
         resolved: "对话被标记由 %{user_name} 解决"
         open: "对话被 %{user_name} 重新打开"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "由 %{assignee_name} 分配给 %{user_name}"
         removed: "对话未被 %{user_name} 分配"
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 3d7f44735..93a9ef515 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -32,6 +32,7 @@ zh-CN:
       status:
         resolved: "对话被标记由 %{user_name} 解决"
         open: "对话被 %{user_name} 重新打开"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "由 %{assignee_name} 分配给 %{user_name}"
         removed: "对话未被 %{user_name} 分配"
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 900e1622c..714cdfc9b 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -47,6 +47,7 @@ zh_TW:
       status:
         resolved: "被%{user_name}標記的對話已解決。"
         open: "被%{user_name}恢復對話。"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
         assigned: "被%{user_name}分配給%{assignee_name}。"
         removed: "對話被%{user_name}設定成未分配。"
diff --git a/db/migrate/20201003105618_add_auto_resolve_duration_to_account.rb b/db/migrate/20201003105618_add_auto_resolve_duration_to_account.rb
new file mode 100644
index 000000000..03dfb3362
--- /dev/null
+++ b/db/migrate/20201003105618_add_auto_resolve_duration_to_account.rb
@@ -0,0 +1,5 @@
+class AddAutoResolveDurationToAccount < ActiveRecord::Migration[6.0]
+  def change
+    add_column :accounts, :auto_resolve_duration, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 37aa4dc3e..06f05b465 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -49,6 +49,7 @@ ActiveRecord::Schema.define(version: 2020_10_27_135006) do
     t.string "support_email", limit: 100
     t.integer "settings_flags", default: 0, null: false
     t.integer "feature_flags", default: 0, null: false
+    t.integer "auto_resolve_duration"
     t.string "timezone", default: "UTC"
   end
 
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 88cae6a82..7a14c08ba 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -130,6 +130,8 @@ RSpec.describe 'Accounts API', type: :request do
 
     context 'when it is an authenticated user' do
       it 'shows an account' do
+        account.update(auto_resolve_duration: 30)
+
         get "/api/v1/accounts/#{account.id}",
             headers: admin.create_new_auth_token,
             as: :json
@@ -139,6 +141,7 @@ RSpec.describe 'Accounts API', type: :request do
         expect(response.body).to include(account.locale)
         expect(response.body).to include(account.domain)
         expect(response.body).to include(account.support_email)
+        expect(response.body).to include(account.auto_resolve_duration.to_s)
       end
     end
   end
@@ -169,7 +172,8 @@ RSpec.describe 'Accounts API', type: :request do
         name: 'New Name',
         locale: 'en',
         domain: 'example.com',
-        support_email: 'care@example.com'
+        support_email: 'care@example.com',
+        auto_resolve_duration: 40
       }
 
       it 'modifies an account' do
@@ -183,6 +187,7 @@ RSpec.describe 'Accounts API', type: :request do
         expect(account.reload.locale).to eq(params[:locale])
         expect(account.reload.domain).to eq(params[:domain])
         expect(account.reload.support_email).to eq(params[:support_email])
+        expect(account.reload.auto_resolve_duration).to eq(params[:auto_resolve_duration])
       end
     end
   end
diff --git a/spec/jobs/auto_resolve_conversations_job_spec.rb b/spec/jobs/auto_resolve_conversations_job_spec.rb
new file mode 100644
index 000000000..9ecea3b42
--- /dev/null
+++ b/spec/jobs/auto_resolve_conversations_job_spec.rb
@@ -0,0 +1,34 @@
+require 'rails_helper'
+
+RSpec.describe AutoResolveConversationsJob, type: :job do
+  subject(:job) { described_class.perform_later(conversation.id) }
+
+  let!(:account) { create(:account) }
+  let!(:conversation) { create(:conversation, account: account) }
+
+  it 'queues the job' do
+    expect { job }.to have_enqueued_job(described_class)
+      .with(conversation.id)
+      .on_queue('medium')
+  end
+
+  it 'does nothing when there is no auto resolve duration' do
+    described_class.perform_now(conversation.id)
+    expect(conversation.reload.status).to eq('open')
+  end
+
+  it 're-queues the job if there is still time left to allow inactivity' do
+    account.update(auto_resolve_duration: 10)
+    conversation.update(last_activity_at: 3.days.ago)
+    expect { described_class.perform_now(conversation.id) }.to have_enqueued_job(described_class)
+      .with(conversation.id)
+      .on_queue('medium')
+  end
+
+  it 'resolves the issue if time of inactivity is more than the auto resolve duration' do
+    account.update(auto_resolve_duration: 10)
+    conversation.update(last_activity_at: 13.days.ago)
+    described_class.perform_now(conversation.id)
+    expect(conversation.reload.status).to eq('resolved')
+  end
+end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 111b0888a..62bc123dd 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Account do
   it { is_expected.to validate_presence_of(:name) }
+  it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_greater_than_or_equal_to(1) }
 
   it { is_expected.to have_many(:users).through(:account_users) }
   it { is_expected.to have_many(:account_users) }
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 77b3c466e..df2a1bda7 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -44,6 +44,19 @@ RSpec.describe Conversation, type: :model do
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::CONVERSATION_CREATED, kind_of(Time), conversation: conversation)
     end
+
+    it 'queues AutoResolveConversationsJob post creation if auto resolve duration present' do
+      account.update(auto_resolve_duration: 30)
+      expect do
+        create(
+          :conversation,
+          account: account,
+          contact: create(:contact, account: account),
+          inbox: inbox,
+          assignee: nil
+        )
+      end.to have_enqueued_job(AutoResolveConversationsJob)
+    end
   end
 
   describe '.after_update' do
@@ -94,6 +107,26 @@ RSpec.describe Conversation, type: :model do
       expect(conversation.messages.pluck(:content)).to include("Assigned to #{new_assignee.name} by #{old_assignee.name}")
       expect(conversation.messages.pluck(:content)).to include("#{old_assignee.name} added #{label.title}")
     end
+
+    it 'adds a message for system auto resolution if marked resolved by system' do
+      conversation2 = create(:conversation, status: 'open', account: account, assignee: old_assignee)
+      account.update(auto_resolve_duration: 40)
+      Current.user = nil
+      conversation2.update(status: :resolved)
+      system_resolved_message = "Conversation was marked resolved by system due to #{account.auto_resolve_duration} days of inactivity"
+      expect(conversation2.messages.pluck(:content)).to include(system_resolved_message)
+    end
+
+    it 'does not trigger AutoResolutionJob if conversation reopened and account does not have auto resolve duration' do
+      expect { conversation.update(status: :open) }
+        .not_to have_enqueued_job(AutoResolveConversationsJob).with(conversation.id)
+    end
+
+    it 'does trigger AutoResolutionJob if conversation reopened and account has auto resolve duration' do
+      account.update(auto_resolve_duration: 40)
+      expect { conversation.update(status: :open) }
+        .to have_enqueued_job(AutoResolveConversationsJob).with(conversation.id)
+    end
   end
 
   describe '#round robin' do

From afa234a207cb7a8a4aba6f1840e6f95194c0240f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 4 Nov 2020 12:23:44 +0530
Subject: [PATCH 19/36] feat: Add status color for items in availability status
 menu (#1380)

---
 .../components/layout/AvailabilityStatus.vue  | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
index b60932c5f..6ab70b79f 100644
--- a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
+++ b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
@@ -2,9 +2,7 @@
   <div class="status">
     <div class="status-view">
       <div
-        :class="
-          `status-view--badge status-view--badge__${currentUserAvailabilityStatus}`
-        "
+        :class="`status-badge status-badge__${currentUserAvailabilityStatus}`"
       />
 
       <div class="status-view--title">
@@ -20,7 +18,13 @@
           class="dropdown-pane top"
         >
           <ul class="vertical dropdown menu">
-            <li v-for="status in availabilityStatuses" :key="status.value">
+            <li
+              v-for="status in availabilityStatuses"
+              :key="status.value"
+              class="status-items"
+            >
+              <div :class="`status-badge status-badge__${status.value}`" />
+
               <button
                 class="button clear status-change--dropdown-button"
                 :disabled="status.disabled"
@@ -112,24 +116,6 @@ export default {
   display: flex;
   align-items: baseline;
 
-  & &--badge {
-    width: $space-one;
-    height: $space-one;
-    border-radius: 50%;
-
-    &__online {
-      background: $success-color;
-    }
-
-    &__offline {
-      background: $color-gray;
-    }
-
-    &__busy {
-      background: $warning-color;
-    }
-  }
-
   & &--title {
     color: $color-gray;
     font-size: $font-size-small;
@@ -147,6 +133,11 @@ export default {
     top: -130px;
   }
 
+  .status-items {
+    display: flex;
+    align-items: baseline;
+  }
+
   & &--change-button {
     color: $color-gray;
     font-size: $font-size-small;
@@ -166,4 +157,22 @@ export default {
     width: 100%;
   }
 }
+
+.status-badge {
+  width: $space-one;
+  height: $space-one;
+  border-radius: 50%;
+
+  &__online {
+    background: $success-color;
+  }
+
+  &__offline {
+    background: $color-gray;
+  }
+
+  &__busy {
+    background: $warning-color;
+  }
+}
 </style>

From 39c2270227ff0053ad11e168d76b635f8a3f40f8 Mon Sep 17 00:00:00 2001
From: Sony Mathew <ynos1234@gmail.com>
Date: Fri, 6 Nov 2020 00:06:07 +0530
Subject: [PATCH 20/36] fix: pg pass printed by docker container (#1382)

* fix: pg pass printed by docker container (#1371)

The "POSTGRES_PASSWORD" variable setting inside the entrypoint script
of the rails docker container was printed in the logs when the
container was run using docker compose.

Fixed this by removing this password being set in this script.
Added env file from root directory to the container
Updated the tailwind evrsion in yarn lock

* fix: moved pg database url check in the entrypoint to another helper

created a new helper docker/entrypoints/helpers/pg_database_url.sh
to parse the databse url and export the postgres host, user and
port.

With this the pg is_ready check falls to a common format rather
than two formats depending on DATABASE_URL env variable is
present or not.

* fix: rename pg ready variable in rails entrypoint
---
 docker-compose.yaml                           |  1 +
 docker/entrypoints/helpers/pg_database_url.sh | 10 ++++++++++
 docker/entrypoints/rails.sh                   | 11 ++++-------
 yarn.lock                                     |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100755 docker/entrypoints/helpers/pg_database_url.sh

diff --git a/docker-compose.yaml b/docker-compose.yaml
index d6aa758d9..1fbf28da9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -35,6 +35,7 @@ services:
       - sidekiq
     ports:
       - 3000:3000
+    env_file: .env
     environment:
       - WEBPACKER_DEV_SERVER_HOST=webpack
       - NODE_ENV=development
diff --git a/docker/entrypoints/helpers/pg_database_url.sh b/docker/entrypoints/helpers/pg_database_url.sh
new file mode 100755
index 000000000..05424ceb0
--- /dev/null
+++ b/docker/entrypoints/helpers/pg_database_url.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'uri'
+
+# Let DATABASE_URL env take presedence over individual connection params.
+if !ENV['DATABASE_URL'].nil? && ENV['DATABASE_URL'] != ''
+  uri = URI(ENV['DATABASE_URL'])
+  puts "export POSTGRES_HOST=#{uri.host} POSTGRES_PORT=#{uri.port} POSTGRES_USERNAME=#{uri.user}"
+else
+  puts "export POSTGRES_PORT=5432"
+end
\ No newline at end of file
diff --git a/docker/entrypoints/rails.sh b/docker/entrypoints/rails.sh
index 80dee70ba..7b77e33db 100755
--- a/docker/entrypoints/rails.sh
+++ b/docker/entrypoints/rails.sh
@@ -9,14 +9,11 @@ rm -rf /app/tmp/cache/*
 echo "Waiting for postgres to become ready...."
 
 # Let DATABASE_URL env take presedence over individual connection params.
-if [ -z "$DATABASE_URL" ]; then
-  PGPASSWORD=$POSTGRES_PASSWORD
-  PSQL="pg_isready -h $POSTGRES_HOST -p 5432 -U $POSTGRES_USERNAME"
-else
-  PSQL="pg_isready -d $DATABASE_URL"
-fi
+# This is done to avoid printing the DATABASE_URL in the logs
+$(docker/entrypoints/helpers/pg_database_url.sh)
+PG_READY="pg_isready -h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USERNAME"
 
-until $PSQL
+until $PG_READY
 do
   sleep 2;
 done
diff --git a/yarn.lock b/yarn.lock
index 09ba479d5..6a816b2ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10422,7 +10422,7 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-tailwindcss@^1.8.3:
+tailwindcss@^1.9.6:
   version "1.9.6"
   resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.9.6.tgz#0c5089911d24e1e98e592a31bfdb3d8f34ecf1a0"
   integrity sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==

From 22683cae660d86d704e5f66ebb6574015ce2efc6 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+sivin-git@users.noreply.github.com>
Date: Sat, 7 Nov 2020 12:21:34 +0530
Subject: [PATCH 21/36] feat: Sort labels on sidebar by alphabetical order
 (#1387)

---
 app/javascript/dashboard/store/modules/labels.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/store/modules/labels.js b/app/javascript/dashboard/store/modules/labels.js
index 4597ec947..4183c28ed 100644
--- a/app/javascript/dashboard/store/modules/labels.js
+++ b/app/javascript/dashboard/store/modules/labels.js
@@ -20,7 +20,9 @@ export const getters = {
     return _state.uiFlags;
   },
   getLabelsOnSidebar(_state) {
-    return _state.records.filter(record => record.show_on_sidebar);
+    return _state.records
+      .filter(record => record.show_on_sidebar)
+      .sort((a, b) => a.title.localeCompare(b.title));
   },
 };
 

From 7718cf7d2c34844b7f0fd1cbe19e9c422be23b6b Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Sun, 8 Nov 2020 01:46:45 +0530
Subject: [PATCH 22/36] feat: Add global message search (#1385)

* feat: Search messages by content

* Fix search UI

* Add specs

* chore: Filter search results

* Update highlight logic

* Rename query to searchTerm

Co-authored-by: Sojan <sojan@pepalo.com>
---
 app/finders/conversation_finder.rb            |  10 +-
 .../dashboard/api/inbox/conversation.js       |   9 +
 .../scss/widgets/_conversation-view.scss      |   2 +-
 .../dashboard/components/ChatList.vue         |   4 +-
 .../i18n/locale/en/conversation.json          |   7 +
 .../conversation/ConversationView.vue         |  44 ++++-
 .../dashboard/conversation/search/Search.vue  | 173 ++++++++++++++++++
 app/javascript/dashboard/store/index.js       |   2 +
 .../store/modules/conversationSearch.js       |  54 ++++++
 .../specs/conversationSearch/actions.spec.js  |  44 +++++
 .../specs/conversationSearch/getters.spec.js  |  19 ++
 .../conversationSearch/mutations.spec.js      |  22 +++
 .../dashboard/store/mutation-types.js         |   4 +
 .../conversations/search.json.jbuilder        |  33 ++--
 .../accounts/conversations_controller_spec.rb |   2 +-
 15 files changed, 399 insertions(+), 30 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/Search.vue
 create mode 100644 app/javascript/dashboard/store/modules/conversationSearch.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/conversationSearch/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/conversationSearch/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/conversationSearch/mutations.spec.js

diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index f4bbcc149..051b25679 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -25,7 +25,7 @@ class ConversationFinder
     set_assignee_type
 
     find_all_conversations
-    filter_by_status
+    filter_by_status unless params[:q]
     filter_by_labels if params[:labels]
     filter_by_query if params[:q]
 
@@ -78,9 +78,11 @@ class ConversationFinder
   end
 
   def filter_by_query
-    @conversations = @conversations.joins(:messages).where('messages.content LIKE :search',
-                                                           search: "%#{params[:q]}%").includes(:messages).where('messages.content LIKE :search',
-                                                                                                                search: "%#{params[:q]}%")
+    allowed_message_types = [Message.message_types[:incoming], Message.message_types[:outgoing]]
+    @conversations = conversations.joins(:messages).where('messages.content ILIKE :search', search: "%#{params[:q]}%")
+                                  .where(messages: { message_type: allowed_message_types }).includes(:messages)
+                                  .where('messages.content ILIKE :search', search: "%#{params[:q]}%")
+                                  .where(messages: { message_type: allowed_message_types })
   end
 
   def filter_by_status
diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index 6e5c72ca0..9f87d2aa5 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -18,6 +18,15 @@ class ConversationApi extends ApiClient {
     });
   }
 
+  search({ q }) {
+    return axios.get(`${this.url}/search`, {
+      params: {
+        q,
+        page: 1,
+      },
+    });
+  }
+
   toggleStatus(conversationId) {
     return axios.post(`${this.url}/${conversationId}/toggle_status`, {});
   }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index c511ee243..ae89fe9a2 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -72,7 +72,7 @@
 
   .chat-list__top {
     @include flex;
-    @include padding($space-normal $zero $space-small $zero);
+    @include padding($zero $zero $space-small $zero);
 
     align-items: center;
     justify-content: space-between;
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 5ca82a407..8a8c59551 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="conversations-sidebar  medium-4 columns">
+    <slot></slot>
     <div class="chat-list__top">
       <h1 class="page-title">
         <woot-sidemenu-icon />
@@ -54,9 +55,6 @@
 </template>
 
 <script>
-/* eslint-env browser */
-/* eslint no-console: 0 */
-/* global bus */
 import { mapGetters } from 'vuex';
 
 import ChatFilter from './widgets/conversation/ChatFilter';
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index f8ea61643..d271c7895 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
     "NO_INBOX_2": " to get started",
     "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click here",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index 5a9e76646..8c0c9a2be 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -1,6 +1,18 @@
 <template>
   <section class="app-content columns">
-    <chat-list :conversation-inbox="inboxId" :label="label"></chat-list>
+    <chat-list :conversation-inbox="inboxId" :label="label">
+      <button class="search--button" @click="onSearch">
+        <i class="ion-ios-search-strong search--icon" />
+        <div class="text-truncate">
+          {{ $t('CONVERSATION.SEARCH_MESSAGES') }}
+        </div>
+      </button>
+      <search
+        v-if="showSearchModal"
+        :show="showSearchModal"
+        :on-close="closeSearch"
+      />
+    </chat-list>
     <conversation-box
       :inbox-id="inboxId"
       :is-contact-panel-open="isContactPanelOpen"
@@ -16,18 +28,19 @@
 </template>
 
 <script>
-/* eslint no-console: 0 */
 import { mapGetters } from 'vuex';
 
 import ChatList from '../../../components/ChatList';
 import ContactPanel from './ContactPanel';
 import ConversationBox from '../../../components/widgets/conversation/ConversationBox';
+import Search from './search/Search.vue';
 
 export default {
   components: {
     ChatList,
     ContactPanel,
     ConversationBox,
+    Search,
   },
   props: {
     inboxId: {
@@ -47,6 +60,7 @@ export default {
   data() {
     return {
       panelToggleState: true,
+      showSearchModal: false,
     };
   },
   computed: {
@@ -116,6 +130,32 @@ export default {
     onToggleContactPanel() {
       this.isContactPanelOpen = !this.isContactPanelOpen;
     },
+    onSearch() {
+      this.showSearchModal = true;
+    },
+    closeSearch() {
+      this.showSearchModal = false;
+    },
   },
 };
 </script>
+<style scoped>
+.search--button {
+  align-items: center;
+  border: 0;
+  color: var(--s-400);
+  cursor: pointer;
+  display: flex;
+  font-size: var(--font-size-small);
+  font-weight: 400;
+  padding: var(--space-normal);
+  text-align: left;
+  line-height: var(--font-size-large);
+}
+
+.search--icon {
+  color: var(--s-600);
+  font-size: var(--font-size-large);
+  padding-right: var(--space-small);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/Search.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/Search.vue
new file mode 100644
index 000000000..78242286a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/Search.vue
@@ -0,0 +1,173 @@
+<template>
+  <woot-modal
+    class="message-search--modal"
+    :show.sync="show"
+    :on-close="onClose"
+  >
+    <woot-modal-header :header-title="$t('CONVERSATION.SEARCH.TITLE')" />
+    <div class="search--container">
+      <input
+        v-model="searchTerm"
+        v-focus
+        :placeholder="$t('CONVERSATION.SEARCH.PLACEHOLDER')"
+        type="text"
+      />
+
+      <div v-if="uiFlags.isFetching" class="search--activity-message">
+        <woot-spinner size="" />
+        {{ $t('CONVERSATION.SEARCH.LOADING_MESSAGE') }}
+      </div>
+
+      <div
+        v-if="searchTerm && conversations.length && !uiFlags.isFetching"
+        class="search-results--container"
+      >
+        <div v-for="conversation in conversations" :key="conversation.id">
+          <button
+            v-for="message in conversation.messages"
+            :key="message.id"
+            class="search--messages"
+            @click="() => onClick(conversation)"
+          >
+            <div class="search--messages__metadata">
+              <span>#{{ conversation.id }}</span>
+              <span>{{ dynamicTime(message.created_at) }}</span>
+            </div>
+            <div v-html="prepareContent(message.content)" />
+          </button>
+        </div>
+      </div>
+
+      <div
+        v-else-if="
+          searchTerm &&
+            !conversations.length &&
+            !uiFlags.isFetching &&
+            hasSearched
+        "
+        class="search--activity-message"
+      >
+        {{ $t('CONVERSATION.SEARCH.NO_MATCHING_RESULTS') }}
+      </div>
+    </div>
+  </woot-modal>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { frontendURL, conversationUrl } from '../../../../helper/URLHelper';
+import timeMixin from '../../../../mixins/time';
+
+export default {
+  directives: {
+    focus: {
+      inserted(el) {
+        el.focus();
+      },
+    },
+  },
+  mixins: [timeMixin],
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    onClose: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      searchTerm: '',
+      hasSearched: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      conversations: 'conversationSearch/getConversations',
+      uiFlags: 'conversationSearch/getUIFlags',
+      accountId: 'getCurrentAccountId',
+    }),
+  },
+  watch: {
+    searchTerm(newValue) {
+      if (this.typingTimer) {
+        clearTimeout(this.typingTimer);
+      }
+
+      this.typingTimer = setTimeout(() => {
+        this.hasSearched = true;
+        this.$store.dispatch('conversationSearch/get', { q: newValue });
+      }, 1000);
+    },
+  },
+  mounted() {
+    this.$store.dispatch('conversationSearch/get', { q: '' });
+  },
+  methods: {
+    prepareContent(content = '') {
+      return content.replace(
+        new RegExp(`(${this.searchTerm})`, 'ig'),
+        '<span class="searchkey--highlight">$1</span>'
+      );
+    },
+    onClick(conversation) {
+      const path = conversationUrl({
+        accountId: this.accountId,
+        id: conversation.id,
+      });
+      window.location = frontendURL(path);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.search--container {
+  font-size: var(--font-size-default);
+  padding: var(--space-normal) var(--space-large);
+}
+
+.search-results--container {
+  max-height: 300px;
+  overflow: scroll;
+}
+
+.searchkey--highlight {
+  background: var(--w-500);
+  color: var(--white);
+}
+
+.search--activity-message {
+  color: var(--s-800);
+  text-align: center;
+}
+
+.search--messages {
+  border-bottom: 1px solid var(--b-100);
+  color: var(--color-body);
+  cursor: pointer;
+  font-size: var(--font-size-small);
+  line-height: 1.5;
+  padding: var(--space-normal);
+  text-align: left;
+  width: 100%;
+
+  &:hover {
+    background: var(--w-50);
+  }
+}
+
+.message-search--modal .modal-container {
+  width: 800px;
+  min-height: 460px;
+}
+
+.search--messages__metadata {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: var(--space-small);
+  color: var(--s-500);
+}
+</style>
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 3da923b76..ab6103ab7 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -11,6 +11,7 @@ import conversationLabels from './modules/conversationLabels';
 import conversationMetadata from './modules/conversationMetadata';
 import conversationPage from './modules/conversationPage';
 import conversations from './modules/conversations';
+import conversationSearch from './modules/conversationSearch';
 import conversationStats from './modules/conversationStats';
 import conversationTypingStatus from './modules/conversationTypingStatus';
 import globalConfig from 'shared/store/globalConfig';
@@ -35,6 +36,7 @@ export default new Vuex.Store({
     conversationMetadata,
     conversationPage,
     conversations,
+    conversationSearch,
     conversationStats,
     conversationTypingStatus,
     globalConfig,
diff --git a/app/javascript/dashboard/store/modules/conversationSearch.js b/app/javascript/dashboard/store/modules/conversationSearch.js
new file mode 100644
index 000000000..c289de62a
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/conversationSearch.js
@@ -0,0 +1,54 @@
+import ConversationAPI from '../../api/inbox/conversation';
+import types from '../mutation-types';
+export const initialState = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+  },
+};
+
+export const getters = {
+  getConversations(state) {
+    return state.records;
+  },
+  getUIFlags(state) {
+    return state.uiFlags;
+  },
+};
+
+export const actions = {
+  async get({ commit }, { q }) {
+    commit(types.SEARCH_CONVERSATIONS_SET, []);
+    if (!q) {
+      return;
+    }
+    commit(types.SEARCH_CONVERSATIONS_SET_UI_FLAG, { isFetching: true });
+    try {
+      const {
+        data: { payload },
+      } = await ConversationAPI.search({ q });
+      commit(types.SEARCH_CONVERSATIONS_SET, payload);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.SEARCH_CONVERSATIONS_SET_UI_FLAG, { isFetching: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SEARCH_CONVERSATIONS_SET](state, records) {
+    state.records = records;
+  },
+  [types.SEARCH_CONVERSATIONS_SET_UI_FLAG](state, uiFlags) {
+    state.uiFlags = { ...state.uiFlags, ...uiFlags };
+  },
+};
+
+export default {
+  namespaced: true,
+  state: initialState,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/conversationSearch/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversationSearch/actions.spec.js
new file mode 100644
index 000000000..449e699c2
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/conversationSearch/actions.spec.js
@@ -0,0 +1,44 @@
+import { actions } from '../../conversationSearch';
+import types from '../../../mutation-types';
+import axios from 'axios';
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#get', () => {
+    it('sends correct actions if no query param is provided', () => {
+      actions.get({ commit }, { q: '' });
+      expect(commit.mock.calls).toEqual([[types.SEARCH_CONVERSATIONS_SET, []]]);
+    });
+
+    it('sends correct actions if query param is provided and API call is success', async () => {
+      axios.get.mockResolvedValue({
+        data: {
+          payload: [{ messages: [{ id: 1, content: 'value testing' }], id: 1 }],
+        },
+      });
+
+      await actions.get({ commit }, { q: 'value' });
+      expect(commit.mock.calls).toEqual([
+        [types.SEARCH_CONVERSATIONS_SET, []],
+        [types.SEARCH_CONVERSATIONS_SET_UI_FLAG, { isFetching: true }],
+        [
+          types.SEARCH_CONVERSATIONS_SET,
+          [{ messages: [{ id: 1, content: 'value testing' }], id: 1 }],
+        ],
+        [types.SEARCH_CONVERSATIONS_SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+
+    it('sends correct actions if query param is provided and API call is errored', async () => {
+      axios.get.mockRejectedValue({});
+      await actions.get({ commit }, { q: 'value' });
+      expect(commit.mock.calls).toEqual([
+        [types.SEARCH_CONVERSATIONS_SET, []],
+        [types.SEARCH_CONVERSATIONS_SET_UI_FLAG, { isFetching: true }],
+        [types.SEARCH_CONVERSATIONS_SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/conversationSearch/getters.spec.js b/app/javascript/dashboard/store/modules/specs/conversationSearch/getters.spec.js
new file mode 100644
index 000000000..489a83fd2
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/conversationSearch/getters.spec.js
@@ -0,0 +1,19 @@
+import { getters } from '../../conversationSearch';
+
+describe('#getters', () => {
+  it('getConversations', () => {
+    const state = {
+      records: [{ id: 1, messages: [{ id: 1, content: 'value' }] }],
+    };
+    expect(getters.getConversations(state)).toEqual([
+      { id: 1, messages: [{ id: 1, content: 'value' }] },
+    ]);
+  });
+
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: { isFetching: false },
+    };
+    expect(getters.getUIFlags(state)).toEqual({ isFetching: false });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/conversationSearch/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversationSearch/mutations.spec.js
new file mode 100644
index 000000000..770129655
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/conversationSearch/mutations.spec.js
@@ -0,0 +1,22 @@
+import types from '../../../mutation-types';
+import { mutations } from '../../conversationSearch';
+
+describe('#mutations', () => {
+  describe('#SEARCH_CONVERSATIONS_SET', () => {
+    it('set records correctly', () => {
+      const state = { records: [] };
+      mutations[types.SEARCH_CONVERSATIONS_SET](state, [{ id: 1 }]);
+      expect(state.records).toEqual([{ id: 1 }]);
+    });
+  });
+
+  describe('#SEARCH_CONVERSATIONS_SET', () => {
+    it('set uiFlags correctly', () => {
+      const state = { uiFlags: { isFetching: true } };
+      mutations[types.SEARCH_CONVERSATIONS_SET_UI_FLAG](state, {
+        isFetching: false,
+      });
+      expect(state.uiFlags).toEqual({ isFetching: false });
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 2feb845b0..98e710318 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -123,4 +123,8 @@ export default {
   // User Typing
   ADD_USER_TYPING_TO_CONVERSATION: 'ADD_USER_TYPING_TO_CONVERSATION',
   REMOVE_USER_TYPING_FROM_CONVERSATION: 'REMOVE_USER_TYPING_FROM_CONVERSATION',
+
+  // Conversation Search
+  SEARCH_CONVERSATIONS_SET: 'SEARCH_CONVERSATIONS_SET',
+  SEARCH_CONVERSATIONS_SET_UI_FLAG: 'SEARCH_CONVERSATIONS_SET_UI_FLAG',
 };
diff --git a/app/views/api/v1/accounts/conversations/search.json.jbuilder b/app/views/api/v1/accounts/conversations/search.json.jbuilder
index ca8bb58eb..9193b0e48 100644
--- a/app/views/api/v1/accounts/conversations/search.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/search.json.jbuilder
@@ -1,22 +1,17 @@
-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.payload do
-    json.array! @conversations do |conversation|
-      json.inbox_id conversation.inbox_id
-      json.messages conversation.messages
-      json.status conversation.status
-      json.muted conversation.muted?
-      json.can_reply conversation.can_reply?
-      json.timestamp conversation.last_activity_at.to_i
-      json.contact_last_seen_at conversation.contact_last_seen_at.to_i
-      json.agent_last_seen_at conversation.agent_last_seen_at.to_i
-      json.additional_attributes conversation.additional_attributes
-      json.account_id conversation.account_id
-      json.labels conversation.label_list
+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.payload do
+  json.array! @conversations do |conversation|
+    json.id conversation.display_id
+    json.messages do
+      json.array! conversation.messages do |message|
+        json.content message.content
+        json.created_at message.created_at.to_i
+      end
     end
+    json.account_id conversation.account_id
   end
 end
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 87ff6d592..fbefe25a1 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -85,7 +85,7 @@ RSpec.describe 'Conversations API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body, symbolize_names: true)[:data]
+        response_data = JSON.parse(response.body, symbolize_names: true)
         expect(response_data[:meta][:all_count]).to eq(1)
         expect(response_data[:payload].first[:messages].first[:content]).to eq 'test1'
       end

From 2babfd614898f27fd1942eeff64d7c70531f7ca0 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 9 Nov 2020 22:01:57 +0530
Subject: [PATCH 23/36] fix: Add a check for thread_ts (#1389)

- If no thread timestamp is available, ignore the message
- Add specs to cover the case
---
 .../slack/incoming_message_builder.rb         |  6 ++++-
 .../slack/incoming_message_builder_spec.rb    |  8 ++++++
 spec/support/slack_stubs.rb                   | 27 +++++++++++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index acd4ca12d..a04f4e2bb 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -41,8 +41,12 @@ class Integrations::Slack::IncomingMessageBuilder
     params[:type] == 'url_verification'
   end
 
+  def thread_timestamp_available?
+    params[:event][:thread_ts].present?
+  end
+
   def create_message?
-    supported_message? && integration_hook
+    thread_timestamp_available? && supported_message? && integration_hook
   end
 
   def message
diff --git a/spec/lib/integrations/slack/incoming_message_builder_spec.rb b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
index fbbffb687..a2b0bc603 100644
--- a/spec/lib/integrations/slack/incoming_message_builder_spec.rb
+++ b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
 describe Integrations::Slack::IncomingMessageBuilder do
   let(:account) { create(:account) }
   let(:message_params) { slack_message_stub }
+  let(:message_without_thread_ts) { slack_message_stub_without_thread_ts }
   let(:verification_params) { slack_url_verification_stub }
 
   let!(:hook) { create(:integrations_hook, account: account, reference_id: message_params[:event][:channel]) }
@@ -18,6 +19,13 @@ describe Integrations::Slack::IncomingMessageBuilder do
     end
 
     context 'when message creation' do
+      it 'doesnot create message if thread info is missing' do
+        messages_count = conversation.messages.count
+        builder = described_class.new(message_without_thread_ts)
+        builder.perform
+        expect(conversation.messages.count).to eql(messages_count)
+      end
+
       it 'creates message' do
         expect(hook).not_to eq nil
         messages_count = conversation.messages.count
diff --git a/spec/support/slack_stubs.rb b/spec/support/slack_stubs.rb
index 18af884ed..e7cdb271d 100644
--- a/spec/support/slack_stubs.rb
+++ b/spec/support/slack_stubs.rb
@@ -21,8 +21,30 @@ module SlackStubs
     }
   end
 
+  def slack_message_stub_without_thread_ts
+    {
+      "token": '[FILTERED]',
+      "team_id": '',
+      "api_app_id": '',
+      "event": {
+        "type": 'message',
+        "client_msg_id": 'ffc6e64e-6f0c-4a3d-b594-faa6b44e48ab',
+        "text": 'this is test',
+        "user": 'ULYPAKE5S',
+        "ts": '1588623033.006000',
+        "team": 'TLST3048H'
+      },
+      "type": 'event_callback',
+      "event_id": '',
+      "event_time": 1_588_623_033,
+      "authed_users": '[FILTERED]',
+      "webhook": {}
+    }
+  end
+
   def message_event
-    { "client_msg_id": 'ffc6e64e-6f0c-4a3d-b594-faa6b44e48ab',
+    {
+      "client_msg_id": 'ffc6e64e-6f0c-4a3d-b594-faa6b44e48ab',
       "type": 'message',
       "text": 'this is test',
       "user": 'ULYPAKE5S',
@@ -32,7 +54,8 @@ module SlackStubs
       "thread_ts": '1588623023.005900',
       "channel": 'G01354F6A6Q',
       "event_ts": '1588623033.006000',
-      "channel_type": 'group' }
+      "channel_type": 'group'
+    }
   end
 
   def message_blocks

From f214c9c47c4d543651fc3dceab6c2dd618a4a68d Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Tue, 10 Nov 2020 15:25:26 +0530
Subject: [PATCH 24/36] feat: Add Contacts page (#1335)

Co-authored-by: Sojan <sojan@pepalo.com>
Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 .../api/v1/accounts/agents_controller.rb      |   2 +-
 .../api/v1/accounts/contacts_controller.rb    |  33 ++-
 .../api/v1/accounts/inboxes_controller.rb     |   2 +-
 app/finders/conversation_finder.rb            |   7 +-
 app/finders/message_finder.rb                 |   2 +-
 app/javascript/dashboard/api/contacts.js      |   8 +
 .../dashboard/assets/scss/_woot.scss          |   1 +
 app/javascript/dashboard/assets/scss/app.scss |   1 +
 .../assets/scss/plugins/_dropdown.scss        |  27 +++
 .../dashboard/components/layout/Sidebar.vue   |   5 +-
 .../components/widgets/EmptyState.vue         |   5 +-
 .../dashboard/i18n/default-sidebar.js         |   8 +
 .../dashboard/i18n/locale/en/contact.json     |  16 ++
 .../i18n/locale/en/contactsPage.json          |  21 ++
 .../dashboard/i18n/locale/en/settings.json    |   4 +-
 .../dashboard/routes/dashboard/Dashboard.vue  |   1 -
 .../contacts/components/ContactInfoPanel.vue  |  97 +++++++++
 .../contacts/components/ContactsTable.vue     | 198 +++++++++++++++++
 .../contacts/components/ContactsView.vue      | 146 +++++++++++++
 .../dashboard/contacts/components/Footer.vue  | 204 ++++++++++++++++++
 .../dashboard/contacts/components/Header.vue  | 114 ++++++++++
 .../routes/dashboard/contacts/routes.js       |  12 ++
 .../dashboard/conversation/ContactPanel.vue   |   1 +
 .../routes/dashboard/dashboard.routes.js      |   3 +-
 .../dashboard/store/modules/contacts.js       | 126 -----------
 .../store/modules/contacts/actions.js         |  74 +++++++
 .../store/modules/contacts/getters.js         |  15 ++
 .../dashboard/store/modules/contacts/index.js |  24 +++
 .../store/modules/contacts/mutations.js       |  56 +++++
 .../modules/specs/contacts/actions.spec.js    |  50 +++--
 .../modules/specs/contacts/getters.spec.js    |   4 +-
 .../modules/specs/contacts/mutations.spec.js  |  11 +-
 .../dashboard/store/mutation-types.js         |   2 +
 .../assets/stylesheets/font-weights.scss      |   8 +
 .../shared/assets/stylesheets/spacing.scss    |  13 ++
 .../widget/components/ConversationWrap.vue    |   5 +-
 .../v1/accounts/contacts/active.json.jbuilder |   5 +
 .../v1/accounts/contacts/index.json.jbuilder  |   5 +
 .../v1/accounts/contacts/search.json.jbuilder |   5 +
 .../api/v1/models/_contact.json.jbuilder      |   2 +
 .../v1/accounts/contacts_controller_spec.rb   |  19 +-
 41 files changed, 1163 insertions(+), 179 deletions(-)
 create mode 100644 app/javascript/dashboard/assets/scss/plugins/_dropdown.scss
 create mode 100644 app/javascript/dashboard/i18n/locale/en/contactsPage.json
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/Footer.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/contacts/routes.js
 delete mode 100644 app/javascript/dashboard/store/modules/contacts.js
 create mode 100644 app/javascript/dashboard/store/modules/contacts/actions.js
 create mode 100644 app/javascript/dashboard/store/modules/contacts/getters.js
 create mode 100644 app/javascript/dashboard/store/modules/contacts/index.js
 create mode 100644 app/javascript/dashboard/store/modules/contacts/mutations.js
 create mode 100644 app/javascript/shared/assets/stylesheets/font-weights.scss

diff --git a/app/controllers/api/v1/accounts/agents_controller.rb b/app/controllers/api/v1/accounts/agents_controller.rb
index ed9d3ebc8..83f1ad186 100644
--- a/app/controllers/api/v1/accounts/agents_controller.rb
+++ b/app/controllers/api/v1/accounts/agents_controller.rb
@@ -64,6 +64,6 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   end
 
   def agents
-    @agents ||= Current.account.users.order_by_full_name
+    @agents ||= Current.account.users.order_by_full_name.includes({ avatar_attachment: [:blob] })
   end
 end
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index 55428b24a..c1e90d957 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -1,17 +1,32 @@
 class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
+  RESULTS_PER_PAGE = 15
   protect_from_forgery with: :null_session
 
   before_action :check_authorization
+  before_action :set_current_page, only: [:index, :active, :search]
   before_action :fetch_contact, only: [:show, :update]
 
   def index
-    @contacts = Current.account.contacts
+    contacts = Current.account.contacts.where.not(email: [nil, '']).or(Current.account.contacts.where.not(phone_number: [nil, '']))
+    @contacts_count = contacts.count
+    @contacts = fetch_contact_last_seen_at(contacts)
+  end
+
+  def search
+    render json: { error: 'Specify search string with parameter q' }, status: :unprocessable_entity if params[:q].blank? && return
+
+    contacts = Current.account.contacts.where.not(email: [nil, '']).or(Current.account.contacts.where.not(phone_number: [nil, '']))
+                      .where('name LIKE :search OR email LIKE :search', search: "%#{params[:q]}%")
+    @contacts_count = contacts.count
+    @contacts = fetch_contact_last_seen_at(contacts)
   end
 
   # returns online contacts
   def active
-    @contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
+    contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
                   .get_available_contact_ids(Current.account.id))
+    @contacts_count = contacts.count
+    @contacts = contacts.page(@current_page)
   end
 
   def show; end
@@ -36,13 +51,19 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     }, status: :unprocessable_entity
   end
 
-  def search
-    render json: { error: 'Specify search string with parameter q' }, status: :unprocessable_entity if params[:q].blank? && return
+  private
 
-    @contacts = Current.account.contacts.where('name LIKE :search OR email LIKE :search', search: "%#{params[:q]}%")
+  def set_current_page
+    @current_page = params[:page] || 1
   end
 
-  private
+  def fetch_contact_last_seen_at(contacts)
+    contacts.left_outer_joins(:conversations)
+            .select('contacts.*, COUNT(conversations.id) as conversations_count, MAX(conversations.contact_last_seen_at) as last_seen_at')
+            .group('contacts.id')
+            .includes([{ avatar_attachment: [:blob] }, { contact_inboxes: [:inbox] }])
+            .page(@current_page).per(RESULTS_PER_PAGE)
+  end
 
   def build_contact_inbox
     return if params[:inbox_id].blank?
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index a2a879376..0f573bbb9 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   before_action :check_authorization
 
   def index
-    @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, :avatar_attachment))
+    @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, { avatar_attachment: [:blob] }))
   end
 
   def create
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 051b25679..2aa7cb321 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -62,9 +62,7 @@ class ConversationFinder
   end
 
   def find_all_conversations
-    @conversations = current_account.conversations.includes(
-      :assignee, :inbox, :taggings, contact: [:avatar_attachment]
-    ).where(inbox_id: @inbox_ids)
+    @conversations = current_account.conversations.where(inbox_id: @inbox_ids)
   end
 
   def filter_by_assignee_type
@@ -106,6 +104,9 @@ class ConversationFinder
   end
 
   def conversations
+    @conversations = @conversations.includes(
+      :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }
+    )
     current_page ? @conversations.latest.page(current_page) : @conversations.latest
   end
 end
diff --git a/app/finders/message_finder.rb b/app/finders/message_finder.rb
index 5295dce74..63c72bd8e 100644
--- a/app/finders/message_finder.rb
+++ b/app/finders/message_finder.rb
@@ -11,7 +11,7 @@ class MessageFinder
   private
 
   def conversation_messages
-    @conversation.messages.includes(:attachments, :sender)
+    @conversation.messages.includes(:attachments, :sender, sender: { avatar_attachment: [:blob] })
   end
 
   def messages
diff --git a/app/javascript/dashboard/api/contacts.js b/app/javascript/dashboard/api/contacts.js
index 0988141d3..6429c53d2 100644
--- a/app/javascript/dashboard/api/contacts.js
+++ b/app/javascript/dashboard/api/contacts.js
@@ -6,9 +6,17 @@ class ContactAPI extends ApiClient {
     super('contacts', { accountScoped: true });
   }
 
+  get(page) {
+    return axios.get(`${this.url}?page=${page}`);
+  }
+
   getConversations(contactId) {
     return axios.get(`${this.url}/${contactId}/conversations`);
   }
+
+  search(search = '', page = 1) {
+    return axios.get(`${this.url}/search?q=${search}&page=${page}`);
+  }
 }
 
 export default new ContactAPI();
diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index 7f5ef39c9..7f9041b93 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -26,3 +26,4 @@
 @import 'views/signup';
 
 @import 'plugins/multiselect';
+@import 'plugins/dropdown';
diff --git a/app/javascript/dashboard/assets/scss/app.scss b/app/javascript/dashboard/assets/scss/app.scss
index 92edc8e42..3220f0326 100644
--- a/app/javascript/dashboard/assets/scss/app.scss
+++ b/app/javascript/dashboard/assets/scss/app.scss
@@ -2,6 +2,7 @@
 @import 'shared/assets/stylesheets/colors';
 @import 'shared/assets/stylesheets/spacing';
 @import 'shared/assets/stylesheets/font-size';
+@import 'shared/assets/stylesheets/font-weights';
 @import 'variables';
 
 @import '~spinkit/scss/spinners/7-three-bounce';
diff --git a/app/javascript/dashboard/assets/scss/plugins/_dropdown.scss b/app/javascript/dashboard/assets/scss/plugins/_dropdown.scss
new file mode 100644
index 000000000..b4dada351
--- /dev/null
+++ b/app/javascript/dashboard/assets/scss/plugins/_dropdown.scss
@@ -0,0 +1,27 @@
+.dropdown-pane.sleek {
+  @include elegant-card;
+  @include border-light;
+  padding-left: 0;
+  padding-right: 0;
+  right: -12px;
+  top: 48px;
+  width: auto;
+
+  &::before {
+    @include arrow(top, var(--color-border-light), 14px);
+    position: absolute;
+    right: 6px;
+    top: -14px;
+  }
+
+  &::after {
+    @include arrow(top, $color-white, var(--space-slab));
+    position: absolute;
+    right: var(--space-small);
+    top: -12px;
+  }
+
+  .dropdown>li>a:hover {
+    background: var(--color-background);
+  }
+}
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 43f4640e0..77b12d9f8 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -30,7 +30,7 @@
       <availability-status />
     </div>
 
-    <div class="bottom-nav">
+    <div class="bottom-nav app-context-menu">
       <transition name="menu-slide">
         <div
           v-if="showOptionsMenu"
@@ -405,4 +405,7 @@ export default {
     }
   }
 }
+.app-context-menu {
+  height: 6rem;
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/EmptyState.vue b/app/javascript/dashboard/components/widgets/EmptyState.vue
index b6447ffd5..6bb8ecaed 100644
--- a/app/javascript/dashboard/components/widgets/EmptyState.vue
+++ b/app/javascript/dashboard/components/widgets/EmptyState.vue
@@ -1,12 +1,11 @@
 <template>
   <div class="row empty-state">
-    <h3 class="title">{{title}}</h3>
-    <p class="message">{{message}}</p>
+    <h3 class="title">{{ title }}</h3>
+    <p class="message">{{ message }}</p>
     <slot />
   </div>
 </template>
 <script>
-
 export default {
   props: {
     title: String,
diff --git a/app/javascript/dashboard/i18n/default-sidebar.js b/app/javascript/dashboard/i18n/default-sidebar.js
index 246bc0af2..657a60eef 100644
--- a/app/javascript/dashboard/i18n/default-sidebar.js
+++ b/app/javascript/dashboard/i18n/default-sidebar.js
@@ -7,6 +7,7 @@ export const getSidebarItems = accountId => ({
       'inbox_dashboard',
       'inbox_conversation',
       'conversation_through_inbox',
+      'contacts_dashboard',
       'settings_account_reports',
       'profile_settings',
       'profile_settings_index',
@@ -23,6 +24,13 @@ export const getSidebarItems = accountId => ({
         toolTip: 'Conversation from all subscribed inboxes',
         toStateName: 'home',
       },
+      contacts: {
+        icon: 'ion-person-stalker',
+        label: 'CONTACTS',
+        hasSubMenu: false,
+        toState: frontendURL(`accounts/${accountId}/contacts`),
+        toStateName: 'contacts_dashboard',
+      },
       report: {
         icon: 'ion-arrow-graph-up-right',
         label: 'REPORTS',
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 790d56029..3dab6ac0b 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -95,5 +95,21 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ],
+      "EDIT_BUTTON": "Edit"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/contactsPage.json b/app/javascript/dashboard/i18n/locale/en/contactsPage.json
new file mode 100644
index 000000000..e8345a3e2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/contactsPage.json
@@ -0,0 +1,21 @@
+{
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "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": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ],
+      "EDIT_BUTTON": "Edit",
+      "VIEW_BUTTON": "View"
+
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 3e96b9861..b1363f2aa 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -57,8 +57,7 @@
       },
       "AVAILABILITY": {
         "LABEL": "Availability",
-        "STATUSES_LIST": [
-          {
+        "STATUSES_LIST": [{
             "value": "online",
             "label": "Online"
           },
@@ -122,6 +121,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/routes/dashboard/Dashboard.vue b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
index 54bf35493..1b0744bbd 100644
--- a/app/javascript/dashboard/routes/dashboard/Dashboard.vue
+++ b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
@@ -8,7 +8,6 @@
 </template>
 
 <script>
-/* global bus */
 import Sidebar from '../../components/layout/Sidebar';
 
 export default {
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
new file mode 100644
index 000000000..e42785a13
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -0,0 +1,97 @@
+<template>
+  <div class="medium-3 bg-white contact--panel">
+    <span class="close-button" @click="onClose">
+      <i class="ion-android-close close-icon" />
+    </span>
+    <contact-info :contact="contact" />
+    <contact-custom-attributes
+      v-if="hasContactAttributes"
+      :custom-attributes="contact.custom_attributes"
+    />
+    <contact-conversations
+      v-if="contact.id"
+      :contact-id="contact.id"
+      conversation-id=""
+    />
+  </div>
+</template>
+
+<script>
+import ContactConversations from 'dashboard/routes/dashboard/conversation/ContactConversations';
+import ContactInfo from 'dashboard/routes/dashboard/conversation/contact/ContactInfo';
+import ContactCustomAttributes from 'dashboard/routes/dashboard/conversation/ContactCustomAttributes';
+
+export default {
+  components: {
+    ContactCustomAttributes,
+    ContactConversations,
+    ContactInfo,
+  },
+  props: {
+    contact: {
+      type: Object,
+      default: () => ({}),
+    },
+    onClose: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  computed: {
+    hasContactAttributes() {
+      const { custom_attributes: customAttributes } = this.contact;
+      return customAttributes && Object.keys(customAttributes).length;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import '~dashboard/assets/scss/variables';
+@import '~dashboard/assets/scss/mixins';
+
+.contact--panel {
+  @include border-normal-left;
+
+  background: white;
+  font-size: var(--font-size-small);
+  overflow-y: auto;
+  overflow: auto;
+  position: relative;
+  padding: var(--space-one);
+}
+
+.close-button {
+  position: absolute;
+  right: var(--space-normal);
+  top: var(--space-slab);
+  font-size: var(--font-size-big);
+  color: var(--color-heading);
+
+  .close-icon {
+    margin-right: var(--space-smaller);
+  }
+}
+
+.conversation--details {
+  border-top: 1px solid $color-border-light;
+  padding: var(--space-normal);
+}
+
+.contact-conversation--panel {
+  border-top: 1px solid $color-border-light;
+  height: 100%;
+}
+
+.contact--mute {
+  color: var(--r-400);
+  display: block;
+  text-align: left;
+}
+
+.contact--actions {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
new file mode 100644
index 000000000..d34902d62
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -0,0 +1,198 @@
+<template>
+  <section class="contacts-table-wrap">
+    <table class="woot-table contacts-table">
+      <thead>
+        <th
+          v-for="thHeader in $t('CONTACTS_PAGE.LIST.TABLE_HEADER')"
+          :key="thHeader"
+        >
+          {{ thHeader }}
+        </th>
+      </thead>
+      <tbody v-show="showTableData">
+        <tr
+          v-for="contactItem in contacts"
+          :key="contactItem.id"
+          :class="{ 'is-active': contactItem.id === activeContactId }"
+          @click="() => onClickContact(contactItem.id)"
+        >
+          <td>
+            <div class="row-main-info">
+              <thumbnail
+                :src="contactItem.thumbnail"
+                size="36px"
+                :username="contactItem.name"
+                :status="contactItem.availability_status"
+              />
+              <div>
+                <h4 class="sub-block-title user-name">
+                  {{ contactItem.name }}
+                </h4>
+                <p class="user-email">
+                  {{ contactItem.email || '--' }}
+                </p>
+              </div>
+            </div>
+          </td>
+          <td>{{ contactItem.phone_number || '--' }}</td>
+          <td class="conversation-count-item">
+            {{ contactItem.conversations_count }}
+          </td>
+          <td>
+            {{ contactItem.last_contacted_at || '--' }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <empty-state
+      v-if="showSearchEmptyState"
+      :title="$t('CONTACTS_PAGE.LIST.404')"
+    />
+    <div v-if="isLoading" class="contacts--loader">
+      <spinner />
+      <span>{{ $t('CONTACTS_PAGE.LIST.LOADING_MESSAGE') }}</span>
+    </div>
+  </section>
+</template>
+
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+import Spinner from 'shared/components/Spinner.vue';
+import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
+
+export default {
+  components: {
+    Thumbnail,
+    EmptyState,
+    Spinner,
+  },
+  mixins: [clickaway],
+  props: {
+    contacts: {
+      type: Array,
+      default: () => [],
+    },
+    showSearchEmptyState: {
+      type: Boolean,
+      default: false,
+    },
+    openEditModal: {
+      type: Function,
+      default: () => {},
+    },
+    onClickContact: {
+      type: Function,
+      default: () => {},
+    },
+    isLoading: {
+      type: Boolean,
+      default: false,
+    },
+    activeContactId: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    currentRoute() {
+      return ' ';
+    },
+    sidebarClassName() {
+      if (this.isOnDesktop) {
+        return '';
+      }
+      if (this.isSidebarOpen) {
+        return 'off-canvas is-open ';
+      }
+      return 'off-canvas position-left is-transition-push is-closed';
+    },
+    contentClassName() {
+      if (this.isOnDesktop) {
+        return '';
+      }
+      if (this.isSidebarOpen) {
+        return 'off-canvas-content is-open-left has-transition-push has-position-left';
+      }
+      return 'off-canvas-content';
+    },
+    showTableData() {
+      return !this.showSearchEmptyState && !this.isLoading;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import '~dashboard/assets/scss/mixins';
+
+.contacts-table-wrap {
+  @include scroll-on-hover;
+  background: var(--color-background-light);
+  flex: 1 1;
+  height: 100%;
+}
+
+.contacts-table {
+  > thead {
+    border-bottom: 1px solid var(--color-border);
+    background: white;
+
+    > th:first-child {
+      padding-left: var(--space-medium);
+      width: 30%;
+    }
+  }
+
+  > tbody {
+    > tr {
+      cursor: pointer;
+
+      &:hover {
+        background: var(--b-50);
+      }
+
+      &.is-active {
+        background: var(--b-100);
+      }
+
+      > td {
+        padding: var(--space-slab);
+
+        &:first-child {
+          padding-left: var(--space-medium);
+        }
+
+        &.conversation-count-item {
+          padding-left: var(--space-medium);
+        }
+      }
+    }
+  }
+  .row-main-info {
+    display: flex;
+    align-items: center;
+
+    .user-thumbnail-box {
+      margin-right: var(--space-small);
+    }
+
+    .user-name {
+      text-transform: capitalize;
+      margin: 0;
+    }
+
+    .user-email {
+      margin: 0;
+    }
+  }
+}
+
+.contacts--loader {
+  font-size: var(--font-size-default);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: var(--space-big);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
new file mode 100644
index 000000000..0661c9d68
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="contacts-page row">
+    <div class="left-wrap" :class="wrapClas">
+      <contacts-header
+        :search-query="searchQuery"
+        :on-search-submit="onSearchSubmit"
+        :on-input-search="onInputSearch"
+      />
+      <contacts-table
+        :contacts="records"
+        :show-search-empty-state="showEmptySearchResult"
+        :open-edit-modal="openEditModal"
+        :is-loading="uiFlags.isFetching"
+        :on-click-contact="openContactInfoPanel"
+        :active-contact-id="selectedContactId"
+      />
+      <contacts-footer
+        :on-page-change="onPageChange"
+        :current-page="Number(meta.currentPage)"
+        :total-count="meta.count"
+      />
+      <edit-contact
+        :show="showEditModal"
+        :contact="selectedContact"
+        @cancel="closeEditModal"
+      />
+    </div>
+    <contact-info-panel
+      v-if="showContactViewPane"
+      :contact="selectedContact"
+      :on-close="closeContactInfoPanel"
+    />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+
+import EditContact from 'dashboard/routes/dashboard/conversation/contact/EditContact';
+
+import ContactsHeader from './Header';
+import ContactsTable from './ContactsTable';
+import ContactInfoPanel from './ContactInfoPanel';
+import ContactsFooter from './Footer';
+
+export default {
+  components: {
+    ContactsHeader,
+    ContactsTable,
+    ContactsFooter,
+    EditContact,
+    ContactInfoPanel,
+  },
+  data() {
+    return {
+      searchQuery: '',
+      showEditModal: false,
+      selectedContactId: '',
+    };
+  },
+  computed: {
+    ...mapGetters({
+      records: 'contacts/getContacts',
+      uiFlags: 'contacts/getUIFlags',
+      meta: 'contacts/getMeta',
+    }),
+    showEmptySearchResult() {
+      const hasEmptyResults = !!this.searchQuery && this.records.length === 0;
+      return hasEmptyResults;
+    },
+    selectedContact() {
+      if (this.selectedContactId) {
+        const contact = this.records.find(
+          item => this.selectedContactId === item.id
+        );
+        return contact;
+      }
+      return undefined;
+    },
+    showContactViewPane() {
+      return this.selectedContactId !== '';
+    },
+    wrapClas() {
+      return this.showContactViewPane ? 'medium-9' : 'medium-12';
+    },
+  },
+  mounted() {
+    this.$store.dispatch('contacts/get', { page: 1 });
+  },
+  methods: {
+    onInputSearch(event) {
+      const newQuery = event.target.value;
+      const refetchAllContacts = !!this.searchQuery && newQuery === '';
+
+      if (refetchAllContacts) {
+        this.$store.dispatch('contacts/get', { page: 1 });
+      }
+      this.searchQuery = event.target.value;
+    },
+    onSearchSubmit() {
+      this.$store.dispatch('contacts/search', {
+        search: this.searchQuery,
+        page: 1,
+      });
+    },
+    onPageChange(page) {
+      if (this.searchQuery) {
+        this.$store.dispatch('contacts/search', {
+          search: this.searchQuery,
+          page,
+        });
+      } else {
+        this.$store.dispatch('contacts/get', { page });
+      }
+    },
+    openContactInfoPanel(contactId) {
+      this.selectedContactId = contactId;
+      this.showContactInfoPanelPane = true;
+    },
+    closeContactInfoPanel() {
+      this.selectedContactId = '';
+      this.showContactInfoPanelPane = false;
+    },
+    openEditModal(contactId) {
+      this.selectedContactId = contactId;
+      this.showEditModal = true;
+    },
+    closeEditModal() {
+      this.selectedContactId = '';
+      this.showEditModal = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.contacts-page {
+  width: 100%;
+}
+.left-wrap {
+  display: flex;
+  flex-direction: column;
+  padding-top: var(--space-normal);
+  height: 100%;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Footer.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Footer.vue
new file mode 100644
index 000000000..70f27121a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Footer.vue
@@ -0,0 +1,204 @@
+<template>
+  <footer class="footer">
+    <div class="left-aligned-wrap">
+      <div class="page-meta">
+        <strong>{{ firstIndex }}</strong>
+        - <strong>{{ lastIndex }}</strong> of
+        <strong>{{ totalCount }}</strong> items
+      </div>
+    </div>
+    <div class="right-aligned-wrap">
+      <div
+        v-if="totalCount"
+        class="primary button-group pagination-button-group"
+      >
+        <button
+          class="button small goto-first"
+          :class="firstPageButtonClass"
+          @click="onFirstPage"
+        >
+          <i class="ion-chevron-left" />
+          <i class="ion-chevron-left" />
+        </button>
+        <button
+          class="button small"
+          :class="prevPageButtonClass"
+          @click="onPrevPage"
+        >
+          <i class="ion-chevron-left" />
+        </button>
+        <button class="button" @click.prevent>
+          {{ currentPage }}
+        </button>
+        <button
+          class="button small"
+          :class="nextPageButtonClass"
+          @click="onNextPage"
+        >
+          <i class="ion-chevron-right" />
+        </button>
+        <button
+          class="button small goto-last"
+          :class="lastPageButtonClass"
+          @click="onLastPage"
+        >
+          <i class="ion-chevron-right" />
+          <i class="ion-chevron-right" />
+        </button>
+      </div>
+    </div>
+  </footer>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {
+    currentPage: {
+      type: Number,
+      default: 1,
+    },
+    pageSize: {
+      type: Number,
+      default: 25,
+    },
+    totalCount: {
+      type: Number,
+      default: 0,
+    },
+    onPageChange: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  computed: {
+    firstIndex() {
+      const firstIndex = this.pageSize * (this.currentPage - 1) + 1;
+      return firstIndex;
+    },
+    lastIndex() {
+      const index = Math.min(this.totalCount, this.pageSize * this.currentPage);
+      return index;
+    },
+    searchButtonClass() {
+      return this.searchQuery !== '' ? 'show' : '';
+    },
+    hasLastPage() {
+      const isDisabled =
+        this.currentPage === Math.ceil(this.totalCount / this.pageSize);
+      return isDisabled;
+    },
+    lastPageButtonClass() {
+      const className = this.hasLastPage ? 'disabled' : '';
+      return className;
+    },
+    hasFirstPage() {
+      const isDisabled = this.currentPage === 1;
+      return isDisabled;
+    },
+    firstPageButtonClass() {
+      const className = this.hasFirstPage ? 'disabled' : '';
+      return className;
+    },
+    hasNextPage() {
+      const isDisabled =
+        this.currentPage === Math.ceil(this.totalCount / this.pageSize);
+      return isDisabled;
+    },
+    nextPageButtonClass() {
+      const className = this.hasNextPage ? 'disabled' : '';
+      return className;
+    },
+    hasPrevPage() {
+      const isDisabled = this.currentPage === 1;
+      return isDisabled;
+    },
+    prevPageButtonClass() {
+      const className = this.hasPrevPage ? 'disabled' : '';
+      return className;
+    },
+  },
+  methods: {
+    onNextPage() {
+      if (this.hasNextPage) return;
+      const newPage = this.currentPage + 1;
+      this.onPageChange(newPage);
+    },
+    onPrevPage() {
+      if (this.hasPrevPage) return;
+
+      const newPage = this.currentPage - 1;
+      this.onPageChange(newPage);
+    },
+    onFirstPage() {
+      if (this.hasFirstPage) return;
+
+      const newPage = 1;
+      this.onPageChange(newPage);
+    },
+    onLastPage() {
+      if (this.hasLastPage) return;
+
+      const newPage = Math.ceil(this.totalCount / this.pageSize);
+      this.onPageChange(newPage);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.footer {
+  height: 60px;
+  border-top: 1px solid var(--color-border);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 var(--space-normal);
+}
+.page-meta {
+  font-size: var(--font-size-mini);
+}
+.pagination-button-group {
+  margin: 0;
+
+  .button {
+    background: transparent;
+    border-color: var(--b-400);
+    color: var(--color-body);
+    margin-bottom: 0;
+    margin-left: -2px;
+    font-size: var(--font-size-small);
+    padding: var(--space-small) var(--space-normal);
+
+    &:hover,
+    &:focus,
+    &:active {
+      background: var(--b-400);
+      color: white;
+    }
+
+    &:first-child {
+      border-top-left-radius: 3px;
+      border-bottom-left-radius: 3px;
+    }
+    &:last-child {
+      border-top-right-radius: 3px;
+      border-bottom-right-radius: 3px;
+    }
+    &.small {
+      font-size: var(--font-size-micro);
+    }
+    &.disabled {
+      background: var(--b-300);
+      color: var(--b-900);
+    }
+
+    &.goto-first,
+    &.goto-last {
+      i:last-child {
+        margin-left: var(--space-minus-smaller);
+      }
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
new file mode 100644
index 000000000..6489b1ee9
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -0,0 +1,114 @@
+<template>
+  <header class="header">
+    <div class="table-actions-wrap">
+      <div class="left-aligned-wrap">
+        <h1 class="page-title">
+          {{ $t('CONTACTS_PAGE.HEADER') }}
+        </h1>
+      </div>
+      <div class="right-aligned-wrap">
+        <div class="search-wrap">
+          <i class="ion-ios-search-strong search-icon" />
+          <input
+            type="text"
+            :placeholder="$t('CONTACTS_PAGE.SEARCH_INPUT_PLACEHOLDER')"
+            class="contact-search"
+            :value="searchQuery"
+            @input="onInputSearch"
+          />
+          <woot-submit-button
+            :button-text="$t('CONTACTS_PAGE.SEARCH_BUTTON')"
+            :loading="false"
+            :button-class="searchButtonClass"
+            @click="onSearchSubmit"
+          />
+        </div>
+      </div>
+    </div>
+  </header>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {
+    searchQuery: {
+      type: String,
+      default: '',
+    },
+    onInputSearch: {
+      type: Function,
+      default: () => {},
+    },
+    onSearchSubmit: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  computed: {
+    searchButtonClass() {
+      return this.searchQuery !== '' ? 'show' : '';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+/* TODO-REM; Change variables sizing to rem after html font size change from 1.0 t0 1.6 */
+
+.header {
+  padding: 0 var(--space-medium);
+}
+.page-title {
+  margin: 0;
+}
+.table-actions-wrap {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  margin-bottom: var(--space-slab);
+}
+.search-wrap {
+  width: 400px;
+  height: 3.6rem;
+  display: flex;
+  align-items: center;
+  position: relative;
+
+  .search-icon {
+    position: absolute;
+    top: 1px;
+    left: var(--space-one);
+    height: 3.6rem;
+    line-height: 3.6rem;
+    font-size: var(--font-size-medium);
+    color: var(--b-700);
+  }
+  .contact-search {
+    margin: 0;
+    height: 3.6rem;
+    width: 100%;
+    padding-left: var(--space-large);
+    padding-right: 6rem;
+  }
+
+  .button {
+    margin-left: var(--space-small);
+    height: 3.2rem;
+    top: var(--space-micro);
+    right: var(--space-micro);
+    position: absolute;
+    padding: 0 var(--space-small);
+    transition: transform 100ms linear;
+    opacity: 0;
+    transform: translateX(-1px);
+    visibility: hidden;
+  }
+
+  .button.show {
+    opacity: 1;
+    transform: translateX(0);
+    visibility: visible;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/routes.js b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
new file mode 100644
index 000000000..06a13c7db
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
@@ -0,0 +1,12 @@
+/* eslint arrow-body-style: 0 */
+import ContactsView from './components/ContactsView';
+import { frontendURL } from '../../../helper/URLHelper';
+
+export const routes = [
+  {
+    path: frontendURL('accounts/:accountId/contacts'),
+    name: 'contacts_dashboard',
+    roles: ['administrator', 'agent'],
+    component: ContactsView,
+  },
+];
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index bd9a52ab7..cbf6656d8 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -45,6 +45,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
+
 import ContactConversations from './ContactConversations.vue';
 import ContactDetailsItem from './ContactDetailsItem.vue';
 import ContactInfo from './contact/ContactInfo';
diff --git a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
index 42db278c7..49d1c88e2 100644
--- a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
@@ -1,6 +1,7 @@
 import AppContainer from './Dashboard';
 import settings from './settings/settings.routes';
 import conversation from './conversation/conversation.routes';
+import { routes as contactRoutes } from './contacts/routes';
 import { frontendURL } from '../../helper/URLHelper';
 
 export default {
@@ -8,7 +9,7 @@ export default {
     {
       path: frontendURL('accounts/:account_id'),
       component: AppContainer,
-      children: [...conversation.routes, ...settings.routes],
+      children: [...conversation.routes, ...settings.routes, ...contactRoutes],
     },
   ],
 };
diff --git a/app/javascript/dashboard/store/modules/contacts.js b/app/javascript/dashboard/store/modules/contacts.js
deleted file mode 100644
index 0d09279e1..000000000
--- a/app/javascript/dashboard/store/modules/contacts.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import { DuplicateContactException } from 'shared/helpers/CustomErrors';
-import * as types from '../mutation-types';
-import ContactAPI from '../../api/contacts';
-import Vue from 'vue';
-
-const state = {
-  records: {},
-  uiFlags: {
-    isFetching: false,
-    isFetchingItem: false,
-    isUpdating: false,
-  },
-};
-
-export const getters = {
-  getContacts($state) {
-    return Object.values($state.records);
-  },
-  getUIFlags($state) {
-    return $state.uiFlags;
-  },
-  getContact: $state => id => {
-    const contact = $state.records[id];
-    return contact || {};
-  },
-};
-
-export const actions = {
-  get: async ({ commit }) => {
-    commit(types.default.SET_CONTACT_UI_FLAG, { isFetching: true });
-    try {
-      const response = await ContactAPI.get();
-      commit(types.default.SET_CONTACTS, response.data.payload);
-      commit(types.default.SET_CONTACT_UI_FLAG, { isFetching: false });
-    } catch (error) {
-      commit(types.default.SET_CONTACT_UI_FLAG, { isFetching: false });
-    }
-  },
-
-  show: async ({ commit }, { id }) => {
-    commit(types.default.SET_CONTACT_UI_FLAG, { isFetchingItem: true });
-    try {
-      const response = await ContactAPI.show(id);
-      commit(types.default.SET_CONTACT_ITEM, response.data.payload);
-      commit(types.default.SET_CONTACT_UI_FLAG, { isFetchingItem: false });
-    } catch (error) {
-      commit(types.default.SET_CONTACT_UI_FLAG, { isFetchingItem: false });
-    }
-  },
-
-  update: async ({ commit }, { id, ...updateObj }) => {
-    commit(types.default.SET_CONTACT_UI_FLAG, { isUpdating: true });
-    try {
-      const response = await ContactAPI.update(id, updateObj);
-      commit(types.default.EDIT_CONTACT, response.data.payload);
-      commit(types.default.SET_CONTACT_UI_FLAG, { isUpdating: false });
-    } catch (error) {
-      commit(types.default.SET_CONTACT_UI_FLAG, { isUpdating: false });
-      if (error.response?.data?.contact) {
-        throw new DuplicateContactException(error.response.data.contact);
-      } else {
-        throw new Error(error);
-      }
-    }
-  },
-
-  updatePresence: ({ commit }, data) => {
-    commit(types.default.UPDATE_CONTACTS_PRESENCE, data);
-  },
-
-  setContact({ commit }, data) {
-    commit(types.default.SET_CONTACT_ITEM, data);
-  },
-};
-
-export const mutations = {
-  [types.default.SET_CONTACT_UI_FLAG]($state, data) {
-    $state.uiFlags = {
-      ...$state.uiFlags,
-      ...data,
-    };
-  },
-
-  [types.default.SET_CONTACTS]: ($state, data) => {
-    data.forEach(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, {
-      ...($state.records[data.id] || {}),
-      ...data,
-    });
-  },
-
-  [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 {
-  namespaced: true,
-  state,
-  getters,
-  actions,
-  mutations,
-};
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
new file mode 100644
index 000000000..fd16a8de6
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -0,0 +1,74 @@
+import { DuplicateContactException } from 'shared/helpers/CustomErrors';
+import types from '../../mutation-types';
+import ContactAPI from '../../../api/contacts';
+
+export const actions = {
+  search: async ({ commit }, { search, page }) => {
+    commit(types.SET_CONTACT_UI_FLAG, { isFetching: true });
+    try {
+      const {
+        data: { payload, meta },
+      } = await ContactAPI.search(search, page);
+      commit(types.CLEAR_CONTACTS);
+      commit(types.SET_CONTACTS, payload);
+      commit(types.SET_CONTACT_META, meta);
+      commit(types.SET_CONTACT_UI_FLAG, { isFetching: false });
+    } catch (error) {
+      commit(types.SET_CONTACT_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  get: async ({ commit }, { page = 1 } = {}) => {
+    commit(types.SET_CONTACT_UI_FLAG, { isFetching: true });
+    try {
+      const {
+        data: { payload, meta },
+      } = await ContactAPI.get(page);
+      commit(types.CLEAR_CONTACTS);
+      commit(types.SET_CONTACTS, payload);
+      commit(types.SET_CONTACT_META, meta);
+      commit(types.SET_CONTACT_UI_FLAG, { isFetching: false });
+    } catch (error) {
+      commit(types.SET_CONTACT_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  show: async ({ commit }, { id }) => {
+    commit(types.SET_CONTACT_UI_FLAG, { isFetchingItem: true });
+    try {
+      const response = await ContactAPI.show(id);
+      commit(types.SET_CONTACT_ITEM, response.data.payload);
+      commit(types.SET_CONTACT_UI_FLAG, {
+        isFetchingItem: false,
+      });
+    } catch (error) {
+      commit(types.SET_CONTACT_UI_FLAG, {
+        isFetchingItem: false,
+      });
+    }
+  },
+
+  update: async ({ commit }, { id, ...updateObj }) => {
+    commit(types.SET_CONTACT_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await ContactAPI.update(id, updateObj);
+      commit(types.EDIT_CONTACT, response.data.payload);
+      commit(types.SET_CONTACT_UI_FLAG, { isUpdating: false });
+    } catch (error) {
+      commit(types.SET_CONTACT_UI_FLAG, { isUpdating: false });
+      if (error.response?.data?.contact) {
+        throw new DuplicateContactException(error.response.data.contact);
+      } else {
+        throw new Error(error);
+      }
+    }
+  },
+
+  updatePresence: ({ commit }, data) => {
+    commit(types.UPDATE_CONTACTS_PRESENCE, data);
+  },
+
+  setContact({ commit }, data) {
+    commit(types.SET_CONTACT_ITEM, data);
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/contacts/getters.js b/app/javascript/dashboard/store/modules/contacts/getters.js
new file mode 100644
index 000000000..cb9699a9b
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/contacts/getters.js
@@ -0,0 +1,15 @@
+export const getters = {
+  getContacts($state) {
+    return Object.values($state.records);
+  },
+  getUIFlags($state) {
+    return $state.uiFlags;
+  },
+  getContact: $state => id => {
+    const contact = $state.records[id];
+    return contact || {};
+  },
+  getMeta: $state => {
+    return $state.meta;
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/contacts/index.js b/app/javascript/dashboard/store/modules/contacts/index.js
new file mode 100644
index 000000000..a8bab100a
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/contacts/index.js
@@ -0,0 +1,24 @@
+import { getters } from './getters';
+import { actions } from './actions';
+import { mutations } from './mutations';
+
+const state = {
+  meta: {
+    count: 0,
+    currentPage: 1,
+  },
+  records: {},
+  uiFlags: {
+    isFetching: false,
+    isFetchingItem: false,
+    isUpdating: false,
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/contacts/mutations.js b/app/javascript/dashboard/store/modules/contacts/mutations.js
new file mode 100644
index 000000000..abc2229f9
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/contacts/mutations.js
@@ -0,0 +1,56 @@
+import Vue from 'vue';
+import types from '../../mutation-types';
+
+export const mutations = {
+  [types.SET_CONTACT_UI_FLAG]($state, data) {
+    $state.uiFlags = {
+      ...$state.uiFlags,
+      ...data,
+    };
+  },
+
+  [types.CLEAR_CONTACTS]: $state => {
+    Vue.set($state, 'records', {});
+  },
+
+  [types.SET_CONTACT_META]: ($state, data) => {
+    const { count, current_page: currentPage } = data;
+    Vue.set($state.meta, 'count', count);
+    Vue.set($state.meta, 'currentPage', currentPage);
+  },
+
+  [types.SET_CONTACTS]: ($state, data) => {
+    data.forEach(contact => {
+      Vue.set($state.records, contact.id, {
+        ...($state.records[contact.id] || {}),
+        ...contact,
+      });
+    });
+  },
+
+  [types.SET_CONTACT_ITEM]: ($state, data) => {
+    Vue.set($state.records, data.id, {
+      ...($state.records[data.id] || {}),
+      ...data,
+    });
+  },
+
+  [types.EDIT_CONTACT]: ($state, data) => {
+    Vue.set($state.records, data.id, data);
+  },
+
+  [types.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');
+      }
+    });
+  },
+};
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 81c8b99cc..70e937b8b 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
@@ -1,9 +1,11 @@
 import axios from 'axios';
-import { actions } from '../../contacts';
-import * as types from '../../../mutation-types';
+import Contacts from '../../contacts';
+import types from '../../../mutation-types';
 import contactList from './fixtures';
 import { DuplicateContactException } from '../../../../../shared/helpers/CustomErrors';
 
+const { actions } = Contacts;
+
 const commit = jest.fn();
 global.axios = axios;
 jest.mock('axios');
@@ -11,20 +13,24 @@ jest.mock('axios');
 describe('#actions', () => {
   describe('#get', () => {
     it('sends correct mutations if API is success', async () => {
-      axios.get.mockResolvedValue({ data: { payload: contactList } });
+      axios.get.mockResolvedValue({
+        data: { payload: contactList, meta: { count: 100, current_page: 1 } },
+      });
       await actions.get({ commit });
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_CONTACT_UI_FLAG, { isFetching: true }],
-        [types.default.SET_CONTACTS, contactList],
-        [types.default.SET_CONTACT_UI_FLAG, { isFetching: false }],
+        [types.SET_CONTACT_UI_FLAG, { isFetching: true }],
+        [types.CLEAR_CONTACTS],
+        [types.SET_CONTACTS, contactList],
+        [types.SET_CONTACT_META, { count: 100, current_page: 1 }],
+        [types.SET_CONTACT_UI_FLAG, { isFetching: false }],
       ]);
     });
     it('sends correct mutations if API is error', async () => {
       axios.get.mockRejectedValue({ message: 'Incorrect header' });
       await actions.get({ commit });
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_CONTACT_UI_FLAG, { isFetching: true }],
-        [types.default.SET_CONTACT_UI_FLAG, { isFetching: false }],
+        [types.SET_CONTACT_UI_FLAG, { isFetching: true }],
+        [types.SET_CONTACT_UI_FLAG, { isFetching: false }],
       ]);
     });
   });
@@ -34,17 +40,17 @@ describe('#actions', () => {
       axios.get.mockResolvedValue({ data: { payload: contactList[0] } });
       await actions.show({ commit }, { id: contactList[0].id });
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_CONTACT_UI_FLAG, { isFetchingItem: true }],
-        [types.default.SET_CONTACT_ITEM, contactList[0]],
-        [types.default.SET_CONTACT_UI_FLAG, { isFetchingItem: false }],
+        [types.SET_CONTACT_UI_FLAG, { isFetchingItem: true }],
+        [types.SET_CONTACT_ITEM, contactList[0]],
+        [types.SET_CONTACT_UI_FLAG, { isFetchingItem: false }],
       ]);
     });
     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([
-        [types.default.SET_CONTACT_UI_FLAG, { isFetchingItem: true }],
-        [types.default.SET_CONTACT_UI_FLAG, { isFetchingItem: false }],
+        [types.SET_CONTACT_UI_FLAG, { isFetchingItem: true }],
+        [types.SET_CONTACT_UI_FLAG, { isFetchingItem: false }],
       ]);
     });
   });
@@ -54,9 +60,9 @@ describe('#actions', () => {
       axios.patch.mockResolvedValue({ data: { payload: contactList[0] } });
       await actions.update({ commit }, contactList[0]);
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_CONTACT_UI_FLAG, { isUpdating: true }],
-        [types.default.EDIT_CONTACT, contactList[0]],
-        [types.default.SET_CONTACT_UI_FLAG, { isUpdating: false }],
+        [types.SET_CONTACT_UI_FLAG, { isUpdating: true }],
+        [types.EDIT_CONTACT, contactList[0]],
+        [types.SET_CONTACT_UI_FLAG, { isUpdating: false }],
       ]);
     });
     it('sends correct actions if API is error', async () => {
@@ -65,8 +71,8 @@ describe('#actions', () => {
         Error
       );
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_CONTACT_UI_FLAG, { isUpdating: true }],
-        [types.default.SET_CONTACT_UI_FLAG, { isUpdating: false }],
+        [types.SET_CONTACT_UI_FLAG, { isUpdating: true }],
+        [types.SET_CONTACT_UI_FLAG, { isUpdating: false }],
       ]);
     });
 
@@ -83,8 +89,8 @@ describe('#actions', () => {
         DuplicateContactException
       );
       expect(commit.mock.calls).toEqual([
-        [types.default.SET_CONTACT_UI_FLAG, { isUpdating: true }],
-        [types.default.SET_CONTACT_UI_FLAG, { isUpdating: false }],
+        [types.SET_CONTACT_UI_FLAG, { isUpdating: true }],
+        [types.SET_CONTACT_UI_FLAG, { isUpdating: false }],
       ]);
     });
   });
@@ -93,9 +99,7 @@ describe('#actions', () => {
     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],
-      ]);
+      expect(commit.mock.calls).toEqual([[types.SET_CONTACT_ITEM, data]]);
     });
   });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
index a35fee9b1..369bb8af2 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
@@ -1,6 +1,8 @@
-import { getters } from '../../contacts';
+import Contacts from '../../contacts';
 import contactList from './fixtures';
 
+const { getters } = Contacts;
+
 describe('#getters', () => {
   it('getContacts', () => {
     const state = {
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
index 9c076bba3..d8e7ec44b 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
@@ -1,11 +1,12 @@
-import * as types from '../../../mutation-types';
-import { mutations } from '../../contacts';
+import types from '../../../mutation-types';
+import Contacts from '../../contacts';
+const { mutations } = Contacts;
 
 describe('#mutations', () => {
   describe('#SET_CONTACTS', () => {
     it('set contact records', () => {
       const state = { records: {} };
-      mutations[types.default.SET_CONTACTS](state, [
+      mutations[types.SET_CONTACTS](state, [
         { id: 1, name: 'contact1', email: 'contact1@chatwoot.com' },
       ]);
       expect(state.records).toEqual({
@@ -25,7 +26,7 @@ describe('#mutations', () => {
           1: { id: 1, name: 'contact1', email: 'contact1@chatwoot.com' },
         },
       };
-      mutations[types.default.SET_CONTACT_ITEM](state, {
+      mutations[types.SET_CONTACT_ITEM](state, {
         id: 2,
         name: 'contact2',
         email: 'contact2@chatwoot.com',
@@ -44,7 +45,7 @@ describe('#mutations', () => {
           1: { id: 1, name: 'contact1', email: 'contact1@chatwoot.com' },
         },
       };
-      mutations[types.default.EDIT_CONTACT](state, {
+      mutations[types.EDIT_CONTACT](state, {
         id: 1,
         name: 'contact2',
         email: 'contact2@chatwoot.com',
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 98e710318..33aecc47c 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -88,9 +88,11 @@ export default {
   DELETE_WEBHOOK: 'DELETE_WEBHOOK',
 
   // Contacts
+  SET_CONTACT_META: 'SET_CONTACT_META',
   SET_CONTACT_UI_FLAG: 'SET_CONTACT_UI_FLAG',
   SET_CONTACT_ITEM: 'SET_CONTACT_ITEM',
   SET_CONTACTS: 'SET_CONTACTS',
+  CLEAR_CONTACTS: 'CLEAR_CONTACTS',
   EDIT_CONTACT: 'EDIT_CONTACT',
   UPDATE_CONTACTS_PRESENCE: 'UPDATE_CONTACTS_PRESENCE',
 
diff --git a/app/javascript/shared/assets/stylesheets/font-weights.scss b/app/javascript/shared/assets/stylesheets/font-weights.scss
new file mode 100644
index 000000000..322b66c72
--- /dev/null
+++ b/app/javascript/shared/assets/stylesheets/font-weights.scss
@@ -0,0 +1,8 @@
+:root {
+  --font-weight-feather: 100;
+  --font-weight-light: 300;
+  --font-weight-normal: 400;
+  --font-weight-medium: 500;
+  --font-weight-bold: 600;
+  --font-weight-black: 700;
+}
diff --git a/app/javascript/shared/assets/stylesheets/spacing.scss b/app/javascript/shared/assets/stylesheets/spacing.scss
index 0fcfb9fd1..ac9e24011 100644
--- a/app/javascript/shared/assets/stylesheets/spacing.scss
+++ b/app/javascript/shared/assets/stylesheets/spacing.scss
@@ -13,4 +13,17 @@
   --space-larger: 4.8rem;
   --space-jumbo: 6.4rem;
   --space-mega: 10.0rem;
+
+  --space-minus-micro: -0.2rem;
+  --space-minus-smaller: -0.4rem;
+  --space-minus-small: -0.8rem;
+  --space-minus-one: -1rem;
+  --space-minus-slab: -1.2rem;
+  --space-minus-normal: -1.6rem;
+  --space-minus-two: -2.0rem;
+  --space-minus-medium: -2.4rem;
+  --space-minus-large: -3.2rem;
+  --space-minus-larger: -4.8rem;
+  --space-minus-jumbo: -6.4rem;
+  --space-minus-mega: -10.0rem;
 }
diff --git a/app/javascript/widget/components/ConversationWrap.vue b/app/javascript/widget/components/ConversationWrap.vue
index 7e5758d33..d51380837 100755
--- a/app/javascript/widget/components/ConversationWrap.vue
+++ b/app/javascript/widget/components/ConversationWrap.vue
@@ -37,7 +37,10 @@ export default {
     Spinner,
   },
   props: {
-    groupedMessages: Array,
+    groupedMessages: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
diff --git a/app/views/api/v1/accounts/contacts/active.json.jbuilder b/app/views/api/v1/accounts/contacts/active.json.jbuilder
index b033133ed..70e112b56 100644
--- a/app/views/api/v1/accounts/contacts/active.json.jbuilder
+++ b/app/views/api/v1/accounts/contacts/active.json.jbuilder
@@ -1,3 +1,8 @@
+json.meta do
+  json.count @contacts_count
+  json.current_page @current_page
+end
+
 json.payload do
   json.array! @contacts do |contact|
     json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: true
diff --git a/app/views/api/v1/accounts/contacts/index.json.jbuilder b/app/views/api/v1/accounts/contacts/index.json.jbuilder
index b033133ed..70e112b56 100644
--- a/app/views/api/v1/accounts/contacts/index.json.jbuilder
+++ b/app/views/api/v1/accounts/contacts/index.json.jbuilder
@@ -1,3 +1,8 @@
+json.meta do
+  json.count @contacts_count
+  json.current_page @current_page
+end
+
 json.payload do
   json.array! @contacts do |contact|
     json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: true
diff --git a/app/views/api/v1/accounts/contacts/search.json.jbuilder b/app/views/api/v1/accounts/contacts/search.json.jbuilder
index b033133ed..70e112b56 100644
--- a/app/views/api/v1/accounts/contacts/search.json.jbuilder
+++ b/app/views/api/v1/accounts/contacts/search.json.jbuilder
@@ -1,3 +1,8 @@
+json.meta do
+  json.count @contacts_count
+  json.current_page @current_page
+end
+
 json.payload do
   json.array! @contacts do |contact|
     json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: true
diff --git a/app/views/api/v1/models/_contact.json.jbuilder b/app/views/api/v1/models/_contact.json.jbuilder
index 154a67da9..827e25e9f 100644
--- a/app/views/api/v1/models/_contact.json.jbuilder
+++ b/app/views/api/v1/models/_contact.json.jbuilder
@@ -6,6 +6,8 @@ json.name resource.name
 json.phone_number resource.phone_number
 json.thumbnail resource.avatar_url
 json.custom_attributes resource.custom_attributes
+json.conversations_count resource.conversations_count if resource[:conversations_count].present?
+json.last_seen_at resource.last_seen_at if resource[:last_seen_at].present?
 
 # we only want to output contact inbox when its /contacts endpoints
 if defined?(with_contact_inboxes) && with_contact_inboxes.present?
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index c2ad6fec0..486a844b4 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -23,9 +23,22 @@ RSpec.describe 'Contacts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(response.body).to include(contact.email)
-        expect(response.body).to include(contact_inbox.source_id)
-        expect(response.body).to include(contact_inbox.inbox.name)
+        response_body = JSON.parse(response.body)
+        expect(response_body['payload'].first['email']).to eq(contact.email)
+        expect(response_body['payload'].first['contact_inboxes'].first['source_id']).to eq(contact_inbox.source_id)
+        expect(response_body['payload'].first['contact_inboxes'].first['inbox']['name']).to eq(contact_inbox.inbox.name)
+      end
+
+      it 'returns includes conversations count and last seen at' do
+        create(:conversation, contact: contact, account: account, inbox: contact_inbox.inbox, contact_last_seen_at: Time.now.utc)
+        get "/api/v1/accounts/#{account.id}/contacts",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_body = JSON.parse(response.body)
+        expect(response_body['payload'].first['conversations_count']).to eq(contact.conversations.count)
+        expect(response_body['payload'].first['last_seen_at']).present?
       end
     end
   end

From 32fce9650307c8c59d1fcdd52eed23fa7d66a516 Mon Sep 17 00:00:00 2001
From: David Steinbauer <david.steinbauer@innovie.me>
Date: Wed, 11 Nov 2020 06:21:25 +0100
Subject: [PATCH 25/36] chore: Update DE translation (#1393)

---
 app/javascript/widget/i18n/locale/de.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index 05483ee99..66c5c7f24 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Einreichen"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "ist verfügbar",
-    "ARE_AVAILABLE": "sind verfügbar",
-    "OTHERS_ARE_AVAILABLE": "andere sind verfügbar",
-    "AND": "und"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "Wir sind online",
+    "OFFLINE": "Wir sind offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Antworten in der Regel in wenigen Minuten",
+    "IN_A_FEW_HOURS": "Antworten in der Regel in wenigen Stunden",
+    "IN_A_DAY": "Antworten normalerweise innerhalb eines Tages"
+  },
+  "START_CONVERSATION": "Konversation starten",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Neue Nachrichten anzeigen",
     "CLOSE_MESSAGES_BUTTON": "Schließen"

From 5c3de5e0957bf1447a98dd92906e582bc6246cee Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Wed, 11 Nov 2020 16:02:14 +0530
Subject: [PATCH 26/36] fix: Enhance CRM UI (#1397)

* feat: Sort by name
* feat: Fetch labels from sidebar
* Remove unused language file
* Add beta tag to contacts
* Add timeMixin, reduce font-size
* Remove unused methods
* Remove unused prop
* Disabled footer if no contacts or invalid page
* Add keyup for input
* Fix conversation not loading if there are no active conversations
* return last_seen_at as unix time
* Fix contact edit modal
* Add loader for edit contact button
* Fix review comments
---
 .../api/v1/accounts/contacts_controller.rb    | 15 ++++++----
 .../dashboard/components/layout/Sidebar.vue   |  1 +
 .../dashboard/i18n/locale/en/contact.json     |  3 +-
 .../i18n/locale/en/contactsPage.json          | 21 --------------
 .../dashboard/i18n/locale/en/settings.json    |  2 +-
 .../contacts/components/ContactsTable.vue     | 24 ++++++++-------
 .../contacts/components/ContactsView.vue      | 29 +++++++------------
 .../dashboard/contacts/components/Footer.vue  | 25 ++++++++++------
 .../dashboard/contacts/components/Header.vue  |  1 +
 .../conversation/ConversationView.vue         |  3 +-
 .../conversation/contact/ContactInfo.vue      |  1 +
 .../conversation/contact/EditContact.vue      | 14 ++++++++-
 .../api/v1/models/_contact.json.jbuilder      |  2 +-
 13 files changed, 72 insertions(+), 69 deletions(-)
 delete mode 100644 app/javascript/dashboard/i18n/locale/en/contactsPage.json

diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index c1e90d957..d476c744c 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -7,16 +7,14 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   before_action :fetch_contact, only: [:show, :update]
 
   def index
-    contacts = Current.account.contacts.where.not(email: [nil, '']).or(Current.account.contacts.where.not(phone_number: [nil, '']))
-    @contacts_count = contacts.count
-    @contacts = fetch_contact_last_seen_at(contacts)
+    @contacts_count = resolved_contacts.count
+    @contacts = fetch_contact_last_seen_at(resolved_contacts)
   end
 
   def search
     render json: { error: 'Specify search string with parameter q' }, status: :unprocessable_entity if params[:q].blank? && return
 
-    contacts = Current.account.contacts.where.not(email: [nil, '']).or(Current.account.contacts.where.not(phone_number: [nil, '']))
-                      .where('name LIKE :search OR email LIKE :search', search: "%#{params[:q]}%")
+    contacts = resolved_contacts.where('name LIKE :search OR email LIKE :search', search: "%#{params[:q]}%")
     @contacts_count = contacts.count
     @contacts = fetch_contact_last_seen_at(contacts)
   end
@@ -53,6 +51,13 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
 
   private
 
+  def resolved_contacts
+    @resolved_contacts ||= Current.account.contacts
+                                  .where.not(email: [nil, ''])
+                                  .or(Current.account.contacts.where.not(phone_number: [nil, '']))
+                                  .order('LOWER(name)')
+  end
+
   def set_current_page
     @current_page = params[:page] || 1
   end
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 77b12d9f8..1357ff104 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -286,6 +286,7 @@ export default {
     },
   },
   mounted() {
+    this.$store.dispatch('labels/get');
     this.$store.dispatch('inboxes/get');
   },
   methods: {
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 3dab6ac0b..684a56ee5 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -108,8 +108,7 @@
         "Phone Number",
         "Conversations",
         "Last Contacted"
-      ],
-      "EDIT_BUTTON": "Edit"
+      ]
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/contactsPage.json b/app/javascript/dashboard/i18n/locale/en/contactsPage.json
deleted file mode 100644
index e8345a3e2..000000000
--- a/app/javascript/dashboard/i18n/locale/en/contactsPage.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "SEARCH_BUTTON": "Search",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
-    "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": [
-        "Name",
-        "Phone Number",
-        "Conversations",
-        "Last Contacted"
-      ],
-      "EDIT_BUTTON": "Edit",
-      "VIEW_BUTTON": "View"
-
-    }
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index b1363f2aa..adab59092 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -121,7 +121,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
-    "CONTACTS": "Contacts",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index d34902d62..0579c2394 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -29,17 +29,21 @@
                   {{ contactItem.name }}
                 </h4>
                 <p class="user-email">
-                  {{ contactItem.email || '--' }}
+                  {{ contactItem.email || '---' }}
                 </p>
               </div>
             </div>
           </td>
-          <td>{{ contactItem.phone_number || '--' }}</td>
+          <td>{{ contactItem.phone_number || '---' }}</td>
           <td class="conversation-count-item">
             {{ contactItem.conversations_count }}
           </td>
           <td>
-            {{ contactItem.last_contacted_at || '--' }}
+            {{
+              contactItem.last_seen_at
+                ? dynamicTime(contactItem.last_seen_at)
+                : '---'
+            }}
           </td>
         </tr>
       </tbody>
@@ -60,6 +64,7 @@ import { mixin as clickaway } from 'vue-clickaway';
 import Spinner from 'shared/components/Spinner.vue';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
+import timeMixin from 'dashboard/mixins/time';
 
 export default {
   components: {
@@ -67,7 +72,7 @@ export default {
     EmptyState,
     Spinner,
   },
-  mixins: [clickaway],
+  mixins: [clickaway, timeMixin],
   props: {
     contacts: {
       type: Array,
@@ -77,10 +82,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    openEditModal: {
-      type: Function,
-      default: () => {},
-    },
     onClickContact: {
       type: Function,
       default: () => {},
@@ -90,7 +91,7 @@ export default {
       default: false,
     },
     activeContactId: {
-      type: String,
+      type: [String, Number],
       default: '',
     },
   },
@@ -134,6 +135,8 @@ export default {
 }
 
 .contacts-table {
+  margin-top: -1px;
+
   > thead {
     border-bottom: 1px solid var(--color-border);
     background: white;
@@ -178,8 +181,9 @@ export default {
     }
 
     .user-name {
-      text-transform: capitalize;
+      font-size: var(--font-size-small);
       margin: 0;
+      text-transform: capitalize;
     }
 
     .user-email {
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index 0661c9d68..bd970ce06 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -4,12 +4,12 @@
       <contacts-header
         :search-query="searchQuery"
         :on-search-submit="onSearchSubmit"
+        this-selected-contact-id=""
         :on-input-search="onInputSearch"
       />
       <contacts-table
         :contacts="records"
         :show-search-empty-state="showEmptySearchResult"
-        :open-edit-modal="openEditModal"
         :is-loading="uiFlags.isFetching"
         :on-click-contact="openContactInfoPanel"
         :active-contact-id="selectedContactId"
@@ -19,11 +19,6 @@
         :current-page="Number(meta.currentPage)"
         :total-count="meta.count"
       />
-      <edit-contact
-        :show="showEditModal"
-        :contact="selectedContact"
-        @cancel="closeEditModal"
-      />
     </div>
     <contact-info-panel
       v-if="showContactViewPane"
@@ -36,8 +31,6 @@
 <script>
 import { mapGetters } from 'vuex';
 
-import EditContact from 'dashboard/routes/dashboard/conversation/contact/EditContact';
-
 import ContactsHeader from './Header';
 import ContactsTable from './ContactsTable';
 import ContactInfoPanel from './ContactInfoPanel';
@@ -48,7 +41,6 @@ export default {
     ContactsHeader,
     ContactsTable,
     ContactsFooter,
-    EditContact,
     ContactInfoPanel,
   },
   data() {
@@ -83,9 +75,15 @@ export default {
     wrapClas() {
       return this.showContactViewPane ? 'medium-9' : 'medium-12';
     },
+    pageParameter() {
+      const selectedPageNumber = Number(this.$route.query?.page);
+      return !Number.isNaN(selectedPageNumber) && selectedPageNumber >= 1
+        ? selectedPageNumber
+        : 1;
+    },
   },
   mounted() {
-    this.$store.dispatch('contacts/get', { page: 1 });
+    this.$store.dispatch('contacts/get', { page: this.pageParameter });
   },
   methods: {
     onInputSearch(event) {
@@ -98,12 +96,15 @@ export default {
       this.searchQuery = event.target.value;
     },
     onSearchSubmit() {
+      this.selectedContactId = '';
       this.$store.dispatch('contacts/search', {
         search: this.searchQuery,
         page: 1,
       });
     },
     onPageChange(page) {
+      this.selectedContactId = '';
+      window.history.pushState({}, null, `${this.$route.path}?page=${page}`);
       if (this.searchQuery) {
         this.$store.dispatch('contacts/search', {
           search: this.searchQuery,
@@ -121,14 +122,6 @@ export default {
       this.selectedContactId = '';
       this.showContactInfoPanelPane = false;
     },
-    openEditModal(contactId) {
-      this.selectedContactId = contactId;
-      this.showEditModal = true;
-    },
-    closeEditModal() {
-      this.selectedContactId = '';
-      this.showEditModal = false;
-    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Footer.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Footer.vue
index 70f27121a..9c2e5467b 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Footer.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Footer.vue
@@ -1,5 +1,5 @@
 <template>
-  <footer class="footer">
+  <footer v-if="isFooterVisible" class="footer">
     <div class="left-aligned-wrap">
       <div class="page-meta">
         <strong>{{ firstIndex }}</strong>
@@ -60,7 +60,7 @@ export default {
     },
     pageSize: {
       type: Number,
-      default: 25,
+      default: 15,
     },
     totalCount: {
       type: Number,
@@ -72,6 +72,9 @@ export default {
     },
   },
   computed: {
+    isFooterVisible() {
+      return this.totalCount && !(this.firstIndex > this.totalCount);
+    },
     firstIndex() {
       const firstIndex = this.pageSize * (this.currentPage - 1) + 1;
       return firstIndex;
@@ -163,7 +166,7 @@ export default {
 
   .button {
     background: transparent;
-    border-color: var(--b-400);
+    border-color: var(--color-border);
     color: var(--color-body);
     margin-bottom: 0;
     margin-left: -2px;
@@ -173,23 +176,27 @@ export default {
     &:hover,
     &:focus,
     &:active {
-      background: var(--b-400);
+      background: var(--s-200);
       color: white;
     }
 
     &:first-child {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px;
+      border-top-left-radius: var(--space-smaller);
+      border-bottom-left-radius: var(--space-smaller);
     }
+
     &:last-child {
-      border-top-right-radius: 3px;
-      border-bottom-right-radius: 3px;
+      border-top-right-radius: var(--space-smaller);
+      border-bottom-right-radius: var(--space-smaller);
     }
+
     &.small {
       font-size: var(--font-size-micro);
     }
+
     &.disabled {
-      background: var(--b-300);
+      background: var(--s-200);
+      border-color: var(--s-200);
       color: var(--b-900);
     }
 
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 6489b1ee9..b8ca4c64a 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -14,6 +14,7 @@
             :placeholder="$t('CONTACTS_PAGE.SEARCH_INPUT_PLACEHOLDER')"
             class="contact-search"
             :value="searchQuery"
+            @keyup.enter="onSearchSubmit"
             @input="onInputSearch"
           />
           <woot-submit-button
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index 8c0c9a2be..14978599b 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -82,10 +82,11 @@ export default {
   },
 
   mounted() {
-    this.$store.dispatch('labels/get');
     this.$store.dispatch('agents/get');
 
     this.initialize();
+    this.fetchConversation();
+
     this.$watch('$store.state.route', () => this.initialize());
     this.$watch('chatList.length', () => {
       this.fetchConversation();
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 6fa3a397b..60ce60c20 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -52,6 +52,7 @@
         {{ $t('EDIT_CONTACT.BUTTON_LABEL') }}
       </woot-button>
       <edit-contact
+        v-if="showEditModal"
         :show="showEditModal"
         :contact="contact"
         @cancel="toggleEditModal"
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
index f7e1d0ff6..c70fa4e8e 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
@@ -82,7 +82,10 @@
         </div>
         <div class="modal-footer">
           <div class="medium-12 columns">
-            <woot-submit-button :button-text="$t('EDIT_CONTACT.FORM.SUBMIT')" />
+            <woot-submit-button
+              :loading="uiFlags.isUpdating"
+              :button-text="$t('EDIT_CONTACT.FORM.SUBMIT')"
+            />
             <button class="button clear" @click.prevent="onCancel">
               {{ $t('EDIT_CONTACT.FORM.CANCEL') }}
             </button>
@@ -97,6 +100,7 @@
 import alertMixin from 'shared/mixins/alertMixin';
 import { DuplicateContactException } from 'shared/helpers/CustomErrors';
 import { required } from 'vuelidate/lib/validators';
+import { mapGetters } from 'vuex';
 
 export default {
   mixins: [alertMixin],
@@ -143,11 +147,19 @@ export default {
     location: {},
     bio: {},
   },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'contacts/getUIFlags',
+    }),
+  },
   watch: {
     contact() {
       this.setContactObject();
     },
   },
+  mounted() {
+    this.setContactObject();
+  },
   methods: {
     onCancel() {
       this.$emit('cancel');
diff --git a/app/views/api/v1/models/_contact.json.jbuilder b/app/views/api/v1/models/_contact.json.jbuilder
index 827e25e9f..eaf4012f4 100644
--- a/app/views/api/v1/models/_contact.json.jbuilder
+++ b/app/views/api/v1/models/_contact.json.jbuilder
@@ -7,7 +7,7 @@ json.phone_number resource.phone_number
 json.thumbnail resource.avatar_url
 json.custom_attributes resource.custom_attributes
 json.conversations_count resource.conversations_count if resource[:conversations_count].present?
-json.last_seen_at resource.last_seen_at if resource[:last_seen_at].present?
+json.last_seen_at resource.last_seen_at.to_i if resource[:last_seen_at].present?
 
 # we only want to output contact inbox when its /contacts endpoints
 if defined?(with_contact_inboxes) && with_contact_inboxes.present?

From f275cf8809788bd578c13ee0aab604fa0203f714 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Fri, 13 Nov 2020 00:18:12 +0530
Subject: [PATCH 27/36] chore: Remove duplicate CSS property (#1404)

---
 app/javascript/widget/components/FileBubble.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/widget/components/FileBubble.vue b/app/javascript/widget/components/FileBubble.vue
index 3731bd027..4785ed014 100644
--- a/app/javascript/widget/components/FileBubble.vue
+++ b/app/javascript/widget/components/FileBubble.vue
@@ -83,7 +83,6 @@ export default {
   .download {
     color: $color-woot;
     font-weight: $font-weight-medium;
-    font-size: $font-size-mini;
     padding: 0;
     margin: 0;
     font-size: $font-size-small;

From 563da0e05247bc0a8e7fd6f39b7a0b5669839200 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 13 Nov 2020 19:56:30 +0530
Subject: [PATCH 28/36] feat: Use gravatar URL for contacts and users if no
 image available (#1407)

---
 app/models/concerns/avatarable.rb | 11 +++++++----
 app/models/user.rb                |  9 ---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb
index c65fbe3fe..a44beb28b 100644
--- a/app/models/concerns/avatarable.rb
+++ b/app/models/concerns/avatarable.rb
@@ -9,10 +9,13 @@ module Avatarable
   end
 
   def avatar_url
-    if avatar.attached? && avatar.representable?
-      url_for(avatar.representation(resize: '250x250'))
-    else
-      ''
+    return url_for(avatar.representation(resize: '250x250')) if avatar.attached? && avatar.representable?
+
+    if [User, Contact].include?(self.class) && email.present?
+      hash = Digest::MD5.hexdigest(email)
+      return "https://www.gravatar.com/avatar/#{hash}?d=404"
     end
+
+    ''
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 6bfcfdbd0..33faa8ee6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -110,15 +110,6 @@ class User < ApplicationRecord
     inboxes.where(account_id: Current.account.id)
   end
 
-  alias avatar_img_url avatar_url
-  def avatar_url
-    if avatar_img_url == ''
-      hash = Digest::MD5.hexdigest(email)
-      return "https://www.gravatar.com/avatar/#{hash}?d=404"
-    end
-    avatar_img_url
-  end
-
   def administrator?
     current_account_user&.administrator?
   end

From ef99fd331109a278350f16f85a90f7289bfe4761 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 16 Nov 2020 10:46:53 +0530
Subject: [PATCH 29/36] feat: Ignore tweets from blocked users (#1408)

---
 app/services/twitter/tweet_parser_service.rb | 6 +++++-
 spec/factories/twitter/tweet_create_event.rb | 1 +
 spec/lib/webhooks/twitter_spec.rb            | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/services/twitter/tweet_parser_service.rb b/app/services/twitter/tweet_parser_service.rb
index def65d35e..d6256c25d 100644
--- a/app/services/twitter/tweet_parser_service.rb
+++ b/app/services/twitter/tweet_parser_service.rb
@@ -3,7 +3,7 @@ class Twitter::TweetParserService < Twitter::WebhooksBaseService
 
   def perform
     set_inbox
-    return if message_already_exist?
+    return if message_already_exist? || user_has_blocked?
 
     create_message
   end
@@ -34,6 +34,10 @@ class Twitter::TweetParserService < Twitter::WebhooksBaseService
     tweet_data['id'].to_s
   end
 
+  def user_has_blocked?
+    payload['user_has_blocked'] == true
+  end
+
   def parent_tweet_id
     tweet_data['in_reply_to_status_id_str'].nil? ? tweet_data['id'].to_s : tweet_data['in_reply_to_status_id_str']
   end
diff --git a/spec/factories/twitter/tweet_create_event.rb b/spec/factories/twitter/tweet_create_event.rb
index 24ade88c5..a53422aaf 100644
--- a/spec/factories/twitter/tweet_create_event.rb
+++ b/spec/factories/twitter/tweet_create_event.rb
@@ -3,6 +3,7 @@
 FactoryBot.define do
   factory :tweet_create_event, class: Hash do
     for_user_id { '1' }
+    user_has_blocked { false }
     tweet_create_events do
       [
         {
diff --git a/spec/lib/webhooks/twitter_spec.rb b/spec/lib/webhooks/twitter_spec.rb
index cb01d03da..a653fdc6b 100644
--- a/spec/lib/webhooks/twitter_spec.rb
+++ b/spec/lib/webhooks/twitter_spec.rb
@@ -10,6 +10,7 @@ describe Webhooks::Twitter do
   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 }
+  let!(:tweet_params_from_blocked_user) { build(:tweet_create_event, user_has_blocked: true).with_indifferent_access }
 
   describe '#perform' do
     context 'with direct_message params' do
@@ -22,6 +23,13 @@ describe Webhooks::Twitter do
     end
 
     context 'with tweet_params params' do
+      it 'does not create incoming message in the twitter inbox if it is a blocked user' do
+        twitter_webhook.new(tweet_params_from_blocked_user).consume
+        expect(twitter_inbox.contacts.count).to be 0
+        expect(twitter_inbox.conversations.count).to be 0
+        expect(twitter_inbox.messages.count).to be 0
+      end
+
       it 'creates incoming message in the twitter inbox' do
         twitter_webhook.new(tweet_params).consume
         expect(twitter_inbox.contacts.count).to be 1

From faaed17418036c05239093a4ad08c5713bca02d3 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 16 Nov 2020 13:08:36 +0530
Subject: [PATCH 30/36] fix: Fire query only if search term is available
 (#1413)

---
 .../dashboard/contacts/components/ContactsView.vue  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index bd970ce06..0b0c4801e 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -89,18 +89,19 @@ export default {
     onInputSearch(event) {
       const newQuery = event.target.value;
       const refetchAllContacts = !!this.searchQuery && newQuery === '';
-
       if (refetchAllContacts) {
         this.$store.dispatch('contacts/get', { page: 1 });
       }
-      this.searchQuery = event.target.value;
+      this.searchQuery = newQuery;
     },
     onSearchSubmit() {
       this.selectedContactId = '';
-      this.$store.dispatch('contacts/search', {
-        search: this.searchQuery,
-        page: 1,
-      });
+      if (this.searchQuery) {
+        this.$store.dispatch('contacts/search', {
+          search: this.searchQuery,
+          page: 1,
+        });
+      }
     },
     onPageChange(page) {
       this.selectedContactId = '';

From eb2ded6f65f43614f22a086092a42d233b47af7a Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 16 Nov 2020 19:41:52 +0530
Subject: [PATCH 31/36] feat: Agent & Inbox Report APIs (#1391)

---
 .../api/v2/accounts/reports_controller.rb     | 12 ++++
 app/javascript/dashboard/api/reports.js       |  4 +-
 .../dashboard/store/modules/reports.js        |  2 +-
 app/models/account.rb                         |  2 +-
 app/models/user.rb                            |  2 +
 .../api/v2/accounts/reports/agents.csv.erb    | 12 ++++
 .../api/v2/accounts/reports/inboxes.csv.erb   | 12 ++++
 config/routes.rb                              |  4 +-
 db/schema.rb                                  |  2 -
 .../slack/send_on_slack_service.rb            |  2 +-
 .../api/v2/accounts/report_controller_spec.rb | 60 ++++++++++++++++++-
 11 files changed, 102 insertions(+), 12 deletions(-)
 create mode 100644 app/views/api/v2/accounts/reports/agents.csv.erb
 create mode 100644 app/views/api/v2/accounts/reports/inboxes.csv.erb

diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index c4f563d5d..3203f34e9 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -9,6 +9,18 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
     render json: account_summary_metrics
   end
 
+  def agents
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = 'attachment; filename=agents_report.csv'
+    render layout: false, template: 'api/v2/accounts/reports/agents.csv.erb', format: 'csv'
+  end
+
+  def inboxes
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = 'attachment; filename=inboxes_report.csv'
+    render layout: false, template: 'api/v2/accounts/reports/inboxes.csv.erb', format: 'csv'
+  end
+
   private
 
   def account_summary_params
diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index 8dedcc5d2..0773c769f 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -12,8 +12,8 @@ class ReportsAPI extends ApiClient {
     });
   }
 
-  getAccountSummary(accountId, since, until) {
-    return axios.get(`${this.url}/${accountId}/account_summary`, {
+  getAccountSummary(since, until) {
+    return axios.get(`${this.url}/account_summary`, {
       params: { since, until },
     });
   }
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index 95f5df9e6..9d2dbe997 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -60,7 +60,7 @@ const actions = {
     });
   },
   fetchAccountSummary({ commit }, reportObj) {
-    Report.getAccountSummary(1, reportObj.from, reportObj.to)
+    Report.getAccountSummary(reportObj.from, reportObj.to)
       .then(accountSummary => {
         commit(types.default.SET_ACCOUNT_SUMMARY, accountSummary.data);
       })
diff --git a/app/models/account.rb b/app/models/account.rb
index 465b2ca77..9b94194bd 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -10,7 +10,7 @@
 #  name                  :string           not null
 #  settings_flags        :integer          default(0), not null
 #  support_email         :string(100)
-#  timezone       :string           default("UTC")
+#  timezone              :string           default("UTC")
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #
diff --git a/app/models/user.rb b/app/models/user.rb
index 33faa8ee6..88c906431 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -66,6 +66,8 @@ class User < ApplicationRecord
   accepts_nested_attributes_for :account_users
 
   has_many :assigned_conversations, foreign_key: 'assignee_id', class_name: 'Conversation', dependent: :nullify
+  alias_attribute :conversations, :assigned_conversations
+
   has_many :inbox_members, dependent: :destroy
   has_many :inboxes, through: :inbox_members, source: :inbox
   has_many :messages, as: :sender
diff --git a/app/views/api/v2/accounts/reports/agents.csv.erb b/app/views/api/v2/accounts/reports/agents.csv.erb
new file mode 100644
index 000000000..2986c6491
--- /dev/null
+++ b/app/views/api/v2/accounts/reports/agents.csv.erb
@@ -0,0 +1,12 @@
+<% headers = ['Agent name', 'Conversations count', 'Avg first response time (Minutes)', 'Avg resolution time (Minutes)'] %>
+<%= CSV.generate_line headers %>
+<% Current.account.users.each do |agent| %>
+  <% agent_report = V2::ReportBuilder.new(Current.account, {
+        type: :agent,
+        id: agent.id,
+        since: params[:since],
+        until: params[:until]
+      }).summary %>
+  <% row = [ agent.name, agent_report[:conversations_count], (agent_report[:avg_first_response_time]/60).to_i, (agent_report[:avg_resolution_time]/60).to_i ] %>
+<%=   CSV.generate_line row %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/api/v2/accounts/reports/inboxes.csv.erb b/app/views/api/v2/accounts/reports/inboxes.csv.erb
new file mode 100644
index 000000000..24548449a
--- /dev/null
+++ b/app/views/api/v2/accounts/reports/inboxes.csv.erb
@@ -0,0 +1,12 @@
+<% headers = ['Inbox name', 'Conversations count', 'Avg first response time (Minutes)', 'Avg resolution time (Minutes)'] %>
+<%= CSV.generate_line headers %>
+<% Current.account.inboxes.each do |inbox| %>
+  <% inbox_report = V2::ReportBuilder.new(Current.account, {
+        type: :inbox,
+        id: inbox.id,
+        since: params[:since],
+        until: params[:until]
+      }).summary %>
+  <% row = [ inbox.name, inbox_report[:conversations_count], (inbox_report[:avg_first_response_time]/60).to_i, (inbox_report[:avg_resolution_time]/60).to_i ] %>
+<%=   CSV.generate_line row %>
+<% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 291373ca1..4bf472f01 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -145,9 +145,9 @@ Rails.application.routes.draw do
         resources :reports, only: [] do
           collection do
             get :account
-          end
-          member do
             get :account_summary
+            get :agents
+            get :inboxes
           end
         end
       end
diff --git a/db/schema.rb b/db/schema.rb
index 06f05b465..b0144fb09 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -456,11 +456,9 @@ ActiveRecord::Schema.define(version: 2020_10_27_135006) 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/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 051ac0fcb..89c6d0b32 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -59,7 +59,7 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   end
 
   def sender_type(sender)
-    sender.class == Contact ? 'Contact' : 'Agent'
+    sender.instance_of?(Contact) ? 'Contact' : 'Agent'
   end
 
   def update_reference_id
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index b4931f8a2..f72b6639a 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -46,10 +46,10 @@ RSpec.describe 'Reports API', type: :request do
     end
   end
 
-  describe 'GET /api/v2/accounts/:account_id/reports/:id/account_summary' do
+  describe 'GET /api/v2/accounts/:account_id/reports/account_summary' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        get "/api/v2/accounts/#{account.id}/reports/#{account.id}/account_summary"
+        get "/api/v2/accounts/#{account.id}/reports/account_summary"
 
         expect(response).to have_http_status(:unauthorized)
       end
@@ -65,7 +65,7 @@ RSpec.describe 'Reports API', type: :request do
           until: Time.zone.today.to_time.to_i.to_s
         }
 
-        get "/api/v2/accounts/#{account.id}/reports/#{account.id}/account_summary",
+        get "/api/v2/accounts/#{account.id}/reports/account_summary",
             params: params,
             headers: agent.create_new_auth_token,
             as: :json
@@ -77,4 +77,58 @@ RSpec.describe 'Reports API', type: :request do
       end
     end
   end
+
+  describe 'GET /api/v2/accounts/:account_id/reports/agents' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v2/accounts/#{account.id}/reports/agents.csv"
+
+        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) }
+
+      params = {
+        since: 30.days.ago.to_i.to_s,
+        until: Time.zone.today.to_time.to_i.to_s
+      }
+
+      it 'returns summary' do
+        get "/api/v2/accounts/#{account.id}/reports/agents.csv",
+            params: params,
+            headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
+
+  describe 'GET /api/v2/accounts/:account_id/reports/inboxes' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v2/accounts/#{account.id}/reports/inboxes"
+
+        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) }
+
+      params = {
+        since: 30.days.ago.to_i.to_s,
+        until: Time.zone.today.to_time.to_i.to_s
+      }
+
+      it 'returns summary' do
+        get "/api/v2/accounts/#{account.id}/reports/inboxes",
+            params: params,
+            headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
 end

From f4facee8d8251e94c05cb8d614c98be32f6e8af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=AE=AE=E0=AE=A9=E0=AF=8B=E0=AE=9C=E0=AF=8D=E0=AE=95?=
 =?UTF-8?q?=E0=AF=81=E0=AE=AE=E0=AE=BE=E0=AE=B0=E0=AF=8D=20=E0=AE=AA?=
 =?UTF-8?q?=E0=AE=B4=E0=AE=A9=E0=AE=BF=E0=AE=9A=E0=AF=8D=E0=AE=9A=E0=AE=BE?=
 =?UTF-8?q?=E0=AE=AE=E0=AE=BF?= <smartmanoj42857@gmail.com>
Date: Mon, 16 Nov 2020 19:50:32 +0530
Subject: [PATCH 32/36] chore: Update text on PR template, inboxMgmt.json
 (#1410)

---
 .github/PULL_REQUEST_TEMPLATE.md                       | 4 ++--
 app/javascript/dashboard/i18n/locale/en/inboxMgmt.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6f380449e..4ce1b084c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -24,9 +24,9 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 
 - [ ] My code follows the style guidelines of this project
 - [ ] I have performed a self-review of my own code
-- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have commented on my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation
 - [ ] My changes generate no new warnings
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] New and existing unit tests pass locally with my changes
-- [ ] Any dependent changes have been merged and published in downstream modules
\ No newline at end of file
+- [ ] Any dependent changes have been merged and published in downstream modules
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index be76d2e50..10b87c3a0 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -161,7 +161,7 @@
       },
       "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."
+        "DESC": "Currently, we support Website live chat widgets, Facebook Pages, Twitter profiles and Whatsapp as platforms. We have more platforms like Email, Telegram and Line in the works, which will be out soon."
       },
       "AGENTS": {
         "TITLE": "Agents",

From 481baa32bac21f03f8f66910c8a32c0f55069f49 Mon Sep 17 00:00:00 2001
From: Matheus <hackermatheus10@hotmail.com>
Date: Mon, 16 Nov 2020 12:09:52 -0300
Subject: [PATCH 33/36] chore: Use translated text in the language menu (#1377)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 config/initializers/languages.rb | 44 ++++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index c2d076dbb..1409ce424 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -2,28 +2,28 @@
 # This Hash is used in account model, so do not change the index for existing languages
 
 LANGUAGES_CONFIG = {
-  0 => { name: 'English', iso_639_3_code: 'eng', iso_639_1_code: 'en', enabled: true },
-  1 => { name: 'Arabic', iso_639_3_code: 'ara', iso_639_1_code: 'ar', enabled: false },
-  2 => { name: 'Dutch', iso_639_3_code: 'nld', iso_639_1_code: 'nl', enabled: true },
-  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: 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 },
-  10 => { name: 'Russian', iso_639_3_code: 'rus', iso_639_1_code: 'ru', enabled: true },
-  11 => { name: 'Chinese', iso_639_3_code: 'zho', iso_639_1_code: 'zh', enabled: false },
-  12 => { name: 'Spanish', iso_639_3_code: 'spa', iso_639_1_code: 'es', enabled: true },
-  13 => { name: 'Malayalam', iso_639_3_code: 'mal', iso_639_1_code: 'ml', enabled: true },
-  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 },
-  18 => { name: 'Tamil', iso_639_3_code: 'tam', iso_639_1_code: 'ta', enabled: true },
-  19 => { name: 'Persian', iso_639_3_code: 'fas', iso_639_1_code: 'fa', enabled: true },
-  20 => { name: 'Traditional Chinese', iso_639_3_code: 'zho', iso_639_1_code: 'zh_TW', enabled: true },
-  21 => { name: 'Vietnamese', iso_639_3_code: 'vie', iso_639_1_code: 'vi', enabled: true }
+  0 => { name: 'English (en)', iso_639_3_code: 'eng', iso_639_1_code: 'en', enabled: true },
+  1 => { name: 'العربية (ar)', iso_639_3_code: 'ara', iso_639_1_code: 'ar', enabled: false },
+  2 => { name: 'Nederlands (nl) ', iso_639_3_code: 'nld', iso_639_1_code: 'nl', enabled: true },
+  3 => { name: 'Français (fr)', iso_639_3_code: 'fra', iso_639_1_code: 'fr', enabled: true },
+  4 => { name: 'Deutsch (de)', iso_639_3_code: 'deu', iso_639_1_code: 'de', enabled: true },
+  5 => { name: 'हिन्दी (hi)', iso_639_3_code: 'hin', iso_639_1_code: 'hi', enabled: false },
+  6 => { name: 'Italiano (it)', iso_639_3_code: 'ita', iso_639_1_code: 'it', enabled: true },
+  7 => { name: '日本語 (ja)', iso_639_3_code: 'jpn', iso_639_1_code: 'ja', enabled: false },
+  8 => { name: '한국어 (ko)', iso_639_3_code: 'kor', iso_639_1_code: 'ko', enabled: false },
+  9 => { name: 'Português (pt)', iso_639_3_code: 'por', iso_639_1_code: 'pt', enabled: true },
+  10 => { name: 'русский (ru)', iso_639_3_code: 'rus', iso_639_1_code: 'ru', enabled: true },
+  11 => { name: '中文 (zh)', iso_639_3_code: 'zho', iso_639_1_code: 'zh', enabled: false },
+  12 => { name: 'Español (es)', iso_639_3_code: 'spa', iso_639_1_code: 'es', enabled: true },
+  13 => { name: 'മലയാളം (ml)', iso_639_3_code: 'mal', iso_639_1_code: 'ml', enabled: true },
+  14 => { name: 'Català (ca)', iso_639_3_code: 'cat', iso_639_1_code: 'ca', enabled: true },
+  15 => { name: 'ελληνικά (el)', iso_639_3_code: 'ell', iso_639_1_code: 'el', enabled: true },
+  16 => { name: 'Português Brasileiro (pt-BR)', iso_639_3_code: '', iso_639_1_code: 'pt_BR', enabled: true },
+  17 => { name: 'Română (ro)', iso_639_3_code: 'ron', iso_639_1_code: 'ro', enabled: true },
+  18 => { name: 'தமிழ் (ta)', iso_639_3_code: 'tam', iso_639_1_code: 'ta', enabled: true },
+  19 => { name: 'فارسی (fa)', iso_639_3_code: 'fas', iso_639_1_code: 'fa', enabled: true },
+  20 => { name: '中文 (台湾) (zh-TW)', iso_639_3_code: 'zho', iso_639_1_code: 'zh_TW', enabled: true },
+  21 => { name: 'Tiếng Việt (vi)', iso_639_3_code: 'vie', iso_639_1_code: 'vi', enabled: true }
 }.filter { |_key, val| val[:enabled] }.freeze
 
 Rails.configuration.i18n.available_locales = LANGUAGES_CONFIG.map { |_index, lang| lang[:iso_639_1_code].to_sym }

From 9d2542eecd71f6f9c9daa8b99b0d419395f341eb Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 16 Nov 2020 23:11:14 +0530
Subject: [PATCH 34/36] chore: Enable Japanese, update translation from Crowdin
 (#1417)

---
 .../dashboard/i18n/locale/ar/contact.json     |  18 ++
 .../i18n/locale/ar/conversation.json          |   7 +
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/ar/settings.json    |   5 +-
 .../dashboard/i18n/locale/ca/agentMgmt.json   |   4 +-
 .../dashboard/i18n/locale/ca/cannedMgmt.json  |   2 +-
 .../dashboard/i18n/locale/ca/chatlist.json    |   6 +-
 .../dashboard/i18n/locale/ca/contact.json     |  86 +++---
 .../i18n/locale/ca/conversation.json          |  33 ++-
 .../i18n/locale/ca/generalSettings.json       |  18 +-
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |  89 +++---
 .../i18n/locale/ca/integrations.json          |   4 +-
 .../dashboard/i18n/locale/ca/labelsMgmt.json  |  50 ++--
 .../dashboard/i18n/locale/ca/settings.json    |  81 +++---
 .../dashboard/i18n/locale/cs/contact.json     |  18 ++
 .../i18n/locale/cs/conversation.json          |   7 +
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/cs/settings.json    |   5 +-
 .../dashboard/i18n/locale/da/contact.json     |  18 ++
 .../i18n/locale/da/conversation.json          |   7 +
 .../dashboard/i18n/locale/da/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/da/settings.json    |   5 +-
 .../dashboard/i18n/locale/de/agentMgmt.json   |   6 +-
 .../dashboard/i18n/locale/de/cannedMgmt.json  |   2 +-
 .../dashboard/i18n/locale/de/contact.json     |  18 ++
 .../i18n/locale/de/conversation.json          |   7 +
 .../dashboard/i18n/locale/de/inboxMgmt.json   |  15 +-
 .../dashboard/i18n/locale/de/labelsMgmt.json  |   2 +-
 .../dashboard/i18n/locale/de/settings.json    |  51 ++--
 .../dashboard/i18n/locale/el/contact.json     |  64 +++--
 .../i18n/locale/el/conversation.json          |   7 +
 .../i18n/locale/el/generalSettings.json       |   4 +-
 .../dashboard/i18n/locale/el/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/el/settings.json    |   5 +-
 .../dashboard/i18n/locale/fa/chatlist.json    |  12 +-
 .../dashboard/i18n/locale/fa/contact.json     |  96 ++++---
 .../i18n/locale/fa/conversation.json          |  75 ++---
 .../i18n/locale/fa/generalSettings.json       |   8 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  29 +-
 .../i18n/locale/fa/integrations.json          |   4 +-
 .../dashboard/i18n/locale/fa/labelsMgmt.json  |  50 ++--
 .../dashboard/i18n/locale/fa/settings.json    |  41 +--
 .../dashboard/i18n/locale/fi/contact.json     |  18 ++
 .../i18n/locale/fi/conversation.json          |   7 +
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/fi/settings.json    |   5 +-
 .../dashboard/i18n/locale/fr/agentMgmt.json   |  10 +-
 .../dashboard/i18n/locale/fr/contact.json     |  18 ++
 .../i18n/locale/fr/conversation.json          |   7 +
 .../i18n/locale/fr/generalSettings.json       |   4 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/fr/settings.json    |   7 +-
 .../dashboard/i18n/locale/hi/contact.json     |  18 ++
 .../i18n/locale/hi/conversation.json          |   7 +
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/hi/settings.json    |   5 +-
 .../dashboard/i18n/locale/hu/agentMgmt.json   |  48 ++--
 .../dashboard/i18n/locale/hu/cannedMgmt.json  |   2 +-
 .../dashboard/i18n/locale/hu/contact.json     |  22 +-
 .../i18n/locale/hu/conversation.json          |   7 +
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |  17 +-
 .../i18n/locale/hu/integrations.json          |   2 +-
 .../dashboard/i18n/locale/hu/labelsMgmt.json  |  12 +-
 .../dashboard/i18n/locale/hu/settings.json    |   7 +-
 .../dashboard/i18n/locale/it/contact.json     |  18 ++
 .../i18n/locale/it/conversation.json          |   7 +
 .../dashboard/i18n/locale/it/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/it/settings.json    |   5 +-
 .../dashboard/i18n/locale/ja/agentMgmt.json   |  96 +++----
 .../dashboard/i18n/locale/ja/cannedMgmt.json  |  84 +++---
 .../dashboard/i18n/locale/ja/chatlist.json    |  44 +--
 .../dashboard/i18n/locale/ja/contact.json     | 122 ++++----
 .../i18n/locale/ja/conversation.json          |  85 +++---
 .../i18n/locale/ja/generalSettings.json       |  36 +--
 .../dashboard/i18n/locale/ja/inboxMgmt.json   | 261 +++++++++---------
 .../i18n/locale/ja/integrations.json          |  62 ++---
 .../dashboard/i18n/locale/ja/labelsMgmt.json  |  72 ++---
 .../dashboard/i18n/locale/ja/login.json       |  22 +-
 .../dashboard/i18n/locale/ja/report.json      |  34 +--
 .../i18n/locale/ja/resetPassword.json         |  14 +-
 .../i18n/locale/ja/setNewPassword.json        |  20 +-
 .../dashboard/i18n/locale/ja/settings.json    | 165 +++++------
 .../dashboard/i18n/locale/ja/signup.json      |  36 +--
 .../dashboard/i18n/locale/ja/webhooks.json    |   2 +-
 .../dashboard/i18n/locale/ko/contact.json     |  18 ++
 .../i18n/locale/ko/conversation.json          |   7 +
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/ko/settings.json    |   5 +-
 .../dashboard/i18n/locale/ml/contact.json     |  18 ++
 .../i18n/locale/ml/conversation.json          |   7 +
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/ml/settings.json    |   5 +-
 .../dashboard/i18n/locale/nl/contact.json     |  18 ++
 .../i18n/locale/nl/conversation.json          |   7 +
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/nl/settings.json    |   5 +-
 .../dashboard/i18n/locale/pl/contact.json     |  18 ++
 .../i18n/locale/pl/conversation.json          |   7 +
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/pl/settings.json    |   7 +-
 .../dashboard/i18n/locale/pt/contact.json     |  18 ++
 .../i18n/locale/pt/conversation.json          |   7 +
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/pt/settings.json    |   5 +-
 .../dashboard/i18n/locale/pt_BR/contact.json  |  18 ++
 .../i18n/locale/pt_BR/conversation.json       |   7 +
 .../i18n/locale/pt_BR/inboxMgmt.json          |  13 +
 .../dashboard/i18n/locale/pt_BR/settings.json |   5 +-
 .../dashboard/i18n/locale/ro/contact.json     |  18 ++
 .../i18n/locale/ro/conversation.json          |   7 +
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/ro/settings.json    |   5 +-
 .../dashboard/i18n/locale/ru/contact.json     |  18 ++
 .../i18n/locale/ru/conversation.json          |   7 +
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/ru/settings.json    |   5 +-
 .../dashboard/i18n/locale/sk/contact.json     |  18 ++
 .../i18n/locale/sk/conversation.json          |   7 +
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/sk/settings.json    |   5 +-
 .../dashboard/i18n/locale/sv/contact.json     |  18 ++
 .../i18n/locale/sv/conversation.json          |   7 +
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/sv/settings.json    |   5 +-
 .../dashboard/i18n/locale/ta/contact.json     |  18 ++
 .../i18n/locale/ta/conversation.json          |   7 +
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/ta/settings.json    |   5 +-
 .../dashboard/i18n/locale/th/contact.json     |  18 ++
 .../i18n/locale/th/conversation.json          |   7 +
 .../dashboard/i18n/locale/th/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/th/settings.json    |   5 +-
 .../dashboard/i18n/locale/tr/contact.json     |  18 ++
 .../i18n/locale/tr/conversation.json          |   7 +
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/tr/settings.json    |   5 +-
 .../dashboard/i18n/locale/uk/contact.json     |  18 ++
 .../i18n/locale/uk/conversation.json          |   7 +
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |  13 +
 .../dashboard/i18n/locale/uk/settings.json    |   5 +-
 .../dashboard/i18n/locale/vi/contact.json     |  18 ++
 .../i18n/locale/vi/conversation.json          |   7 +
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |  13 +
 .../i18n/locale/vi/integrations.json          |   2 +-
 .../dashboard/i18n/locale/vi/settings.json    |   7 +-
 .../dashboard/i18n/locale/zh_CN/contact.json  |  18 ++
 .../i18n/locale/zh_CN/conversation.json       |   7 +
 .../i18n/locale/zh_CN/inboxMgmt.json          |  13 +
 .../dashboard/i18n/locale/zh_CN/settings.json |   5 +-
 .../dashboard/i18n/locale/zh_TW/contact.json  |  18 ++
 .../i18n/locale/zh_TW/conversation.json       |   7 +
 .../i18n/locale/zh_TW/inboxMgmt.json          |  13 +
 .../dashboard/i18n/locale/zh_TW/settings.json |   5 +-
 .../dashboard/settings/account/Index.vue      |   9 +-
 app/javascript/widget/i18n/locale/ar.json     |  14 +-
 app/javascript/widget/i18n/locale/ca.json     |  24 +-
 app/javascript/widget/i18n/locale/cs.json     |  14 +-
 app/javascript/widget/i18n/locale/da.json     |  14 +-
 app/javascript/widget/i18n/locale/el.json     |  14 +-
 app/javascript/widget/i18n/locale/es.json     |  16 +-
 app/javascript/widget/i18n/locale/fa.json     |  20 +-
 app/javascript/widget/i18n/locale/fi.json     |  14 +-
 app/javascript/widget/i18n/locale/fr.json     |  14 +-
 app/javascript/widget/i18n/locale/hi.json     |  14 +-
 app/javascript/widget/i18n/locale/hu.json     |  14 +-
 app/javascript/widget/i18n/locale/it.json     |  14 +-
 app/javascript/widget/i18n/locale/ja.json     |  30 +-
 app/javascript/widget/i18n/locale/ko.json     |  14 +-
 app/javascript/widget/i18n/locale/ml.json     |  14 +-
 app/javascript/widget/i18n/locale/nl.json     |  14 +-
 app/javascript/widget/i18n/locale/pt.json     |  14 +-
 app/javascript/widget/i18n/locale/pt_BR.json  |  14 +-
 app/javascript/widget/i18n/locale/ro.json     |  14 +-
 app/javascript/widget/i18n/locale/ru.json     |  14 +-
 app/javascript/widget/i18n/locale/sk.json     |  14 +-
 app/javascript/widget/i18n/locale/sv.json     |  14 +-
 app/javascript/widget/i18n/locale/ta.json     |  14 +-
 app/javascript/widget/i18n/locale/th.json     |  14 +-
 app/javascript/widget/i18n/locale/tr.json     |  14 +-
 app/javascript/widget/i18n/locale/uk.json     |  14 +-
 app/javascript/widget/i18n/locale/vi.json     |  22 +-
 app/javascript/widget/i18n/locale/zh_CN.json  |  14 +-
 app/javascript/widget/i18n/locale/zh_TW.json  |  22 +-
 config/initializers/languages.rb              |   4 +-
 config/locales/ar.yml                         |   6 +
 config/locales/ca.yml                         |  12 +-
 config/locales/cs.yml                         |   6 +
 config/locales/da.yml                         |   6 +
 config/locales/de.yml                         |   6 +
 config/locales/devise.ja.yml                  |  84 +++---
 config/locales/devise.vi.yml                  |   2 +-
 config/locales/devise.zh_TW.yml               |   1 -
 config/locales/el.yml                         |   8 +-
 config/locales/es.yml                         |  10 +-
 config/locales/fa.yml                         |  10 +-
 config/locales/fi.yml                         |   6 +
 config/locales/fr.yml                         |   8 +-
 config/locales/hi.yml                         |   6 +
 config/locales/hu.yml                         |   6 +
 config/locales/it.yml                         |   6 +
 config/locales/ja.yml                         |  38 +--
 config/locales/ko.yml                         |   6 +
 config/locales/ml.yml                         |   6 +
 config/locales/nl.yml                         |   6 +
 config/locales/pl.yml                         |   6 +
 config/locales/pt.yml                         |   6 +
 config/locales/pt_BR.yml                      |   6 +
 config/locales/ro.yml                         |   6 +
 config/locales/ru.yml                         |   6 +
 config/locales/sk.yml                         |   6 +
 config/locales/sv.yml                         |   6 +
 config/locales/ta.yml                         |   6 +
 config/locales/th.yml                         |   6 +
 config/locales/tr.yml                         |   6 +
 config/locales/uk.yml                         |   6 +
 config/locales/vi.yml                         |   6 +
 config/locales/zh_CN.yml                      |   6 +
 config/locales/zh_TW.yml                      |  74 +++--
 218 files changed, 2796 insertions(+), 1272 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 7d8434640..9414816ce 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "غير متاح",
     "EMAIL_ADDRESS": "عنوان البريد الإلكتروني",
     "PHONE_NUMBER": "رقم الهاتف",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "الشركة",
     "LOCATION": "الموقع الجغرافي",
     "CONVERSATION_TITLE": "تفاصيل المحادثة",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "لا يوجد وسوم مضافة لهذه المحادثة."
     },
     "MUTE_CONTACT": "كتم المحادثة",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "تم كتم هذه المحادثة لمدة 6 ساعات",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "إرسال النص",
     "EDIT_LABEL": "تعديل"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "تم تحديث جهة الاتصال بنجاح",
     "CONTACT_ALREADY_EXIST": "عنوان البريد الإلكتروني هذا مستخدم لجهة اتصال أخرى.",
     "ERROR_MESSAGE": "حدث خطأ أثناء تحديث جهة الاتصال، الرجاء المحاولة مرة أخرى"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "الاسم",
+        "رقم الهاتف",
+        "المحادثات",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index d8878f6fc..8960a4dc2 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "يبدو أنك لم تقم بإضافة أي صناديق بريدية بعد.",
     "NO_INBOX_2": " للبدء",
     "NO_INBOX_AGENT": "يبدو أنه لم يتم إسنادك لأي قنوات تواصل بعد. الرجاء التواصل مع المدير لإضافتك لصناديق الوارد الخاصة بقنوات التواصل",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "اضغط هنا",
     "LOADING_INBOXES": "جار تحميل صناديق الوارد",
     "LOADING_CONVERSATIONS": "جاري تحميل المحادثات",
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index bfe520922..824aeb610 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "مفعل",
           "DISABLED": "معطّل"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "لون صندوق الدردشة",
           "PLACEHOLDER": "تحديث اللون الرئيسي لصندوق الدردشة"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "إعدادات قناة التواصل",
       "INBOX_UPDATE_SUB_TEXT": "تحديث إعدادات قناة التواصل",
       "AUTO_ASSIGNMENT_SUB_TEXT": "تمكين أو تعطيل الإسناد التلقائي للمحادثات الجديدة إلى الموظفين المضافين إلى قناة التواصل هذه."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "إعادة التصريح",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "حدث خطأ، الرجاء المحاولة مرة أخرى"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index 1d0d04288..ba61eab02 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "إشعارات البريد الإلكتروني",
         "NOTE": "قم بتحديث تفضيلات إشعار البريد الإلكتروني الخاص بك من هنا",
         "CONVERSATION_ASSIGNMENT": "إرسال إشعارات البريد الإلكتروني عند إسناد محادثة لي",
-        "CONVERSATION_CREATION": "إرسال إشعارات للبريد الإلكتروني عند ورود محادثة جديدة"
+        "CONVERSATION_CREATION": "إرسال إشعارات للبريد الإلكتروني عند ورود محادثة جديدة",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "يتم تحديث إعدادات الإشعارات بنجاح",
@@ -37,6 +38,7 @@
         "NOTE": "قم بتحديث تفضيلات إشعارات المتصفح من هنا",
         "CONVERSATION_ASSIGNMENT": "إرسال إشعارات على المتصفح عند إسناد محادثة لي",
         "CONVERSATION_CREATION": "إرسال إشعارات المتصفح عند ورود محادثة جديدة",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "لقد قمت بتمكين الإشعارات لهذا المتصفح.",
         "REQUEST_PUSH": "تفعيل إشعارات المتصفح"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "المحادثات",
     "REPORTS": "التقارير",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "الإعدادات",
     "HOME": "الرئيسية",
     "AGENTS": "موظف الدعم",
diff --git a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
index 63ada3d82..9fb6b933b 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> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
+    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> Un <b>Agent</b> és membre del vostre equip d’atenció al client. </p><p> Els agents podran veure i respondre missatges dels teus usuaris. La llista mostra tots els agents que hi ha actualment al teu compte.</p><p> Fer clic a <b>Afegeix Agent</b> per afegir un agent nou. L’agent que afegeixes rebrà un correu electrònic amb un enllaç de confirmació per activar el seu compte, després del qual podrà 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 aquesta funció només poden accedir a les bústies d’entrada, als informes i a les converses. Poden assignar converses a altres agents o a ells mateixos i resoldre converses.</p><p> <b>Administrador</b> - L'administrador tindrà accés a totes les funcions de Chatwoot habilitades per al teu compte, inclosa la configuració, juntament amb tots els privilegis dels agents normals.</p>",
     "AGENT_TYPES": {
       "ADMINISTRATOR": "Administrador/a",
       "AGENT": "Agent"
@@ -55,7 +55,7 @@
         "TITLE": "Confirma l'esborrat",
         "MESSAGE": "N'estas segur? ",
         "YES": "Si, esborra ",
-        "NO": "No, Keep "
+        "NO": "No, segueix "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
index 76863a4d0..ac8213a86 100644
--- a/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
@@ -69,7 +69,7 @@
         "TITLE": "Confirma esborrat",
         "MESSAGE": "N'estas segur ",
         "YES": "Si, esborra ",
-        "NO": "No, Keep "
+        "NO": "No, segueix "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/chatlist.json b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
index 2c7a6c871..37c38fe1d 100644
--- a/app/javascript/dashboard/i18n/locale/ca/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
@@ -77,8 +77,8 @@
         "CONTENT": "ha compartit una URL"
       }
     },
-    "RECEIVED_VIA_EMAIL": "Received via email",
-    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
-    "REPLY_TO_TWEET": "Reply to this tweet"
+    "RECEIVED_VIA_EMAIL": "Rebut per correu electrònic",
+    "VIEW_TWEET_IN_TWITTER": "Veure el tuit a Twitter",
+    "REPLY_TO_TWEET": "Respon a aquest tuit"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index c4ad35058..6b5969c3c 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -1,9 +1,10 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Not Available",
+    "NOT_AVAILABLE": "No disponible",
     "EMAIL_ADDRESS": "Adreça de correu electrònic",
     "PHONE_NUMBER": "Número de telèfon",
-    "COMPANY": "Company",
+    "COPY_SUCCESSFUL": "S'ha copiat al porta-retalls amb èxit",
+    "COMPANY": "Companyia",
     "LOCATION": "Ubicació",
     "CONVERSATION_TITLE": "Detalls de les converses",
     "BROWSER": "Navegador",
@@ -15,82 +16,99 @@
       "TITLE": "Converses prèvies"
     },
     "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
+      "TITLE": "Atributs personalitzats"
     },
     "LABELS": {
       "TITLE": "Etiquetes de converses",
       "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",
+        "TITLE": "Etiquetes per a",
+        "ACTIVE_LABELS": "S'han afegit etiquetes a la conversa",
+        "INACTIVE_LABELS": "Etiquetes disponibles al compte",
+        "REMOVE": "Fes clic a la icona X per eliminar l'etiqueta",
+        "ADD": "Fes clic a la icona + per afegir l'etiqueta",
+        "UPDATE_BUTTON": "Actualitza les etiquetes",
         "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."
+      "NO_LABELS_TO_ADD": "No hi ha cap etiqueta definida al compte.",
+      "NO_AVAILABLE_LABELS": "No hi ha etiquetes afegides a aquesta conversa."
     },
-    "MUTE_CONTACT": "Mute Conversation",
-    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
-    "SEND_TRANSCRIPT": "Send Transcript",
+    "MUTE_CONTACT": "Silencia la conversa",
+    "UNMUTE_CONTACT": "Desactiva el silenci de la conversa",
+    "MUTED_SUCCESS": "Aquesta conversa s'ha silenciat durant 6 hores",
+    "UNMUTED_SUCCESS": "La conversa te desactivat el silenci",
+    "SEND_TRANSCRIPT": "Envia la transcripció",
     "EDIT_LABEL": "Edita"
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edit Contact",
-    "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "BUTTON_LABEL": "Edita el contacte",
+    "TITLE": "Edita el contacte",
+    "DESC": "Edita els detalls de contacte",
     "FORM": {
       "SUBMIT": "Envia",
       "CANCEL": "Cancel·la",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "Avatar del contacte"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
-        "LABEL": "Full Name"
+        "PLACEHOLDER": "Introdueix el nom complet del contacte",
+        "LABEL": "Nom complet"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
+        "PLACEHOLDER": "Introdueix la biografia del contacte",
         "LABEL": "Bio"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
+        "PLACEHOLDER": "Introdueix l'adreça de correu electrònic del contacte",
         "LABEL": "Adreça de correu electrònic"
       },
       "PHONE_NUMBER": {
-        "PLACEHOLDER": "Enter the phone number of the contact",
-        "LABEL": "Phone Number"
+        "PLACEHOLDER": "Introdueix el número de telèfon del contacte",
+        "LABEL": "Número de telèfon"
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
+        "PLACEHOLDER": "Introdueix la ubicació del contacte",
         "LABEL": "Ubicació"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "Introdueix el nom de la companyia",
+        "LABEL": "Nom de la companyia"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "Introduïu el nom d'usuari de Facebook",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
+          "PLACEHOLDER": "Introduïu el nom d'usuari de Twitter",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
+          "PLACEHOLDER": "Introduïu el nom d'usuari de LinkedIn",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
+          "PLACEHOLDER": "Introdueix el nom d'usuari de Github",
           "LABEL": "Github"
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
-    "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "SUCCESS_MESSAGE": "S'ha actualitzat correctament el contacte",
+    "CONTACT_ALREADY_EXIST": "Aquesta adreça de correu electrònic s’utilitza per a un altre contacte.",
+    "ERROR_MESSAGE": "S'ha produït un error en actualitzar el contacte. Tornau-ho a provar"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contactes",
+    "SEARCH_BUTTON": "Cercar",
+    "SEARCH_INPUT_PLACEHOLDER": "Cerca de contactes",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Nom",
+        "Número de telèfon",
+        "Converses",
+        "Darrer contacte"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index e1c84f00d..4b688e7cf 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -6,14 +6,21 @@
     "NO_INBOX_1": "Hola! Sembla que encara no heu afegit cap safata d'entrada.",
     "NO_INBOX_2": " per començar",
     "NO_INBOX_AGENT": "Uh Oh! Sembla que no ets a cap safata d'entrada. Si us plau, poseu-vos en contacte amb l'administrador",
+    "SEARCH_MESSAGES": "Cerca missatges a les converses",
+    "SEARCH": {
+      "TITLE": "Cerca missatges",
+      "LOADING_MESSAGE": "S'estan restringint les dades...",
+      "PLACEHOLDER": "Escriu qualsevol text per cercar missatges",
+      "NO_MATCHING_RESULTS": "No hi ha missatges que coincideixin amb els paràmetres de cerca."
+    },
     "CLICK_HERE": "Clica aquí",
     "LOADING_INBOXES": "S'estan carregant les safates d'entrada",
     "LOADING_CONVERSATIONS": "S'estan carregant les converses",
-    "CANNOT_REPLY": "You cannot reply due to",
-    "24_HOURS_WINDOW": "24 hour message window restriction",
-    "LAST_INCOMING_TWEET": "You are replying to the last incoming tweet",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
+    "CANNOT_REPLY": "No pots respondre degut a",
+    "24_HOURS_WINDOW": "Restricció de finestra de missatges de 24 hores",
+    "LAST_INCOMING_TWEET": "Estas responent a l'últim tuit entrant",
+    "REPLYING_TO": "Estas responent a:",
+    "REMOVE_SELECTION": "Elimina la selecció",
     "DOWNLOAD": "Descarrega",
     "HEADER": {
       "RESOLVE_ACTION": "Resoldre",
@@ -38,18 +45,18 @@
     "CHANGE_AGENT": "Assignació de la conversa canviat"
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "Send conversation transcript",
-    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "TITLE": "Envia la transcripció de la conversa",
+    "DESC": "Envia una còpia de la transcripció de la conversa a l'adreça electrònica especificada",
     "SUBMIT": "Envia",
     "CANCEL": "Cancel·la",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
-    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "SEND_EMAIL_SUCCESS": "La transcripció del xat s'ha enviat correctament",
+    "SEND_EMAIL_ERROR": "S'ha produït un error; tornau-ho a provar",
     "FORM": {
-      "SEND_TO_CONTACT": "Send the transcript to the customer",
-      "SEND_TO_AGENT": "Send the transcript of the assigned agent",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "SEND_TO_CONTACT": "Envia la transcripció al client",
+      "SEND_TO_AGENT": "Envia la transcripció de l'agent assignat",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Envia la transcripció a una altra adreça electrònica",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
+        "PLACEHOLDER": "Introdueix una adreça de correu electrònic",
         "ERROR": "Introduïu una adreça de correu electrònic vàlida"
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index 2909aaa62..5561435a6 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -2,7 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Configuració del compte",
     "SUBMIT": "Actualització de la configuració",
-    "BACK": "Back",
+    "BACK": "Enrere",
     "UPDATE": {
       "ERROR": "No s'ha pogut actualitzar la configuració, torna-ho a provar!",
       "SUCCESS": "La configuració del compte s'ha actualitzat correctament"
@@ -24,23 +24,23 @@
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Incoming Email Domain",
-        "PLACEHOLDER": "The domain where you will receive the emails",
+        "LABEL": "Domini de correu electrònic entrant",
+        "PLACEHOLDER": "El domini on rebràs els correus electrònics",
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
-        "LABEL": "Support Email",
-        "PLACEHOLDER": "Your company's support email",
+        "LABEL": "Correu electrònic d'assistència",
+        "PLACEHOLDER": "Correu electrònic d'assistència de la vostra companya",
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "El nombre de dies després que un ticket es resolgui automàticament si no hi ha activitat",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Introdueix una durada vàlida de resolució automàtica (mínim 1 dia)"
       },
       "FEATURES": {
-        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
-        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+        "INBOUND_EMAIL_ENABLED": "La continuïtat de converses amb correus electrònics està habilitada per al vostre compte.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "Ara podeu rebre correus electrònics al vostre domini personalitzat."
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 17a2c30fa..af11a228e 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Safates d'entrada",
-    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
+    "SIDEBAR_TXT": "<p><b>Safata d’entrada</b></p> <p> Quan connecteu un lloc web o una pàgina de Facebook a Chatwoot, s’anomena<b>Safata d’entrada</b>. Podeu tenir bústies d’entrada il·limitades al vostre compte de Chatwoot. </p><p> Fer clic a <b>Add Safata d’entrada</b> per connectar un lloc web o una pàgina de Facebook.</p><p> Al tauler, pots veure totes les converses de totes les teves safates d'entrada en un sol lloc i respondre-hi a la pestanya `Converses`.</p><p> També pots veure converses específiques d’una safata d’entrada fent clic al nom de la safata d’entrada a l'esquerre del tauler. </p>",
     "LIST": {
       "404": "No hi ha cap safata d'entrada connectat a aquest compte."
     },
@@ -30,12 +30,12 @@
     "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.",
-        "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"
+        "CHOOSE_PAGE": "Trieu la pàgina",
+        "CHOOSE_PLACEHOLDER": "Selecciona una pàgina de la llista",
+        "INBOX_NAME": "Nom de la safata d'entrada",
+        "ADD_NAME": "Afegeix un nom per a la safata d'entrada",
+        "PICK_NAME": "Tria un nom a la safata d'entrada",
+        "PICK_A_VALUE": "Tria un valor"
       },
       "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' "
@@ -45,7 +45,7 @@
         "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"
+          "LABEL": "Avatar del canal"
         },
         "CHANNEL_NAME": {
           "LABEL": "Nom del lloc web",
@@ -56,23 +56,30 @@
           "PLACEHOLDER": "Introduïu el vostre domini de lloc web (pe: acme.com)"
         },
         "CHANNEL_WELCOME_TITLE": {
-          "LABEL": "Welcome Heading",
-          "PLACEHOLDER": "Hi there !"
+          "LABEL": "Encapçalament de benvinguda",
+          "PLACEHOLDER": "Hola!"
         },
         "CHANNEL_WELCOME_TAGLINE": {
-          "LABEL": "Welcome Tagline",
-          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+          "LABEL": "Lema de benvinguda",
+          "PLACEHOLDER": "Facilitem la connexió amb nosaltres. Pregunteu-nos qualsevol cosa o compartiu els vostres comentaris."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Channel greeting message",
-          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+          "LABEL": "Missatge de felicitació del canal",
+          "PLACEHOLDER": "Acme Inc sol respondre en poques hores."
         },
         "CHANNEL_GREETING_TOGGLE": {
-          "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "LABEL": "Activa la salutació del canal",
+          "HELP_TEXT": "Envia un missatge de felicitació a l'usuari quan comenci la conversa.",
           "ENABLED": "Habilita",
           "DISABLED": "Inhabilita"
         },
+        "REPLY_TIME": {
+          "TITLE": "Estableix el temps de resposta",
+          "IN_A_FEW_MINUTES": "En pocs minuts",
+          "IN_A_FEW_HOURS": "En poques hores",
+          "IN_A_DAY": "En un dia",
+          "HELP_TEXT": "Aquest temps de resposta es mostrarà al widget de xat en directe"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Color del Widget",
           "PLACEHOLDER": "Actualitza el color del widget"
@@ -88,8 +95,8 @@
           "ERROR": "Aquest camp és obligatori"
         },
         "CHANNEL_TYPE": {
-          "LABEL": "Channel Type",
-          "ERROR": "Please select your Channel Type"
+          "LABEL": "Tipus de canal",
+          "ERROR": "Seleccioneu el teu tipus de canal"
         },
         "AUTH_TOKEN": {
           "LABEL": "Token d'autenticació",
@@ -108,7 +115,7 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+          "SUBTITLE": "Has de configurar l'URL de callback a Twilio amb l'URL que s'esmenta aquí."
         },
         "SUBMIT_BUTTON": "Crear un canal Twilio",
         "API": {
@@ -116,8 +123,8 @@
         }
       },
       "API_CHANNEL": {
-        "TITLE": "API Channel",
-        "DESC": "Integrate with API channel and start supporting your customers.",
+        "TITLE": "Canal de l'API",
+        "DESC": "Integra’t amb el canal API i comença a donar suport als teus clients.",
         "CHANNEL_NAME": {
           "LABEL": "Nom del canal",
           "PLACEHOLDER": "Introduïu el nom del canal",
@@ -125,17 +132,17 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configura l'URL on vulguis rebre callbacks en esdeveniments.",
           "PLACEHOLDER": "URL del webhook"
         },
-        "SUBMIT_BUTTON": "Create API Channel",
+        "SUBMIT_BUTTON": "Crea un canal API",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the api channel"
+          "ERROR_MESSAGE": "No hem pogut desar el canal API"
         }
       },
       "EMAIL_CHANNEL": {
-        "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "TITLE": "Correu electrònic del Canal",
+        "DESC": "Integra la teva safata d’entrada de correu electrònic.",
         "CHANNEL_NAME": {
           "LABEL": "Nom del canal",
           "PLACEHOLDER": "Introduïu el nom del canal",
@@ -143,14 +150,14 @@
         },
         "EMAIL": {
           "LABEL": "Correu electrònic",
-          "SUBTITLE": "Email where your customers sends you support tickets",
+          "SUBTITLE": "Correu electrònic on els vostres clients us envien tickets de support",
           "PLACEHOLDER": "Correu electrònic"
         },
-        "SUBMIT_BUTTON": "Create Email Channel",
+        "SUBMIT_BUTTON": "Crea un correu electrònic del Canal",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the email channel"
+          "ERROR_MESSAGE": "No hem pogut desar el canal de correu electrònic"
         },
-        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+        "FINISH_MESSAGE": "Comença a reenviar els teus correus electrònics a la següent adreça electrònica."
       },
       "AUTH": {
         "TITLE": "Canals",
@@ -205,7 +212,7 @@
         "TITLE": "Confirma esborrat",
         "MESSAGE": "N'estas segur? ",
         "YES": "Si, esborra ",
-        "NO": "No, Keep "
+        "NO": "No, segueix "
       },
       "API": {
         "SUCCESS_MESSAGE": "S'ha suprimit la safata d'entrada correctament",
@@ -214,14 +221,14 @@
     },
     "TABS": {
       "SETTINGS": "Configuracions",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "COLLABORATORS": "Col·laboradors",
+      "CONFIGURATION": "Configuració"
     },
     "SETTINGS": "Configuracions",
     "FEATURES": {
-      "LABEL": "Features",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+      "LABEL": "Característiques",
+      "DISPLAY_FILE_PICKER": "Mostra el selector de fitxers al widget",
+      "DISPLAY_EMOJI_PICKER": "Mostra el selector d'emoji al widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script del missatger",
@@ -230,9 +237,15 @@
       "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",
+      "INBOX_UPDATE_TITLE": "Configuració de la safata d'entrada",
+      "INBOX_UPDATE_SUB_TEXT": "Actualitza la configuració de la safata d'entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activa o desactiva l'assignació automàtica d'agents disponibles a les noves converses"
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reautoritza",
+      "SUBTITLE": "La teva connexió a Facebook ha caducat, torna a connectar la vostra pàgina de Facebook per continuar els serveis",
+      "MESSAGE_SUCCESS": "La reconnexió s'ha realitzat correctament",
+      "MESSAGE_ERROR": "S'ha produït un error; tornau-ho a provar"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index 55cd53d05..925bd1c03 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -53,11 +53,11 @@
     "DELETE": {
       "BUTTON_TEXT": "Suprimeix",
       "API": {
-        "SUCCESS_MESSAGE": "Integration deleted successfully"
+        "SUCCESS_MESSAGE": "La integració s'ha suprimit correctament"
       }
     },
     "CONNECT": {
-      "BUTTON_TEXT": "Connect"
+      "BUTTON_TEXT": "Connectar"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
index bd04290e3..b6b2e544a 100644
--- a/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
@@ -1,67 +1,67 @@
 {
   "LABEL_MGMT": {
-    "HEADER": "Labels",
-    "HEADER_BTN_TXT": "Add label",
-    "LOADING": "Fetching labels",
+    "HEADER": "Etiquetes",
+    "HEADER_BTN_TXT": "Afegeix etiqueta",
+    "LOADING": "Obtenció d’etiquetes",
     "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>",
+    "SIDEBAR_TXT": "<p><b>Etiquetes</b> <p>Les etiquetes t'ajuden a classificar les converses i a prioritzar-les. Pots assignar una etiqueta a una conversa des del tauler lateral. <br /><br />Les etiquetes estan lligades al compte i es poden utilitzar per crear fluxos de treball personalitzats a la vostra organització. Pots assignar color personalitzat a una etiqueta, cosa que facilita la identificació de l’etiqueta. Pots mostrar l'etiqueta a la barra lateral per filtrar les converses fàcilment.</p>",
     "LIST": {
-      "404": "There are no labels available in this account.",
-      "TITLE": "Manage labels",
-      "DESC": "Labels let you group the conversations together.",
+      "404": "No hi ha etiquetes disponibles en aquest compte.",
+      "TITLE": "Gestiona les etiquetes",
+      "DESC": "Les etiquetes et permeten agrupar les converses.",
       "TABLE_HEADER": [
         "Nom",
-        "Description",
+        "Descripció",
         "Color"
       ]
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Label Name",
-        "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "LABEL": "Nom de l'etiqueta",
+        "PLACEHOLDER": "Nom de l'etiqueta",
+        "ERROR": "El nom de l’etiqueta és obligatori"
       },
       "DESCRIPTION": {
-        "LABEL": "Description",
-        "PLACEHOLDER": "Label Description"
+        "LABEL": "Descripció",
+        "PLACEHOLDER": "Descripció de l’etiqueta"
       },
       "COLOR": {
         "LABEL": "Color"
       },
       "SHOW_ON_SIDEBAR": {
-        "LABEL": "Show label on sidebar"
+        "LABEL": "Mostra l'etiqueta a la barra lateral"
       },
       "EDIT": "Edita",
-      "CREATE": "Create",
+      "CREATE": "Crear",
       "DELETE": "Suprimeix",
       "CANCEL": "Cancel·la"
     },
     "ADD": {
-      "TITLE": "Add label",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "Afegeix etiqueta",
+      "DESC": "Les etiquetes et permeten agrupar les converses.",
       "API": {
-        "SUCCESS_MESSAGE": "Label added successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "L'etiqueta s'ha afegit correctament",
+        "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
       }
     },
     "EDIT": {
-      "TITLE": "Edit label",
+      "TITLE": "Edita l'etiqueta",
       "API": {
-        "SUCCESS_MESSAGE": "Label updated successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "L'etiqueta s'ha actualitzat correctament",
+        "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Suprimeix",
       "API": {
-        "SUCCESS_MESSAGE": "Label deleted successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "L'etiqueta s'ha suprimit correctament",
+        "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
       },
       "CONFIRM": {
         "TITLE": "Confirma esborrat",
         "MESSAGE": "N'estas segur? ",
         "YES": "Si, esborra ",
-        "NO": "No, Keep "
+        "NO": "No, segueix "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index f080e7b31..5e46eba95 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -26,47 +26,49 @@
         "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"
+        "CONVERSATION_CREATION": "Envieu notificacions per correu electrònic quan es crea una nova conversa",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envia notificacions per correu electrònic quan es creï un missatge nou en una conversa assignada"
       },
       "API": {
-        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
-        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+        "UPDATE_SUCCESS": "Les teves preferències de notificació s’han actualitzat correctament",
+        "UPDATE_ERROR": "Hi ha un error en actualitzar les preferències; tornau-ho a provar"
       },
       "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"
+        "TITLE": "Notificacions automàtiques",
+        "NOTE": "Actualitzeu les preferències de notificació aquí",
+        "CONVERSATION_ASSIGNMENT": "Envia notificacions automàtiques quan se m'assigna una conversa",
+        "CONVERSATION_CREATION": "Envia notificacions automàtiques quan es creï una conversa nova",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envia notificacions automàtiques quan es creï un missatge nou en una conversa assignada",
+        "HAS_ENABLED_PUSH": "Heu activat les notificacions per a aquest navegador.",
+        "REQUEST_PUSH": "Activa les notificacions"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Imatge del Perfil"
       },
       "NAME": {
-        "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
-        "PLACEHOLDER": "Please enter your full name"
+        "LABEL": "El teu nom complet",
+        "ERROR": "Introdueix un nom complet vàlid",
+        "PLACEHOLDER": "Introdueix el vostre nom complet"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
-        "ERROR": "Please enter a valid display name",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "LABEL": "Nom visible",
+        "ERROR": "Introduïu un nom de visualització vàlid",
+        "PLACEHOLDER": "Introdueix un nom visible, que es mostrarà a les converses"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "Disponibilitat",
         "STATUSES_LIST": [
           {
-            "value": "online",
-            "label": "Online"
+            "value": "en línia",
+            "label": "En línia"
           },
           {
-            "value": "busy",
-            "label": "Busy"
+            "value": "ocupat",
+            "label": "Ocupat"
           },
           {
-            "value": "offline",
-            "label": "Offline"
+            "value": "fora de línia",
+            "label": "Fora de línia"
           }
         ]
       },
@@ -88,53 +90,54 @@
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "Canviar",
-    "CHANGE_ACCOUNTS": "Switch Account",
-    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "CHANGE_AVAILABILITY_STATUS": "Canvia",
+    "CHANGE_ACCOUNTS": "Canvia de compte",
+    "SELECTOR_SUBTITLE": "Selecciona un compte de la llista següent",
     "PROFILE_SETTINGS": "Configuració del Perfil",
     "LOGOUT": "Sortir"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "days trial remaining.",
-    "TRAIL_BUTTON": "Buy Now"
+    "TRIAL_MESSAGE": "dies de prova restants.",
+    "TRAIL_BUTTON": "Compra ara"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copy",
-      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+      "BUTTON_TEXT": "Copia",
+      "COPY_SUCCESSFUL": "El codi s'ha copiat al porta-retalls amb èxit"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descarrega",
-      "UPLOADING": "Uploading..."
+      "UPLOADING": "S'està carregant..."
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Envia"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "S'està verificant...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Add Inbox"
+      "NEW_INBOX": "Afegeix Safata d'entrada"
     }
   },
   "SIDEBAR": {
     "CONVERSATIONS": "Converses",
     "REPORTS": "Informes",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Configuracions",
-    "HOME": "Home",
+    "HOME": "Inici",
     "AGENTS": "Agents",
     "INBOXES": "Safates d'entrada",
     "CANNED_RESPONSES": "Respostes predeterminades",
     "INTEGRATIONS": "Integracions",
-    "ACCOUNT_SETTINGS": "Account Settings",
-    "LABELS": "Labels"
+    "ACCOUNT_SETTINGS": "Configuració del compte",
+    "LABELS": "Etiquetes"
   },
   "CREATE_ACCOUNT": {
-    "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "NEW_ACCOUNT": "Compte nou",
+    "SELECTOR_SUBTITLE": "Crear un compte nou",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
+      "SUCCESS_MESSAGE": "El compte s'ha creat correctament",
+      "EXIST_MESSAGE": "El compte ja existeix",
       "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
     },
     "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index f09614bf6..db0a708f0 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "E-mailová adresa",
     "PHONE_NUMBER": "Telefonní číslo",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Poloha",
     "CONVERSATION_TITLE": "Podrobnosti konverzace",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Upravit"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Název",
+        "Phone Number",
+        "Konverzace",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index 4d43fd898..9777b68f4 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Zdá se, že jste ještě nepřidali žádné schránky.",
     "NO_INBOX_2": " začít",
     "NO_INBOX_AGENT": "Uh Oh! Vypadá to, že nejste součástí žádné schránky. Obraťte se na správce",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Klikněte zde",
     "LOADING_INBOXES": "Načítání krabic",
     "LOADING_CONVERSATIONS": "Načítání konverzací",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index b4e136f8b..d468c12f6 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Povoleno",
           "DISABLED": "Zakázáno"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Barva widgetu",
           "PLACEHOLDER": "Aktualizovat barvu widgetu použitou ve widgetu"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Znovu autorizovat",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index cb31c1e08..4dc3a2f97 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -26,7 +26,8 @@
         "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"
+        "CONVERSATION_CREATION": "Odeslat oznámení e-mailem při vytváření nové konverzace",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Konverzace",
     "REPORTS": "Zprávy",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Nastavení",
     "HOME": "Home",
     "AGENTS": "Agenti",
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 0e21c0d5d..684a56ee5 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Email Address",
     "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
     "CONVERSATION_TITLE": "Conversation Details",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index f8ea61643..d271c7895 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
     "NO_INBOX_2": " to get started",
     "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click here",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index fb4c71134..be76d2e50 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Color",
           "PLACEHOLDER": "Update the widget color used in widget"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index f300f5fa3..866d76cee 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
         "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created"
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
index 343214656..7b86cb80b 100644
--- a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agenten",
     "HEADER_BTN_TXT": "Agent hinzufügen",
     "LOADING": "Agentenliste abrufen",
-    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
+    "SIDEBAR_TXT": "<p><b>Agenten</b></p> <p> Ein <b>Agent</b> ist Mitglied Ihres Kundenservice-Teams. </p><p> Agenten können Nachrichten Ihrer Benutzer ansehen und beantworten. Die Liste zeigt alle Agenten, die derzeit in Ihrem Konto sind. </p><p> Klicken Sie auf <b>Agent hinzufügen</b>, um einen neuen Agent hinzuzufügen. Agent, den du hinzufügst, wird eine E-Mail mit einem Bestätigungslink erhalten, um sein Konto zu aktivieren. Danach kann er auf Chatwoot zugreifen und auf Nachrichten antworten. </p><p> Zugriff auf Chatwoots Funktionen basieren auf folgenden Rollen. </p><p> <b>Agent</b> - Agenten mit dieser Rolle können nur auf Posteingänge, Berichte und Unterhaltungen zugreifen. Sie können Konversationen anderen Akteuren oder sich selbst zuweisen und Gespräche lösen.</p><p> <b>Administrator</b> - Administrator hat Zugriff auf alle für Ihr Konto aktivierten Chatwoot-Funktionen einschließlich der Einstellungen, zusammen mit allen Privilegien eines normalen Agenten.</p>",
     "AGENT_TYPES": {
       "ADMINISTRATOR": "Administrator",
       "AGENT": "Agent"
@@ -13,7 +13,7 @@
       "TITLE": "Verwalten Sie Agenten in Ihrem Team",
       "DESC": "Sie können Agenten zu / in Ihrem Team hinzufügen / entfernen.",
       "NAME": "Name",
-      "EMAIL": "EMAIL",
+      "EMAIL": "E-Mail",
       "STATUS": "Status",
       "ACTIONS": "Aktionen",
       "VERIFIED": "Verifiziert",
@@ -55,7 +55,7 @@
         "TITLE": "Löschung bestätigen",
         "MESSAGE": "Bist du sicher, das du das löschen möchtest?",
         "YES": "Ja, löschen ",
-        "NO": "No, Keep "
+        "NO": "Nein, behalten "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
index e3973ef35..a864de295 100644
--- a/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
@@ -69,7 +69,7 @@
         "TITLE": "Löschung bestätigen",
         "MESSAGE": "Bist du sicher, das du das löschen möchtest",
         "YES": "Ja, löschen",
-        "NO": "No, Keep "
+        "NO": "Nein, behalten "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 686b4ab0a..d8cb5632a 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "E-Mail-Addresse",
     "PHONE_NUMBER": "Telefonnummer",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Ort",
     "CONVERSATION_TITLE": "Unterhaltungsdetails",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Bearbeiten"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Gespräche",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index a24fb20d2..6b3aa55fe 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hallo! Sieht so aus, als hätten Sie noch keine Posteingänge hinzugefügt.",
     "NO_INBOX_2": " um loszulegen",
     "NO_INBOX_AGENT": "Oh oh! Sieht so aus, als wären Sie nicht Teil eines Posteingangs. Bitte wenden Sie sich an Ihren Administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Hier klicken",
     "LOADING_INBOXES": "Posteingänge laden",
     "LOADING_CONVERSATIONS": "Gespräche laden",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index fc64fce66..975ca4374 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Aktiviert",
           "DISABLED": "Behindert"
         },
+        "REPLY_TIME": {
+          "TITLE": "Reaktionszeit festlegen",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Farbe",
           "PLACEHOLDER": "Aktualisieren Sie die im Widget verwendete Widget-Farbe"
@@ -205,7 +212,7 @@
         "TITLE": "Löschung bestätigen",
         "MESSAGE": "Bist du sicher, das du das löschen möchtest ",
         "YES": "Ja, löschen",
-        "NO": "No, Keep "
+        "NO": "Nein, behalten "
       },
       "API": {
         "SUCCESS_MESSAGE": "Posteingang erfolgreich gelöscht",
@@ -233,6 +240,12 @@
       "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"
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Neu autorisieren",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
index 38f596efb..a8d2262d9 100644
--- a/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
@@ -61,7 +61,7 @@
         "TITLE": "Löschung bestätigen",
         "MESSAGE": "Bist du sicher, das du das löschen möchtest",
         "YES": "Ja, löschen",
-        "NO": "No, Keep "
+        "NO": "Nein, behalten "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index b03b8ec13..cc0fffaf8 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -26,19 +26,21 @@
         "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"
+        "CONVERSATION_CREATION": "Senden Sie E-Mail-Benachrichtigungen, wenn eine neue Konversation erstellt wird",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
-        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
+        "UPDATE_SUCCESS": "Ihre Benachrichtigungseinstellungen wurden erfolgreich aktualisiert",
         "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"
+        "TITLE": "Push-Benachrichtigungen",
+        "NOTE": "Aktualisieren Sie hier Ihre Push-Benachrichtigungseinstellungen",
+        "CONVERSATION_ASSIGNMENT": "Push-Benachrichtigungen senden, wenn mir ein Gespräch zugewiesen wird",
+        "CONVERSATION_CREATION": "Push-Benachrichtigungen senden, wenn eine neue Konversation startet",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
+        "HAS_ENABLED_PUSH": "Sie haben die Push-Benachrichtigung für diesen Browser aktiviert.",
+        "REQUEST_PUSH": "Push-Benachrichtigungen aktivieren"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Profilbild"
@@ -49,20 +51,20 @@
         "PLACEHOLDER": "Bitte geben Sie Ihren Namen ein, dies wird in Gesprächen angezeigt"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
-        "ERROR": "Please enter a valid display name",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "LABEL": "Anzeigename",
+        "ERROR": "Bitte geben Sie einen gültigen Anzeigenamen ein",
+        "PLACEHOLDER": "Bitte geben Sie einen Anzeigenamen ein, dieser wird in Unterhaltungen angezeigt"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "Verfügbarkeit",
         "STATUSES_LIST": [
           {
             "value": "online",
             "label": "Online"
           },
           {
-            "value": "busy",
-            "label": "Busy"
+            "value": "beschäftigt",
+            "label": "Beschäftigt"
           },
           {
             "value": "offline",
@@ -89,29 +91,29 @@
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Wechseln",
-    "CHANGE_ACCOUNTS": "Switch Account",
-    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "CHANGE_ACCOUNTS": "Benutzerkonto wechseln",
+    "SELECTOR_SUBTITLE": "Wählen Sie ein Benutzerkonto aus der folgenden Liste",
     "PROFILE_SETTINGS": "Profileinstellungen",
     "LOGOUT": "Ausloggen"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "days trial remaining.",
-    "TRAIL_BUTTON": "Buy Now"
+    "TRIAL_MESSAGE": "Tage der Testversion verbleibend.",
+    "TRAIL_BUTTON": "Jetzt kaufen"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copy",
-      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+      "BUTTON_TEXT": "Kopieren",
+      "COPY_SUCCESSFUL": "Code erfolgreich in die Zwischenablage kopiert"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Herunterladen",
-      "UPLOADING": "Uploading..."
+      "UPLOADING": "Hochladen..."
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Einreichen"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "Überprüft...",
   "SETTINGS": {
     "INBOXES": {
       "NEW_INBOX": "Add Inbox"
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Gespräche",
     "REPORTS": "Berichte",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Einstellungen",
     "HOME": "Hauptseite",
     "AGENTS": "Agenten",
@@ -133,8 +136,8 @@
     "NEW_ACCOUNT": "New Account",
     "SELECTOR_SUBTITLE": "Create a new account",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
+      "SUCCESS_MESSAGE": "Benutzerkonto erfolgreich erstellt",
+      "EXIST_MESSAGE": "Benutzerkonto existiert bereits",
       "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
     },
     "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 2267d01db..adb4a5116 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -1,9 +1,10 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Not Available",
+    "NOT_AVAILABLE": "Μη Διαθέσιμο",
     "EMAIL_ADDRESS": "Διεύθυνση Email",
     "PHONE_NUMBER": "Αριθμός τηλεφώνου",
-    "COMPANY": "Company",
+    "COPY_SUCCESSFUL": "Αντιγράφτηκε με επιτυχία στο πρόχειρο",
+    "COMPANY": "Εταιρία",
     "LOCATION": "Θέση",
     "CONVERSATION_TITLE": "Λεπτομέρειες συνομιλίας",
     "BROWSER": "Φυλλομετρητής",
@@ -32,65 +33,82 @@
       "NO_AVAILABLE_LABELS": "Δεν υπάρχουν προστεθεί ετικέτες στην συνομιλία."
     },
     "MUTE_CONTACT": "Σίγαση Συνομιλίας",
+    "UNMUTE_CONTACT": "Επαναφορά Συνομιλίας",
     "MUTED_SUCCESS": "Η συνομιλία είναι σε σίγαση (mute) για 6 ώρες",
+    "UNMUTED_SUCCESS": "Έγινε επαναφορά της συνομιλίας",
     "SEND_TRANSCRIPT": "Αποστολή μεταγραφής",
     "EDIT_LABEL": "Επεξεργασία"
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edit Contact",
-    "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "BUTTON_LABEL": "Επεξεργασία Επαφής",
+    "TITLE": "Επεξεργασία επαφής",
+    "DESC": "Επεξεργασία λεπτομερειών επαφής",
     "FORM": {
       "SUBMIT": "Καταχώρηση",
       "CANCEL": "Άκυρο",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "Avatar Επαφής"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
-        "LABEL": "Full Name"
+        "PLACEHOLDER": "Εισάγετε το πλήρες όνομα της επαφής",
+        "LABEL": "Πλήρες Όνομα"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
-        "LABEL": "Bio"
+        "PLACEHOLDER": "Βάλτε το βιογραφικό της επαφής",
+        "LABEL": "Βιογραφικό"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
+        "PLACEHOLDER": "Εισάγετε την διεύθυνση email της επαφής",
         "LABEL": "Διεύθυνση Email"
       },
       "PHONE_NUMBER": {
-        "PLACEHOLDER": "Enter the phone number of the contact",
-        "LABEL": "Phone Number"
+        "PLACEHOLDER": "Εισάγετε τον αριθμό τηλεφώνου της επαφής",
+        "LABEL": "Αριθμός Τηλεφώνου"
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
+        "PLACEHOLDER": "Εισάγετε την τοποθεσία της επαφής",
         "LABEL": "Θέση"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "Εισάγετε το όνομα της εταιρείας",
+        "LABEL": "Όνομα Εταιρείας"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "Εισάγετε το όνομα χρήστη στο Facebook",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
+          "PLACEHOLDER": "Εισάγετε το όνομα χρήστη στο Twitter",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
+          "PLACEHOLDER": "Εισάγετε το όνομα χρήστη στο LinkedIn",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
+          "PLACEHOLDER": "Εισάγετε το όνομα χρήστη στο Github",
           "LABEL": "Github"
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
-    "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "SUCCESS_MESSAGE": "Η επαφή ενημερώθηκε επιτυχώς",
+    "CONTACT_ALREADY_EXIST": "Η διεύθυνση email είναι σε χρήση από άλλη επαφή.",
+    "ERROR_MESSAGE": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση της επαφής, παρακαλώ προσπαθήστε ξανά"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Επαφές",
+    "SEARCH_BUTTON": "Αναζήτηση",
+    "SEARCH_INPUT_PLACEHOLDER": "Αναζήτηση Επαφών",
+    "LIST": {
+      "LOADING_MESSAGE": "Φόρτωση επαφών...",
+      "404": "Δεν υπάρχουν επαφές που να αντιστοιχούν με την αναζήτησή σας 🔍",
+      "TABLE_HEADER": [
+        "Όνομα",
+        "Αριθμός Τηλεφώνου",
+        "Συζητήσεις",
+        "Τελευταία επικοινωνία"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index b292e183e..e1afd1cf8 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Γεια σας! Δεν έχετε προσθέσει κάποιο κιβώτιο εισερχομένων ακόμη.",
     "NO_INBOX_2": " για να ξεκινήσετε",
     "NO_INBOX_AGENT": "Ω όχι! Φαίνεται ότι δεν είστε μέλος κάποιου κιβωτίου εισερχμένων. Απευθυνθείτε στον διαχειριστή",
+    "SEARCH_MESSAGES": "Αναζήτηση μηνυμάτων στις σινομιλίες",
+    "SEARCH": {
+      "TITLE": "Αναζήτηση μηνυμάτων",
+      "LOADING_MESSAGE": "Σύμπτυξη δεδομένων...",
+      "PLACEHOLDER": "Εισάγετε κείμενο για αναζήτηση μηνυμάτων",
+      "NO_MATCHING_RESULTS": "Δεν βρέθηκαν μηνύματα που να ταιριάζουν με τους όρους αναζήτησης."
+    },
     "CLICK_HERE": "Πατήστε εδώ",
     "LOADING_INBOXES": "Φόρτωση εισερχομένων",
     "LOADING_CONVERSATIONS": "Φόρτωση Συζητήσεων",
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index dc61201fd..335fbd2c2 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -34,9 +34,9 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Αριθμός ημερών μετά τις οποίες η συνομιλία θα επιλύεται αυτόματα, αν δεν υπάρχει δραστηριότητα",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Παρακαλώ σημειώστε την περίοδο αυτόματης επίλυσης (ελάχιστο 1 ημέρα)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Η συνέχεια της συνομιλίας με emails έχει ενεργοποιηθεί για τον λογαριασμό.",
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index a9a85ac86..8ba4d36e0 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Ενεργό",
           "DISABLED": "Ανενεργό"
         },
+        "REPLY_TIME": {
+          "TITLE": "Ορισμός Χρόνου Απάντησης",
+          "IN_A_FEW_MINUTES": "Σε μερικά λεπτά",
+          "IN_A_FEW_HOURS": "Σε μερικές ώρες",
+          "IN_A_DAY": "Σε μία ημέρα",
+          "HELP_TEXT": "Ο χρόνος απάντησης θα εμφανίζεται στο widget συνομιλίας"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Χρώμα Widget",
           "PLACEHOLDER": "Ενημερώστε το χρώμα του 'widget' που θα εμφανίζεται στους χρήστες"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Ρυθμίσεις Κιβωτίου",
       "INBOX_UPDATE_SUB_TEXT": "Ενημερώστε τις ρυθμίσεις του κιβωτίου σας",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ενεργοποιήστε ή απενεργοποιήστε την αυτόματη αντιστοίχιση των νέων συζητήσεων στους πράκτορες αυτού του κιβωτίου."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Εκ νέου εξουσιοδότηση",
+      "SUBTITLE": "Η σύνδεση Facebook έχει λήξει, παρακαλώ ξανασυνδεθείτε στο Facebook για να συνεχίσετε",
+      "MESSAGE_SUCCESS": "Επιτυχής επανασύνδεση",
+      "MESSAGE_ERROR": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 7458348cd..706197058 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Ειδοποιήσεις Email",
         "NOTE": "Ενημέρωστε την προτίμηση για ειδοποιήσεις με email εδώ",
         "CONVERSATION_ASSIGNMENT": "Να στέλνεται ειδοποίηση email όταν μια συνομιλία αντιστοιχίζεται σε μένα",
-        "CONVERSATION_CREATION": "Να στέλνεται ειδοποίηση όταν δημιουργείται μια νέα συνομιλία"
+        "CONVERSATION_CREATION": "Να στέλνεται ειδοποίηση όταν δημιουργείται μια νέα συνομιλία",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Αποστολή ειδοποίησης email όταν ένα νέο μήνυμα δημιουργείται σε συνομιλία που έχει αναληφθεί"
       },
       "API": {
         "UPDATE_SUCCESS": "Οι προτιμήσεις σας για τις ειδοποιήσεις ενημερώθηκαν",
@@ -37,6 +38,7 @@
         "NOTE": "Ενημερώστε τις ρυθμίσεις για τις push ειδοποιήσεις εδώ",
         "CONVERSATION_ASSIGNMENT": "Να ειδοποιούμαι με push όταν μια συνομιλία μου ανατείθεται",
         "CONVERSATION_CREATION": "Να ειδοποιούμαι με push όταν δημιουργείται μια νέα συνομιλία",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Αποστολή ειδοποίησης push όταν ένα νέο μήνυμα δημιουργείται σε συνομιλία που έχει αναληφθεί",
         "HAS_ENABLED_PUSH": "Έχετε ενεργοποιήσει τις ειδοποιήσεις push για αυτόν τον browser.",
         "REQUEST_PUSH": "Ενεργοποποίηση των ειδοποιήσεων push"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Συζητήσεις",
     "REPORTS": "Αναφορές",
+    "CONTACTS": "Επαφές (Beta)",
     "SETTINGS": "Ρυθμίσεις",
     "HOME": "Αρχική",
     "AGENTS": "Πράκτορες",
diff --git a/app/javascript/dashboard/i18n/locale/fa/chatlist.json b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
index f56eccd8a..b9a553efa 100644
--- a/app/javascript/dashboard/i18n/locale/fa/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
@@ -47,8 +47,8 @@
         "VALUE": "resolved"
       },
       {
-        "TEXT": "Bot",
-        "VALUE": "bot"
+        "TEXT": "ربات",
+        "VALUE": "ربات"
       }
     ],
     "ATTACHMENTS": {
@@ -70,15 +70,15 @@
       },
       "location": {
         "ICON": "ion-ios-location",
-        "CONTENT": "Location"
+        "CONTENT": "مکان"
       },
       "fallback": {
         "ICON": "ion-link",
         "CONTENT": "یک آدرس URL به اشتراک گذاشته شده"
       }
     },
-    "RECEIVED_VIA_EMAIL": "Received via email",
-    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
-    "REPLY_TO_TWEET": "Reply to this tweet"
+    "RECEIVED_VIA_EMAIL": "از طریق ایمیل دریافت شد",
+    "VIEW_TWEET_IN_TWITTER": "مشاهده توییت در توییتر",
+    "REPLY_TO_TWEET": "پاسخ به این توییت"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 2c7e982bc..03d5483b9 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -1,10 +1,11 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Not Available",
+    "NOT_AVAILABLE": "در دسترس نیست",
     "EMAIL_ADDRESS": "ایمیل",
     "PHONE_NUMBER": "شماره تلفن",
-    "COMPANY": "Company",
-    "LOCATION": "Location",
+    "COPY_SUCCESSFUL": "با موفقیت در کلیپ‌بورد کپی شد",
+    "COMPANY": "شرکت",
+    "LOCATION": "مکان",
     "CONVERSATION_TITLE": "جزئیات مکالمه",
     "BROWSER": "مرورگر",
     "OS": "سیستم عامل",
@@ -15,82 +16,99 @@
       "TITLE": "گفتگوهای قبلی"
     },
     "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
+      "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",
+        "TITLE": "برچسب‌ها برای",
+        "ACTIVE_LABELS": "برچسب‌ها اضافه شد به گفتگو",
+        "INACTIVE_LABELS": "برچسب‌های موجود در حساب‌کاربری",
+        "REMOVE": "برای پاک کردن برچسب، روی آیکون X کلیک کنید",
+        "ADD": "برای افزودن برچسب بر روی آیکون + کلیک کنید",
         "UPDATE_BUTTON": "تغییر برچسب‌ها",
         "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."
+      "NO_LABELS_TO_ADD": "هیچ برچسبی در حساب‌کاربری تعریف نشده است.",
+      "NO_AVAILABLE_LABELS": "هیچ برچسبی به این گفتگو اضافه نشده است."
     },
     "MUTE_CONTACT": "بی‌صدا کردن گفتگو",
-    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
-    "SEND_TRANSCRIPT": "Send Transcript",
+    "UNMUTE_CONTACT": "Unmute Conversation",
+    "MUTED_SUCCESS": "این گفتگو به مدت ۶ ساعت بی‌صدا است",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "SEND_TRANSCRIPT": "ارسال متن",
     "EDIT_LABEL": "ویرایش"
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edit Contact",
-    "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "BUTTON_LABEL": "ویرایش مخاطب",
+    "TITLE": "ویرایش مخاطب",
+    "DESC": "ویرایش اطلاعات مخاطب",
     "FORM": {
       "SUBMIT": "ثبت",
       "CANCEL": "انصراف",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "آواتار مخاطب"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
-        "LABEL": "Full Name"
+        "PLACEHOLDER": "نام کامل مخاطب را وارد کنید",
+        "LABEL": "نام کامل"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
-        "LABEL": "Bio"
+        "PLACEHOLDER": "بیوگرافی مخاطب را وارد کنید",
+        "LABEL": "بیوگرافی"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
+        "PLACEHOLDER": "آدرس ایمیل مخاطب را وارد کنید",
         "LABEL": "ایمیل"
       },
       "PHONE_NUMBER": {
-        "PLACEHOLDER": "Enter the phone number of the contact",
-        "LABEL": "Phone Number"
+        "PLACEHOLDER": "شماره تلفن مخاطب را وارد کنید",
+        "LABEL": "شماره تلفن"
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
-        "LABEL": "Location"
+        "PLACEHOLDER": "مکان مخاطب را وارد کنید",
+        "LABEL": "مکان"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "نام شرکت را وارد کنید",
+        "LABEL": "نام شرکت"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
-          "LABEL": "Facebook"
+          "PLACEHOLDER": "نام‌کاربری فیس‌بوک را وارد کنید",
+          "LABEL": "فیس‌بوک"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
-          "LABEL": "Twitter"
+          "PLACEHOLDER": "نام‌کاربری توییتر را وارد کنید",
+          "LABEL": "توییتر"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
-          "LABEL": "LinkedIn"
+          "PLACEHOLDER": "نام‌کاربری لینکدین را وارد کنید",
+          "LABEL": "لینکدین"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
-          "LABEL": "Github"
+          "PLACEHOLDER": "نام‌کاربری گیت‌هاب را وارد کنید",
+          "LABEL": "گیت‌هاب"
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
-    "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "SUCCESS_MESSAGE": "مخاطب با موفقیت به روز شد",
+    "CONTACT_ALREADY_EXIST": "این آدرس ایمیل برای مخاطب دیگری در حال استفاده است.",
+    "ERROR_MESSAGE": "خطایی در به‌روزرسانی مخاطب رخ داده، لطفا دوباره امتحان کنید"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "نام",
+        "شماره تلفن",
+        "گفتگوها",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 3a2f355c3..81e90896b 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -1,55 +1,62 @@
 {
   "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",
-    "CANNOT_REPLY": "You cannot reply due to",
-    "24_HOURS_WINDOW": "24 hour message window restriction",
-    "LAST_INCOMING_TWEET": "You are replying to the last incoming tweet",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
-    "DOWNLOAD": "Download",
+    "404": "لطفا یک گفتگو را از پنجره سمت چپ انتخاب کنید",
+    "NO_MESSAGE_1": "اوه اوه! به نظر می‌رسد هیچ پیامی از طرف مشتری در صندوق ورودی شما وجود ندارد.",
+    "NO_MESSAGE_2": " برای ارسال پیام به صفحه خود بروید!",
+    "NO_INBOX_1": "سلام! به نظر می‌رسد هنوز صندوق ورودی اضافه نکرده‌اید.",
+    "NO_INBOX_2": " برای شروع",
+    "NO_INBOX_AGENT": "اوه اوه! به نظر می‌رسد شما عضو هیچ صندوق ورودی نیستید. لطفا با مدیر خود تماس بگیرید",
+    "SEARCH_MESSAGES": "پیام‌ها را در گفتگوها جستجو کنید",
+    "SEARCH": {
+      "TITLE": "جستجو پیام‌ها",
+      "LOADING_MESSAGE": "درحال پردازش داده...",
+      "PLACEHOLDER": "متنی برای جستجو پیام تایپ کنید",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
+    "CLICK_HERE": "اینجا کلیک کنید",
+    "LOADING_INBOXES": "در حال بارگیری صندوق‌های ورودی",
+    "LOADING_CONVERSATIONS": "در حال بارگیری گفتگو‌ها",
+    "CANNOT_REPLY": "شما نمی‌توانید پاسخ بدهید به دلیل",
+    "24_HOURS_WINDOW": "محدودیت ۲۴ ساعته پنجره پیام",
+    "LAST_INCOMING_TWEET": "شما در حال پاسخ به آخرین توییت ورودی هستید",
+    "REPLYING_TO": "شما در حال پاسخ دادن به:",
+    "REMOVE_SELECTION": "حذف انتخاب‌شده‌ها",
+    "DOWNLOAD": "دانلود",
     "HEADER": {
-      "RESOLVE_ACTION": "Resolve",
-      "REOPEN_ACTION": "Reopen",
-      "OPEN": "More",
-      "CLOSE": "Close",
-      "DETAILS": "details"
+      "RESOLVE_ACTION": "حل شد",
+      "REOPEN_ACTION": "دوباره باز کنید",
+      "OPEN": "بیشتر",
+      "CLOSE": "بستن",
+      "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"
+      "REPLY": "پاسخ",
+      "PRIVATE_NOTE": "یادداشت خصوصی",
+      "SEND": "ارسال",
+      "CREATE": "افزودن یادداشت",
+      "TWEET": "توییت"
     },
-    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
-    "CHANGE_STATUS": "Conversation status changed",
+    "VISIBLE_TO_AGENTS": "یادداشت خصوصی: فقط برای شما و تیم شما قابل مشاهده است",
+    "CHANGE_STATUS": "وضعیت گفتگو تغییر کرد",
     "CHANGE_AGENT": "Conversation Assignee changed"
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "Send conversation transcript",
-    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "TITLE": "ارسال متن گفتگو",
+    "DESC": "یک کپی از متن گفتگو را به آدرس ایمیل مشخص شده ارسال کنید",
     "SUBMIT": "ثبت",
     "CANCEL": "انصراف",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
-    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "SEND_EMAIL_SUCCESS": "متن گفتگو با موفقیت ارسال شد",
+    "SEND_EMAIL_ERROR": "خطایی پیش آمد. لطفا دوباره امتحان کنید",
     "FORM": {
-      "SEND_TO_CONTACT": "Send the transcript to the customer",
+      "SEND_TO_CONTACT": "متن گفتگو را برای مشتری ارسال کنید",
       "SEND_TO_AGENT": "Send the transcript of the assigned agent",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "متن گفتگو را به آدرس ایمیل دیگری ارسال کنید",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
+        "PLACEHOLDER": "یک آدرس ایمیل وارد کنید",
         "ERROR": "لطفا ایمیل خود را به شکل صحیح وارد کنید"
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index fcc048611..205f69310 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -2,7 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "تنظیمات حساب",
     "SUBMIT": "تغییر تنظیمات",
-    "BACK": "Back",
+    "BACK": "بازگشت",
     "UPDATE": {
       "ERROR": "تنظیمات تغییری نکرد، دوباره امتحان کنید!",
       "SUCCESS": "تنظیمات با موفقیت اعمال شد"
@@ -24,8 +24,8 @@
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Incoming Email Domain",
-        "PLACEHOLDER": "The domain where you will receive the emails",
+        "LABEL": "دامنه ایمیل ورودی",
+        "PLACEHOLDER": "دامنه‌ای که در آن ایمیل‌ها را دریافت خواهید کرد",
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
@@ -40,7 +40,7 @@
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
-        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "اکنون می‌توانید ایمیل‌ها را در دامنه سفارشی خود دریافت کنید."
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 96829af4d..586e1bd33 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "فعال",
           "DISABLED": "غیرفعال"
         },
+        "REPLY_TIME": {
+          "TITLE": "تنظیم زمان پاسخ",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "رنگ ویجت",
           "PLACEHOLDER": "رنگی که در ویجت استفاده می‌شود را تعیین کنید"
@@ -116,7 +123,7 @@
         }
       },
       "API_CHANNEL": {
-        "TITLE": "API Channel",
+        "TITLE": "کانال API",
         "DESC": "Integrate with API channel and start supporting your customers.",
         "CHANNEL_NAME": {
           "LABEL": "عنوان کانال",
@@ -128,14 +135,14 @@
           "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
           "PLACEHOLDER": "آدرس URL وب هوک"
         },
-        "SUBMIT_BUTTON": "Create API Channel",
+        "SUBMIT_BUTTON": "ایجاد کانال API",
         "API": {
           "ERROR_MESSAGE": "We were not able to save the api channel"
         }
       },
       "EMAIL_CHANNEL": {
-        "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "TITLE": "کانال ایمیل",
+        "DESC": "صندوق ورودی ایمیل خود را ادغام کنید.",
         "CHANNEL_NAME": {
           "LABEL": "عنوان کانال",
           "PLACEHOLDER": "لطفا اسم یک کانال را وارد کنید",
@@ -146,7 +153,7 @@
           "SUBTITLE": "Email where your customers sends you support tickets",
           "PLACEHOLDER": "ایمیل"
         },
-        "SUBMIT_BUTTON": "Create Email Channel",
+        "SUBMIT_BUTTON": "ایجاد کانال ایمیل",
         "API": {
           "ERROR_MESSAGE": "We were not able to save the email channel"
         },
@@ -214,12 +221,12 @@
     },
     "TABS": {
       "SETTINGS": "تنظیمات",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "COLLABORATORS": "همکاران",
+      "CONFIGURATION": "پیکربندی"
     },
     "SETTINGS": "تنظیمات",
     "FEATURES": {
-      "LABEL": "Features",
+      "LABEL": "امکانات",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
       "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
     },
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "تنظیمات صندوق ورودی",
       "INBOX_UPDATE_SUB_TEXT": "تغییر پارامترهای صندوق ورودی",
       "AUTO_ASSIGNMENT_SUB_TEXT": "فعال کردن یا غیرفعال کردن واگذاری خودکار گفتگوها به اپراتورهای عضو این صندوق ورودی."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "احراز هویت مجدد",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index ec6d2fa2a..41fa5f85a 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -53,11 +53,11 @@
     "DELETE": {
       "BUTTON_TEXT": "حذف",
       "API": {
-        "SUCCESS_MESSAGE": "Integration deleted successfully"
+        "SUCCESS_MESSAGE": "ادغام با موفقیت حذف شد"
       }
     },
     "CONNECT": {
-      "BUTTON_TEXT": "Connect"
+      "BUTTON_TEXT": "اتصال"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
index fd53e1d63..b5aec37bb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
@@ -1,61 +1,61 @@
 {
   "LABEL_MGMT": {
-    "HEADER": "Labels",
-    "HEADER_BTN_TXT": "Add label",
-    "LOADING": "Fetching labels",
+    "HEADER": "برچسب‌ها",
+    "HEADER_BTN_TXT": "افزودن برچسب",
+    "LOADING": "درحال گرفتن برچسب‌ها",
     "SEARCH_404": "هیچ آیتمی با این مشخصات یافت نشد",
     "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
     "LIST": {
-      "404": "There are no labels available in this account.",
-      "TITLE": "Manage labels",
-      "DESC": "Labels let you group the conversations together.",
+      "404": "هیچ برچسبی در این حساب‌کاربری وجود ندارد.",
+      "TITLE": "مدیریت برچسب‌ها",
+      "DESC": "برچسب‌ها به شما اجازه می‌دهند مکالمات را با هم گروه‌بندی کنید.",
       "TABLE_HEADER": [
         "نام",
-        "Description",
-        "Color"
+        "توضیحات",
+        "رنگ"
       ]
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Label Name",
-        "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "LABEL": "نام برچسب",
+        "PLACEHOLDER": "نام برچسب",
+        "ERROR": "نام برچسب لازم است"
       },
       "DESCRIPTION": {
-        "LABEL": "Description",
-        "PLACEHOLDER": "Label Description"
+        "LABEL": "توضیحات",
+        "PLACEHOLDER": "توضیحات برچسب"
       },
       "COLOR": {
-        "LABEL": "Color"
+        "LABEL": "رنگ"
       },
       "SHOW_ON_SIDEBAR": {
-        "LABEL": "Show label on sidebar"
+        "LABEL": "نمایش برچسب در سایدبار"
       },
       "EDIT": "ویرایش",
-      "CREATE": "Create",
+      "CREATE": "ايجاد كردن",
       "DELETE": "حذف",
       "CANCEL": "انصراف"
     },
     "ADD": {
-      "TITLE": "Add label",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "افزودن برچسب",
+      "DESC": "برچسب‌ها به شما اجازه می‌دهند مکالمات را با هم گروه‌بندی کنید.",
       "API": {
-        "SUCCESS_MESSAGE": "Label added successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "برچسب با موفقیت اضافه شد",
+        "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
       }
     },
     "EDIT": {
-      "TITLE": "Edit label",
+      "TITLE": "ویرایش برچسب",
       "API": {
-        "SUCCESS_MESSAGE": "Label updated successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "برچسب با موفقیت به روز شد",
+        "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "حذف",
       "API": {
-        "SUCCESS_MESSAGE": "Label deleted successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "برچسب با موفقیت حذف شد",
+        "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
       },
       "CONFIRM": {
         "TITLE": "تاییدیه حذف",
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 99d8efab4..9b24dd3d2 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "اعلامیه‌ به ایمیل",
         "NOTE": "اینجا می‌توانید تنظیمات اعلامیه‌هایی که به ایمیل ارسال می‌شود تغییر دهید",
         "CONVERSATION_ASSIGNMENT": "هر وقت گفتگویی به من اختصاص داده شد،‌ ایمیل بفرست",
-        "CONVERSATION_CREATION": "هر وقت گفتگوی جدیدی شروع شد برای من ایمیل بفرست"
+        "CONVERSATION_CREATION": "هر وقت گفتگوی جدیدی شروع شد برای من ایمیل بفرست",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "تغییرات تنظیمات اعلامیه‌ها با موفقیت ثبت شد",
@@ -37,6 +38,7 @@
         "NOTE": "اینجا می‌توانید تنظیمات پوش نوتیفیکیشن را تغییر دهید",
         "CONVERSATION_ASSIGNMENT": "هر وقت گفتگویی به من اختصاص داده شد، برای من پوش نوتیفیکیشن بفرست",
         "CONVERSATION_CREATION": "هر وقت گفتگوی جدیدی شروع شد برای من پوش نوتیفیکیشن بفرست",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "در این مرورگر پوش نوتیفیکیشن را فعال کرده‌اید",
         "REQUEST_PUSH": "فعال کردن پوش نوتیفیکیشن"
       },
@@ -44,29 +46,29 @@
         "LABEL": "عکس پروفایل"
       },
       "NAME": {
-        "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
-        "PLACEHOLDER": "Please enter your full name"
+        "LABEL": "نام کامل شما",
+        "ERROR": "لطفا نام کامل معتبر وارد کنید",
+        "PLACEHOLDER": "لطفا نام کامل خود را وارد کنید"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
-        "ERROR": "Please enter a valid display name",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "LABEL": "نام نمایشی",
+        "ERROR": "لطفا یک نام نمایشی معتبر وارد کنید",
+        "PLACEHOLDER": "لطفا یک نام نمایشی وارد کنید، این نام در مکالمات نمایش داده می‌شود"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "در دسترس",
         "STATUSES_LIST": [
           {
-            "value": "online",
-            "label": "Online"
+            "value": "آنلاین",
+            "label": "آنلاین"
           },
           {
-            "value": "busy",
-            "label": "Busy"
+            "value": "مشغول",
+            "label": "مشغول"
           },
           {
-            "value": "offline",
-            "label": "Offline"
+            "value": "آفلاین",
+            "label": "آفلاین"
           }
         ]
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "گفتگوها",
     "REPORTS": "گزارشات",
+    "CONTACTS": "مخاطبین (آزمایشی)",
     "SETTINGS": "تنظیمات",
     "HOME": "صفحه اصلی",
     "AGENTS": "اپراتورها",
@@ -127,14 +130,14 @@
     "CANNED_RESPONSES": "پاسخ‌های آماده",
     "INTEGRATIONS": "برنامه‌های تلفیق شده",
     "ACCOUNT_SETTINGS": "تنظیمات حساب",
-    "LABELS": "Labels"
+    "LABELS": "برچسب‌ها"
   },
   "CREATE_ACCOUNT": {
-    "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "NEW_ACCOUNT": "حساب‌کاربری جدید",
+    "SELECTOR_SUBTITLE": "ایجاد حساب‌کاربری جدید",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
+      "SUCCESS_MESSAGE": "حساب‌کاربری با موفقیت ایجاد شد",
+      "EXIST_MESSAGE": "این حساب‌کاربری از قبل وجود دارد",
       "ERROR_MESSAGE": "ارتباط با سرور برقرار نشد، لطفا مجددا امتحان کنید"
     },
     "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 0e21c0d5d..684a56ee5 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Email Address",
     "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
     "CONVERSATION_TITLE": "Conversation Details",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index f8ea61643..d271c7895 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
     "NO_INBOX_2": " to get started",
     "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click here",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index fb4c71134..be76d2e50 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Color",
           "PLACEHOLDER": "Update the widget color used in widget"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index f300f5fa3..866d76cee 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
         "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created"
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
index 1c6128537..08ca5fd66 100644
--- a/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
@@ -29,9 +29,9 @@
           "PLACEHOLDER": "Veuillez entrer un nom de l'agent"
         },
         "AGENT_TYPE": {
-          "LABEL": "Type d'agent",
-          "PLACEHOLDER": "Veuillez sélectionner un type",
-          "ERROR": "Le type d'agent est requis"
+          "LABEL": "Rôle",
+          "PLACEHOLDER": "Veuillez sélectionner un rôle",
+          "ERROR": "Le rôle est requis"
         },
         "EMAIL": {
           "LABEL": "Adresse de courriel",
@@ -67,8 +67,8 @@
         },
         "AGENT_TYPE": {
           "LABEL": "Type d'agent",
-          "PLACEHOLDER": "Veuillez sélectionner un type",
-          "ERROR": "Le type d'agent est requis"
+          "PLACEHOLDER": "Veuillez sélectionner un rôle",
+          "ERROR": "Le rôle est requis"
         },
         "EMAIL": {
           "LABEL": "Adresse de courriel",
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 0bbf8ac5f..e5f8c2ad9 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Non disponible",
     "EMAIL_ADDRESS": "Adresse de courriel",
     "PHONE_NUMBER": "Numéro de téléphone",
+    "COPY_SUCCESSFUL": "Copié dans le presse-papiers avec succès",
     "COMPANY": "Société",
     "LOCATION": "Localisation",
     "CONVERSATION_TITLE": "Détails de la conversation",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "Aucune étiquette n'a été ajoutée à cette conversation."
     },
     "MUTE_CONTACT": "Mettre la conversation en sourdine",
+    "UNMUTE_CONTACT": "Réactiver le son de conversation",
     "MUTED_SUCCESS": "Cette conversation est mise en sourdine pendant 6 heures",
+    "UNMUTED_SUCCESS": "Cette conversation n'est plus muette",
     "SEND_TRANSCRIPT": "Envoyer la transcription",
     "EDIT_LABEL": "Modifier"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Contact mis à jour avec succès",
     "CONTACT_ALREADY_EXIST": "Cette adresse de courriel est déjà utilisée pour un autre contact.",
     "ERROR_MESSAGE": "Une erreur s'est produite lors de la mise à jour du contact, veuillez réessayer"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Rechercher",
+    "SEARCH_INPUT_PLACEHOLDER": "Rechercher des contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Chargement des contacts...",
+      "404": "Aucun contact ne correspond à votre recherche 🔍",
+      "TABLE_HEADER": [
+        "Nom",
+        "Numéro de téléphone",
+        "Conversations",
+        "Dernièrement contacté"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index e96709cb3..1b0e6af9e 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Oh ! On dirait que vous n'avez pas encore ajouté de boîte de réception.",
     "NO_INBOX_2": " pour commencer",
     "NO_INBOX_AGENT": "Oh Oh ! Il semble que vous ne faites parti d'aucune boîte de réception. Veuillez contacter votre administrateur",
+    "SEARCH_MESSAGES": "Rechercher des messages dans les conversations",
+    "SEARCH": {
+      "TITLE": "Rechercher des messages",
+      "LOADING_MESSAGE": "Traitement des données ...",
+      "PLACEHOLDER": "Saisissez n'importe quel texte pour rechercher des messages",
+      "NO_MATCHING_RESULTS": "Aucun message ne correspond aux paramètres de recherche."
+    },
     "CLICK_HERE": "Cliquez ici",
     "LOADING_INBOXES": "Chargement des boîtes de réception",
     "LOADING_CONVERSATIONS": "Chargement des conversations",
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index ec12da171..e0a985241 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -34,9 +34,9 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Nombre de jours après qu'un ticket soit automatiquement résolu s'il n'y a pas d'activité",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Veuillez entrer une durée de résolution automatique valide (minimum 1 jour)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuité des conversations avec les courriels est activée pour votre compte.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index a7e1ebb1c..746fdafd7 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Activé",
           "DISABLED": "Désactivé"
         },
+        "REPLY_TIME": {
+          "TITLE": "Définir le temps de réponse",
+          "IN_A_FEW_MINUTES": "En quelques minutes",
+          "IN_A_FEW_HOURS": "En quelques heures",
+          "IN_A_DAY": "En une journée",
+          "HELP_TEXT": "Ce temps de réponse sera affichée sur le widget de chat en direct"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Couleur du Widget",
           "PLACEHOLDER": "Mettre à jour la couleur utilisée dans le widget"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Paramètres de boîtes de réception",
       "INBOX_UPDATE_SUB_TEXT": "Mettre à jour les paramètres de votre boîte de réception",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activer ou désactiver l'affectation automatique de nouvelles conversations aux agents ajoutés à cette boîte de réception."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Réautoriser",
+      "SUBTITLE": "Votre connexion Facebook a expiré, veuillez reconnecter votre page Facebook pour continuer les services",
+      "MESSAGE_SUCCESS": "Reconnexion réussie",
+      "MESSAGE_ERROR": "Une erreur est survenue, veuillez réessayer"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 147629e4f..fe4a162e7 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Notifications par courriel",
         "NOTE": "Mettez à jour vos préférences de notification par courriel ici",
         "CONVERSATION_ASSIGNMENT": "Envoyer des notifications par courriel lorsqu'une conversation m'est assignée",
-        "CONVERSATION_CREATION": "Envoyer des notifications par courriel quand une nouvelle conversation est créée"
+        "CONVERSATION_CREATION": "Envoyer des notifications par courriel quand une nouvelle conversation est créée",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envoyer des notifications par courriel lorsqu'un nouveau message est créé dans une conversation assignée"
       },
       "API": {
         "UPDATE_SUCCESS": "Vos préférences de notifications ont été mises à jour avec succès",
@@ -37,6 +38,7 @@
         "NOTE": "Mettez à jour vos préférences de notification push ici",
         "CONVERSATION_ASSIGNMENT": "Envoyer des notifications push lorsqu'une conversation m'est assignée",
         "CONVERSATION_CREATION": "Envoyer des notifications push quand une nouvelle conversation est créée",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envoyer des notifications push lorsqu'un nouveau message est créé dans une conversation assignée",
         "HAS_ENABLED_PUSH": "Vous avez activé les notifications pour ce navigateur.",
         "REQUEST_PUSH": "Activer les notifications push"
       },
@@ -88,7 +90,7 @@
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "Changer",
+    "CHANGE_AVAILABILITY_STATUS": "Modifier",
     "CHANGE_ACCOUNTS": "Changer de compte",
     "SELECTOR_SUBTITLE": "Sélectionnez un compte dans la liste suivante",
     "PROFILE_SETTINGS": "Paramètres de profil",
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Rapports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Paramètres",
     "HOME": "Accueil",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 0e21c0d5d..684a56ee5 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Email Address",
     "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
     "CONVERSATION_TITLE": "Conversation Details",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index f8ea61643..d271c7895 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
     "NO_INBOX_2": " to get started",
     "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click here",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index fb4c71134..be76d2e50 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Color",
           "PLACEHOLDER": "Update the widget color used in widget"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index f300f5fa3..866d76cee 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
         "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created"
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
index 2b2358c9a..abe7eec3f 100644
--- a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
@@ -1,32 +1,32 @@
 {
   "AGENT_MGMT": {
-    "HEADER": "Agents",
-    "HEADER_BTN_TXT": "Add Agent",
-    "LOADING": "Fetching Agent List",
+    "HEADER": "Ügynökök",
+    "HEADER_BTN_TXT": "Ügynök Hozzádása",
+    "LOADING": "Ügynökök Listájának Lekérése",
     "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
     "AGENT_TYPES": {
-      "ADMINISTRATOR": "Administrator",
-      "AGENT": "Agent"
+      "ADMINISTRATOR": "Adminisztrátor",
+      "AGENT": "Ügynök"
     },
     "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",
+      "NAME": "Név",
       "EMAIL": "EMAIL",
-      "STATUS": "Status",
-      "ACTIONS": "Actions",
-      "VERIFIED": "Verified",
-      "VERIFICATION_PENDING": "Verification Pending"
+      "STATUS": "Státusz",
+      "ACTIONS": "Műveletek",
+      "VERIFIED": "Megerősített",
+      "VERIFICATION_PENDING": "Megerősítés függőben"
     },
     "ADD": {
-      "TITLE": "Add agent to your team",
-      "DESC": "You can add people who will be able to handle support for your inboxes.",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "TITLE": "Ügynök hozzáadása a csapathoz",
+      "DESC": "Olyan személyeket adhat hozzá, akik kezelni tudják majd a postafiókot.",
+      "CANCEL_BUTTON_TEXT": "Mégse",
       "FORM": {
         "NAME": {
-          "LABEL": "Agent Name",
-          "PLACEHOLDER": "Please enter a name of the agent"
+          "LABEL": "Ügynök neve",
+          "PLACEHOLDER": "Kérjük adja meg az ügynök nevét"
         },
         "AGENT_TYPE": {
           "LABEL": "Agent Type",
@@ -34,14 +34,14 @@
           "ERROR": "Agent type is required"
         },
         "EMAIL": {
-          "LABEL": "Email Address",
-          "PLACEHOLDER": "Please enter an email address of the agent"
+          "LABEL": "Email cím",
+          "PLACEHOLDER": "Kérjük adja meg az ügynök email címét"
         },
-        "SUBMIT": "Add Agent"
+        "SUBMIT": "Ügynök Hozzádása"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Agent added successfully",
-        "EXIST_MESSAGE": "Agent email already in use, Please try another email address",
+        "SUCCESS_MESSAGE": "Ügynök sikeresen hozzáadva",
+        "EXIST_MESSAGE": "Az ügynök email cím már használatban van, kérjük próbálkozzon újra másik email címmel",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       }
     },
@@ -62,8 +62,8 @@
       "TITLE": "Edit agent",
       "FORM": {
         "NAME": {
-          "LABEL": "Agent Name",
-          "PLACEHOLDER": "Please enter a name of the agent"
+          "LABEL": "Ügynök neve",
+          "PLACEHOLDER": "Kérjük adja meg az ügynök nevét"
         },
         "AGENT_TYPE": {
           "LABEL": "Agent Type",
@@ -71,8 +71,8 @@
           "ERROR": "Agent type is required"
         },
         "EMAIL": {
-          "LABEL": "Email Address",
-          "PLACEHOLDER": "Please enter an email address of the agent"
+          "LABEL": "Email cím",
+          "PLACEHOLDER": "Kérjük adja meg az ügynök email címét"
         },
         "SUBMIT": "Edit Agent"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
index bcab1dc6a..2d8e45217 100644
--- a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
@@ -12,7 +12,7 @@
       "TABLE_HEADER": [
         "Short Code",
         "Content",
-        "Actions"
+        "Műveletek"
       ]
     },
     "ADD": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index 0e21c0d5d..9d93588db 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -1,8 +1,9 @@
 {
   "CONTACT_PANEL": {
     "NOT_AVAILABLE": "Not Available",
-    "EMAIL_ADDRESS": "Email Address",
+    "EMAIL_ADDRESS": "Email cím",
     "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
     "CONVERSATION_TITLE": "Conversation Details",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit"
   },
@@ -56,7 +59,7 @@
       },
       "EMAIL_ADDRESS": {
         "PLACEHOLDER": "Enter the email address of the contact",
-        "LABEL": "Email Address"
+        "LABEL": "Email cím"
       },
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Név",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index f8ea61643..d271c7895 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
     "NO_INBOX_2": " to get started",
     "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click here",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index fb4c71134..c2dc7ea83 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Color",
           "PLACEHOLDER": "Update the widget color used in widget"
@@ -157,7 +164,7 @@
         "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",
+        "TITLE": "Ügynökök",
         "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": {
@@ -226,13 +233,19 @@
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger Script",
       "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
-      "INBOX_AGENTS": "Agents",
+      "INBOX_AGENTS": "Ügynökök",
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index 17952efd1..fac5b17de 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -16,7 +16,7 @@
         "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
         "TABLE_HEADER": [
           "Webhook endpoint",
-          "Actions"
+          "Műveletek"
         ]
       },
       "ADD": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
index b0dbe439f..306deffea 100644
--- a/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
@@ -10,7 +10,7 @@
       "TITLE": "Manage labels",
       "DESC": "Labels let you group the conversations together.",
       "TABLE_HEADER": [
-        "Name",
+        "Név",
         "Description",
         "Color"
       ]
@@ -52,16 +52,16 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Törlés",
       "API": {
         "SUCCESS_MESSAGE": "Label deleted successfully",
         "ERROR_MESSAGE": "There was an error, please try again"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "Törlés Megerősítése",
+        "MESSAGE": "Biztos abban, hogy törli ",
+        "YES": "Igen, Törlés ",
+        "NO": "Nem, Mégse "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index f300f5fa3..2ca7e30a4 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
         "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created"
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,9 +122,10 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
-    "AGENTS": "Agents",
+    "AGENTS": "Ügynökök",
     "INBOXES": "Inboxes",
     "CANNED_RESPONSES": "Canned Responses",
     "INTEGRATIONS": "Integrations",
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 1ba608aef..efa804a12 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Indirizzo email",
     "PHONE_NUMBER": "Numero di telefono",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Localizzazione",
     "CONVERSATION_TITLE": "Dettagli conversazione",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Modifica"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "nome",
+        "Phone Number",
+        "Conversazioni",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index c522baf4e..8ec1982ad 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Sembra che tu non abbia ancora aggiunto nessuna posta in arrivo.",
     "NO_INBOX_2": " per iniziare",
     "NO_INBOX_AGENT": "Uh Oh! Sembra che tu non faccia parte di nessuna casella di posta. Per favore contatta il tuo amministratore",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Clicca qui",
     "LOADING_INBOXES": "Caricamento posta in arrivo",
     "LOADING_CONVERSATIONS": "Caricamento conversazioni",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 46ddcd871..d4153e1aa 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Abilitato",
           "DISABLED": "Disabilitato"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Colore del widget",
           "PLACEHOLDER": "Aggiorna il colore del widget utilizzato nel widget"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Riautorizza",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 289bd79a0..01d848eda 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Notifiche email",
         "NOTE": "Aggiorna qui le tue preferenze di notifica email",
         "CONVERSATION_ASSIGNMENT": "Invia notifiche via email quando viene assegnata una conversazione a me",
-        "CONVERSATION_CREATION": "Invia notifiche via email quando viene creata una nuova conversazione"
+        "CONVERSATION_CREATION": "Invia notifiche via email quando viene creata una nuova conversazione",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Le preferenze per le notifiche sono state aggiornate con successo",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "Hai abilitato notifiche push per questo browser.",
         "REQUEST_PUSH": "Abilita notifiche push"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversazioni",
     "REPORTS": "Segnalazioni",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Impostazioni",
     "HOME": "Home",
     "AGENTS": "Agenti",
diff --git a/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
index 2b2358c9a..48dfaa581 100644
--- a/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
@@ -1,32 +1,32 @@
 {
   "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>",
+    "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": {
-      "ADMINISTRATOR": "Administrator",
-      "AGENT": "Agent"
+      "ADMINISTRATOR": "管理者",
+      "AGENT": "担当者"
     },
     "LIST": {
-      "404": "There are no agents associated to this account",
-      "TITLE": "Manage agents in your team",
-      "DESC": "You can add/remove agents to/in your team.",
-      "NAME": "Name",
-      "EMAIL": "EMAIL",
-      "STATUS": "Status",
-      "ACTIONS": "Actions",
-      "VERIFIED": "Verified",
-      "VERIFICATION_PENDING": "Verification Pending"
+      "404": "このアカウントに関連付けられている担当者はありません。",
+      "TITLE": "チームの担当者を管理する",
+      "DESC": "チームに担当者を追加または除外することができます。",
+      "NAME": "名前",
+      "EMAIL": "Eメール",
+      "STATUS": "状況",
+      "ACTIONS": "操作",
+      "VERIFIED": "確認済み",
+      "VERIFICATION_PENDING": "確認保留中です。"
     },
     "ADD": {
-      "TITLE": "Add agent to your team",
-      "DESC": "You can add people who will be able to handle support for your inboxes.",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "TITLE": "チームに担当者を追加",
+      "DESC": "受信トレイのサポートができる人を追加できます。",
+      "CANCEL_BUTTON_TEXT": "キャンセル",
       "FORM": {
         "NAME": {
-          "LABEL": "Agent Name",
-          "PLACEHOLDER": "Please enter a name of the agent"
+          "LABEL": "担当者名",
+          "PLACEHOLDER": "担当者の名前を入力してください"
         },
         "AGENT_TYPE": {
           "LABEL": "Agent Type",
@@ -34,36 +34,36 @@
           "ERROR": "Agent type is required"
         },
         "EMAIL": {
-          "LABEL": "Email Address",
-          "PLACEHOLDER": "Please enter an email address of the agent"
+          "LABEL": "Eメールアドレス",
+          "PLACEHOLDER": "担当者のEメールアドレスを入力してください"
         },
-        "SUBMIT": "Add Agent"
+        "SUBMIT": "担当者を追加"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Agent added successfully",
-        "EXIST_MESSAGE": "Agent email already in use, Please try another email address",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "担当者の追加が完了しました",
+        "EXIST_MESSAGE": "入力された担当者のEメールアドレスは既に使用されています。別のメールアドレスをお試しください。",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "削除",
       "API": {
-        "SUCCESS_MESSAGE": "Agent deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "担当者の削除が完了しました",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "削除の確認",
+        "MESSAGE": "削除してもよろしいですか？ ",
+        "YES": "削除する ",
+        "NO": "いいえ "
       }
     },
     "EDIT": {
-      "TITLE": "Edit agent",
+      "TITLE": "担当者の編集",
       "FORM": {
         "NAME": {
-          "LABEL": "Agent Name",
-          "PLACEHOLDER": "Please enter a name of the agent"
+          "LABEL": "担当者名",
+          "PLACEHOLDER": "担当者の名前を入力してください"
         },
         "AGENT_TYPE": {
           "LABEL": "Agent Type",
@@ -71,26 +71,26 @@
           "ERROR": "Agent type is required"
         },
         "EMAIL": {
-          "LABEL": "Email Address",
-          "PLACEHOLDER": "Please enter an email address of the agent"
+          "LABEL": "Eメールアドレス",
+          "PLACEHOLDER": "担当者のEメールアドレスを入力してください"
         },
-        "SUBMIT": "Edit Agent"
+        "SUBMIT": "担当者の編集"
       },
-      "BUTTON_TEXT": "Edit",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "BUTTON_TEXT": "編集",
+      "CANCEL_BUTTON_TEXT": "キャンセル",
       "API": {
-        "SUCCESS_MESSAGE": "Agent updated successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "担当者の情報を更新しました",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
       },
       "PASSWORD_RESET": {
-        "ADMIN_RESET_BUTTON": "Reset Password",
-        "ADMIN_SUCCESS_MESSAGE": "An email with reset password instructions has been sent to the agent",
-        "SUCCESS_MESSAGE": "Agent password reset successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ADMIN_RESET_BUTTON": "パスワードをリセットします",
+        "ADMIN_SUCCESS_MESSAGE": "担当者にパスワードをリセットする手順を記載したメールを送信しました",
+        "SUCCESS_MESSAGE": "担当者のパスワードは正常にリセットされました",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
       }
     },
     "SEARCH": {
-      "NO_RESULTS": "No agents found."
+      "NO_RESULTS": "担当者が見つかりません"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json
index bcab1dc6a..f98712139 100644
--- a/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json
@@ -1,75 +1,75 @@
 {
   "CANNED_MGMT": {
-    "HEADER": "Canned Responses",
-    "HEADER_BTN_TXT": "Add Canned Response",
-    "LOADING": "Fetching Canned Responses",
-    "SEARCH_404": "There are no items matching this query",
-    "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>",
+    "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": "There are no canned responses available in this account.",
-      "TITLE": "Manage canned responses",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
+      "404": "このアカウントには、利用可能な定型文の回答はありません",
+      "TITLE": "定型文回答を管理する",
+      "DESC": "定型文回答は、事前に設定した文章をテンプレートとし、チケットに対して迅速に返信するためのものです。",
       "TABLE_HEADER": [
-        "Short Code",
-        "Content",
-        "Actions"
+        "ショートコード",
+        "内容",
+        "操作"
       ]
     },
     "ADD": {
-      "TITLE": "Add Canned Response",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation .",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "TITLE": "定型文を追加",
+      "DESC": "定型文回答は、事前に設定した文章をテンプレートとし、会話に対して迅速に返信するためのものです。",
+      "CANCEL_BUTTON_TEXT": "キャンセル",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a shortcode",
-          "ERROR": "Short Code is required"
+          "LABEL": "ショートコード",
+          "PLACEHOLDER": "ショートコードを入力してください。",
+          "ERROR": "ショートコードは必須です"
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "LABEL": "内容",
+          "PLACEHOLDER": "内容を入力してください",
+          "ERROR": "内容は必須です"
         },
-        "SUBMIT": "Submit"
+        "SUBMIT": "送信"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response added successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "定型文回答が正常に追加されました",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Canned Response",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "TITLE": "定型文を編集",
+      "CANCEL_BUTTON_TEXT": "キャンセル",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a shortcode",
-          "ERROR": "Short Code is required"
+          "LABEL": "ショートコード",
+          "PLACEHOLDER": "ショートコードを入力してください。",
+          "ERROR": "ショートコードは必須です"
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "LABEL": "内容",
+          "PLACEHOLDER": "内容を入力してください",
+          "ERROR": "内容は必須です"
         },
-        "SUBMIT": "Submit"
+        "SUBMIT": "送信"
       },
-      "BUTTON_TEXT": "Edit",
+      "BUTTON_TEXT": "編集",
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response updated successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "定型文回答が正常に追加されました",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "削除",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "定型文回答が正常に削除されました",
+        "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "削除の確認",
+        "MESSAGE": "削除してもよろしいですか？ ",
+        "YES": "削除する ",
+        "NO": "いいえ "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ja/chatlist.json b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
index a0b31427f..205e25b17 100644
--- a/app/javascript/dashboard/i18n/locale/ja/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
@@ -1,49 +1,49 @@
 {
   "CHAT_LIST": {
-    "LOADING": "Fetching conversations",
-    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
-    "EOF": "All conversations loaded 🎉",
+    "LOADING": "会話のデータを取得しています",
+    "LOAD_MORE_CONVERSATIONS": "会話のデータをさらに読み込む",
+    "EOF": "すべての会話データが読み込まれました🎉",
     "LIST": {
-      "404": "There are no active conversations in this group."
+      "404": "このグループには有効な会話データがありません"
     },
-    "TAB_HEADING": "Conversations",
+    "TAB_HEADING": "会話データ",
     "SEARCH": {
-      "INPUT": "Search for People, Chats, Saved Replies .."
+      "INPUT": "人物、チャット、保存された返信を検索する"
     },
     "STATUS_TABS": [
       {
-        "NAME": "Open",
+        "NAME": "開く",
         "KEY": "openCount"
       },
       {
-        "NAME": "Resolved",
+        "NAME": "解決済み",
         "KEY": "allConvCount"
       }
     ],
     "ASSIGNEE_TYPE_TABS": [
       {
-        "NAME": "Mine",
+        "NAME": "自分",
         "KEY": "me",
         "COUNT_KEY": "mineCount"
       },
       {
-        "NAME": "Unassigned",
+        "NAME": "未割当",
         "KEY": "unassigned",
         "COUNT_KEY": "unAssignedCount"
       },
       {
-        "NAME": "All",
+        "NAME": "すべて",
         "KEY": "all",
         "COUNT_KEY": "allCount"
       }
     ],
     "CHAT_STATUS_ITEMS": [
       {
-        "TEXT": "Open",
+        "TEXT": "開く",
         "VALUE": "open"
       },
       {
-        "TEXT": "Resolved",
+        "TEXT": "解決済み",
         "VALUE": "resolved"
       },
       {
@@ -54,31 +54,31 @@
     "ATTACHMENTS": {
       "image": {
         "ICON": "ion-image",
-        "CONTENT": "Picture message"
+        "CONTENT": "画像メッセージ"
       },
       "audio": {
         "ICON": "ion-volume-high",
-        "CONTENT": "Audio message"
+        "CONTENT": "音声メッセージ"
       },
       "video": {
         "ICON": "ion-ios-videocam",
-        "CONTENT": "Video message"
+        "CONTENT": "ビデオ メッセージ"
       },
       "file": {
         "ICON": "ion-document",
-        "CONTENT": "File Attachment"
+        "CONTENT": "添付ファイル"
       },
       "location": {
         "ICON": "ion-ios-location",
-        "CONTENT": "Location"
+        "CONTENT": "場所"
       },
       "fallback": {
         "ICON": "ion-link",
-        "CONTENT": "has shared a url"
+        "CONTENT": "URLを共有しています"
       }
     },
-    "RECEIVED_VIA_EMAIL": "Received via email",
-    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
-    "REPLY_TO_TWEET": "Reply to this tweet"
+    "RECEIVED_VIA_EMAIL": "メールで受信しました",
+    "VIEW_TWEET_IN_TWITTER": "ツイートをTwitterで見る",
+    "REPLY_TO_TWEET": "このつぶやきに返信"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 0e21c0d5d..301bc617d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -1,96 +1,114 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Not Available",
-    "EMAIL_ADDRESS": "Email Address",
-    "PHONE_NUMBER": "Phone number",
-    "COMPANY": "Company",
-    "LOCATION": "Location",
-    "CONVERSATION_TITLE": "Conversation Details",
-    "BROWSER": "Browser",
-    "OS": "Operating System",
-    "INITIATED_FROM": "Initiated from",
-    "INITIATED_AT": "Initiated at",
+    "NOT_AVAILABLE": "利用不可",
+    "EMAIL_ADDRESS": "Eメールアドレス",
+    "PHONE_NUMBER": "電話番号",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COMPANY": "企業",
+    "LOCATION": "場所",
+    "CONVERSATION_TITLE": "会話の詳細",
+    "BROWSER": "ブラウザ",
+    "OS": "OS",
+    "INITIATED_FROM": "開始元",
+    "INITIATED_AT": "開始場所",
     "CONVERSATIONS": {
-      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
-      "TITLE": "Previous Conversations"
+      "NO_RECORDS_FOUND": "この連絡先に関連付けられている以前の会話はありません。",
+      "TITLE": "前の会話"
     },
     "CUSTOM_ATTRIBUTES": {
-      "TITLE": "Custom Attributes"
+      "TITLE": "カスタム属性"
     },
     "LABELS": {
-      "TITLE": "Conversation 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": "Couldn't update labels, try again."
+        "TITLE": "ラベル：",
+        "ACTIVE_LABELS": "会話にラベルを追加",
+        "INACTIVE_LABELS": "アカウントで利用可能なラベル名",
+        "REMOVE": "ラベルを削除するには×アイコンをクリックします",
+        "ADD": "+アイコンをクリックしてラベルを追加",
+        "UPDATE_BUTTON": "ラベルの更新",
+        "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."
+      "NO_LABELS_TO_ADD": "アカウントに定義されているラベルがありません。",
+      "NO_AVAILABLE_LABELS": "この会話に追加されたラベルはありません。"
     },
-    "MUTE_CONTACT": "Mute Conversation",
-    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
-    "SEND_TRANSCRIPT": "Send Transcript",
-    "EDIT_LABEL": "Edit"
+    "MUTE_CONTACT": "会話をミュート",
+    "UNMUTE_CONTACT": "Unmute Conversation",
+    "MUTED_SUCCESS": "この会話は6時間ミュートされています。",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "SEND_TRANSCRIPT": "会話のログを送信",
+    "EDIT_LABEL": "編集"
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edit Contact",
-    "TITLE": "Edit contact",
-    "DESC": "Edit contact details",
+    "BUTTON_LABEL": "連絡先を編集",
+    "TITLE": "連絡先を編集",
+    "DESC": "連絡先の詳細を編集",
     "FORM": {
-      "SUBMIT": "Submit",
-      "CANCEL": "Cancel",
+      "SUBMIT": "送信",
+      "CANCEL": "キャンセル",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "連絡先のアバター"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
-        "LABEL": "Full Name"
+        "PLACEHOLDER": "連絡先のフルネームを入力してください",
+        "LABEL": "フルネーム"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
-        "LABEL": "Bio"
+        "PLACEHOLDER": "連絡先のプロフィールを入力してください",
+        "LABEL": "プロフィール"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
-        "LABEL": "Email Address"
+        "PLACEHOLDER": "連絡先のEメールアドレスを入力してください",
+        "LABEL": "Eメールアドレス"
       },
       "PHONE_NUMBER": {
-        "PLACEHOLDER": "Enter the phone number of the contact",
-        "LABEL": "Phone Number"
+        "PLACEHOLDER": "連絡先の電話番号を入力してください",
+        "LABEL": "電話番号"
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
-        "LABEL": "Location"
+        "PLACEHOLDER": "連絡先の所在地を入力してください",
+        "LABEL": "場所"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "企業名を入力",
+        "LABEL": "企業名"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "Facebookのユーザー名を入力してください",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
+          "PLACEHOLDER": "Twitterのユーザー名を入力してください",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
+          "PLACEHOLDER": "LinkedIn のユーザー名を入力してください",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
+          "PLACEHOLDER": "GitHubのユーザー名を入力してください",
           "LABEL": "Github"
         }
       }
     },
-    "SUCCESS_MESSAGE": "Updated contact successfully",
-    "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
-    "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+    "SUCCESS_MESSAGE": "連絡先を正常に更新しました",
+    "CONTACT_ALREADY_EXIST": "このメールアドレスは別の連絡先に使用されています。",
+    "ERROR_MESSAGE": "連絡先の更新中にエラーが発生しました。もう一度やり直してください。"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "名前",
+        "電話番号",
+        "会話データ",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index f8ea61643..127630018 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -1,56 +1,63 @@
 {
   "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.",
+    "404": "左のリストから会話を選択してください",
+    "NO_MESSAGE_1": "おっと！受信トレイに顧客からのメッセージがないようです。",
     "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",
-    "CANNOT_REPLY": "You cannot reply due to",
+    "NO_INBOX_1": "まだ受信トレイを追加していないようです。",
+    "NO_INBOX_2": " 始めましょう",
+    "NO_INBOX_AGENT": "あなたに受信トレイが設定されていないようです。管理者に問い合わせてください。",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
+    "CLICK_HERE": "ここをクリック",
+    "LOADING_INBOXES": "受信トレイを読み込み中",
+    "LOADING_CONVERSATIONS": "会話データを読み込んでいます",
+    "CANNOT_REPLY": "以下の理由で返信できません：",
     "24_HOURS_WINDOW": "24 hour message window restriction",
-    "LAST_INCOMING_TWEET": "You are replying to the last incoming tweet",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
-    "DOWNLOAD": "Download",
+    "LAST_INCOMING_TWEET": "最新のツイートに返信しています",
+    "REPLYING_TO": "以下に返信：",
+    "REMOVE_SELECTION": "選択項目を削除",
+    "DOWNLOAD": "ダウンロード",
     "HEADER": {
-      "RESOLVE_ACTION": "Resolve",
-      "REOPEN_ACTION": "Reopen",
-      "OPEN": "More",
-      "CLOSE": "Close",
-      "DETAILS": "details"
+      "RESOLVE_ACTION": "解決する",
+      "REOPEN_ACTION": "再開する",
+      "OPEN": "もっと見る",
+      "CLOSE": "閉じる",
+      "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"
+      "MSG_INPUT": "Shift + Enter で新しい行を作成します。「/」で開始すると、定型文回答を選択できます。",
+      "PRIVATE_MSG_INPUT": "Shift + Enter で新しい行を作成します。これは担当者にのみ表示されます。"
     },
     "REPLYBOX": {
-      "REPLY": "Reply",
-      "PRIVATE_NOTE": "Private Note",
-      "SEND": "Send",
-      "CREATE": "Add Note",
-      "TWEET": "Tweet"
+      "REPLY": "返信",
+      "PRIVATE_NOTE": "非公開メモ",
+      "SEND": "送信",
+      "CREATE": "メモを追加",
+      "TWEET": "ツイート"
     },
-    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
-    "CHANGE_STATUS": "Conversation status changed",
-    "CHANGE_AGENT": "Conversation Assignee changed"
+    "VISIBLE_TO_AGENTS": "非公開設定の注意：あなたとあなたのチームのみに表示されます",
+    "CHANGE_STATUS": "会話の状態が変更されました",
+    "CHANGE_AGENT": "会話の担当者が変更されました"
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "Send conversation transcript",
-    "DESC": "Send a copy of the conversation transcript to the specified email address",
-    "SUBMIT": "Submit",
-    "CANCEL": "Cancel",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
-    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "TITLE": "会話の記録を送信",
+    "DESC": "会話記録のコピーを指定されたメールアドレスに送信する",
+    "SUBMIT": "送信",
+    "CANCEL": "キャンセル",
+    "SEND_EMAIL_SUCCESS": "チャットの記録は正常に送信されました",
+    "SEND_EMAIL_ERROR": "エラーが発生しました。もう一度お試しください。",
     "FORM": {
-      "SEND_TO_CONTACT": "Send the transcript to the customer",
-      "SEND_TO_AGENT": "Send the transcript of the assigned agent",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "SEND_TO_CONTACT": "顧客に会話の記録を転送する",
+      "SEND_TO_AGENT": "割り当てられた担当者の会話記録を送信する",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "会話の記録を別のEメールアドレスに転送する\n",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
-        "ERROR": "Please enter a valid email address"
+        "PLACEHOLDER": "Eメールアドレスを入力してください",
+        "ERROR": "正しいメールアドレスを入力してください"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 0a34afd8d..610653b8f 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -1,36 +1,36 @@
 {
   "GENERAL_SETTINGS": {
-    "TITLE": "Account settings",
-    "SUBMIT": "Update settings",
-    "BACK": "Back",
+    "TITLE": "アカウント設定",
+    "SUBMIT": "設定を更新",
+    "BACK": "戻る",
     "UPDATE": {
-      "ERROR": "Could not update settings, try again!",
-      "SUCCESS": "Successfully updated account settings"
+      "ERROR": "設定を更新できませんでした。もう一度お試しください",
+      "SUCCESS": "正常にアカウント設定を更新しました"
     },
     "FORM": {
-      "ERROR": "Please fix form errors",
+      "ERROR": "正しくフォームに入力してください",
       "GENERAL_SECTION": {
-        "TITLE": "General settings",
+        "TITLE": "全般設定",
         "NOTE": ""
       },
       "NAME": {
-        "LABEL": "Account name",
-        "PLACEHOLDER": "Your account name",
-        "ERROR": "Please enter a valid account name"
+        "LABEL": "アカウント名",
+        "PLACEHOLDER": "あなたのアカウント名",
+        "ERROR": "正しいアカウント名を入力してください"
       },
       "LANGUAGE": {
-        "LABEL": "Site language (Beta)",
-        "PLACEHOLDER": "Your account name",
+        "LABEL": "サイト言語(ベータ版)",
+        "PLACEHOLDER": "あなたのアカウント名",
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Incoming Email Domain",
-        "PLACEHOLDER": "The domain where you will receive the emails",
+        "LABEL": "受信メールドメイン",
+        "PLACEHOLDER": "メールを受信するドメイン",
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
-        "LABEL": "Support Email",
-        "PLACEHOLDER": "Your company's support email",
+        "LABEL": "サポートメール",
+        "PLACEHOLDER": "あなたの会社のサポートメール",
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
@@ -39,8 +39,8 @@
         "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
       },
       "FEATURES": {
-        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
-        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+        "INBOUND_EMAIL_ENABLED": "あなたのアカウントでは、メールでの会話が継続できるようになっています。",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "カスタムドメインでメールを受信できるようになりました。"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index fb4c71134..7454fbd8c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -1,238 +1,251 @@
 {
   "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>",
+    "HEADER": "受信トレイ",
+    "SIDEBAR_TXT": "<p><b>受信トレイ</b></p> <p>ウェブサイトと接続した場合、またはFacebookページとChatwootを接続した場合、受信トレイが作成されます。1つのChatwootアカウントにつき、受信トレイは無制限で作成することができます。</p><p><b>受信トレイ作成</b>ボタンをクリックすると、ウェブサイトまたはFacebookと接続できるようになります。</p><p> 管理画面では、受信トレイ内にあるすべての会話がひとつの場所で確認でき、会話タブにて返信することができます。</p><p> 管理画面の左パネルから受信トレイの名前をクリックすることでも、特定の会話を見ることができます。</p>",
     "LIST": {
-      "404": "There are no inboxes attached to this account."
+      "404": "このアカウントに紐付けられている受信トレイはありません。"
     },
     "CREATE_FLOW": [
       {
-        "title": "Choose Channel",
+        "title": "チャンネルを選択",
         "route": "settings_inbox_new",
-        "body": "Choose the provider you want to integrate with Chatwoot."
+        "body": "Chatwootと統合するプロバイダを選択してください。"
       },
       {
-        "title": "Create Inbox",
+        "title": "受信トレイを作成",
         "route": "settings_inboxes_page_channel",
-        "body": "Authenticate your account and create an inbox."
+        "body": "アカウントを認証し、受信トレイを作成します。"
       },
       {
-        "title": "Add Agents",
+        "title": "担当者を追加",
         "route": "settings_inboxes_add_agents",
-        "body": "Add agents to the created inbox."
+        "body": "作成した受信トレイに担当者を追加します。"
       },
       {
-        "title": "Voila!",
+        "title": "ほら、",
         "route": "settings_inbox_finish",
-        "body": "You are all set to go!"
+        "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"
+        "HELP": "PS: サインインすることで、私たちはあなたのページのメッセージにのみアクセスできます。あなたのプライベートメッセージはChatwootによってアクセスすることはできません。",
+        "CHOOSE_PAGE": "ページを選択",
+        "CHOOSE_PLACEHOLDER": "リストからページを選択",
+        "INBOX_NAME": "受信トレイ名",
+        "ADD_NAME": "受信トレイに名前をつける",
+        "PICK_NAME": "受信トレイの名前を選択",
+        "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' "
+        "HELP": "Twitterプロフィールをチャンネルとして追加するには、「Twitterでサインイン」をクリックして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",
+        "TITLE": "ウェブサイトのチャンネル",
+        "DESC": "ウェブサイトのためのチャネルを作成し、ウェブサイトウィジェットを介してあなたの顧客をサポートを開始してください。",
+        "LOADING_MESSAGE": "ウェブサイトサポートチャンネルの作成",
         "CHANNEL_AVATAR": {
-          "LABEL": "Channel Avatar"
+          "LABEL": "チャネルアバター"
         },
         "CHANNEL_NAME": {
-          "LABEL": "Website Name",
-          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+          "LABEL": "ウェブサイト名",
+          "PLACEHOLDER": "ウェブサイト名を入力してください(例：Acme Inc)"
         },
         "CHANNEL_DOMAIN": {
-          "LABEL": "Website Domain",
-          "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
+          "LABEL": "ウェブサイトのドメイン",
+          "PLACEHOLDER": "ウェブサイトのドメインを入力してください(例：acme.com)"
         },
         "CHANNEL_WELCOME_TITLE": {
-          "LABEL": "Welcome Heading",
-          "PLACEHOLDER": "Hi there !"
+          "LABEL": "冒頭の見出し",
+          "PLACEHOLDER": "こんにちは！"
         },
         "CHANNEL_WELCOME_TAGLINE": {
-          "LABEL": "Welcome Tagline",
-          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+          "LABEL": "冒頭のタグライン",
+          "PLACEHOLDER": "簡単に連絡が取れる状態です。なんでも聞いてください。フィードバックの共有も歓迎です。"
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Channel greeting message",
-          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+          "LABEL": "チャンネルグリーティングメッセージ",
+          "PLACEHOLDER": "Acme Incは通常数時間で返信します。"
         },
         "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"
+          "LABEL": "チャンネルグリーティングを有効にする",
+          "HELP_TEXT": "会話を開始したときに、ユーザーに挨拶メッセージを送信します。",
+          "ENABLED": "有効です",
+          "DISABLED": "無効です"
+        },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
         },
         "WIDGET_COLOR": {
-          "LABEL": "Widget Color",
-          "PLACEHOLDER": "Update the widget color used in widget"
+          "LABEL": "ウィジェットの色",
+          "PLACEHOLDER": "ウィジェットで使用されている色を更新"
         },
-        "SUBMIT_BUTTON": "Create inbox"
+        "SUBMIT_BUTTON": "受信トレイを作成"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/Whatsapp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or Whatsapp.",
+        "TITLE": "Twilio SMS/Whatsapp チャンネル",
+        "DESC": "Twilio を統合し、SMS または Whatsapp を介して顧客のサポートを開始します。",
         "ACCOUNT_SID": {
-          "LABEL": "Account SID",
-          "PLACEHOLDER": "Please enter your Twilio Account SID",
-          "ERROR": "This field is required"
+          "LABEL": "アカウント SID",
+          "PLACEHOLDER": "Twilio アカウント SIDを入力してください",
+          "ERROR": "このフィールドは必須項目です"
         },
         "CHANNEL_TYPE": {
-          "LABEL": "Channel Type",
-          "ERROR": "Please select your Channel Type"
+          "LABEL": "チャンネルタイプ",
+          "ERROR": "チャンネルタイプを選択してください"
         },
         "AUTH_TOKEN": {
-          "LABEL": "Auth Token",
-          "PLACEHOLDER": "Please enter your Twilio Auth Token",
-          "ERROR": "This field is required"
+          "LABEL": "認証トークン",
+          "PLACEHOLDER": "Twilio 認証トークンを入力してください",
+          "ERROR": "このフィールドは必須項目です"
         },
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "チャンネル名",
+          "PLACEHOLDER": "チャンネル名を入力してください",
+          "ERROR": "このフィールドは必須項目です"
         },
         "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."
+          "LABEL": "電話番号",
+          "PLACEHOLDER": "送信先の電話番号を入力してください。",
+          "ERROR": "正しい値を入力してください。電話番号は `+` 記号で始める必要があります。"
         },
         "API_CALLBACK": {
-          "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+          "TITLE": "コールバック URL",
+          "SUBTITLE": "Twilio のメッセージコールバックURLをここで指定する必要があります。"
         },
-        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "SUBMIT_BUTTON": "Twilio チャンネルを作成",
         "API": {
-          "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
+          "ERROR_MESSAGE": "Twilio の認証ができませんでした。もう一度やり直してください。"
         }
       },
       "API_CHANNEL": {
-        "TITLE": "API Channel",
-        "DESC": "Integrate with API channel and start supporting your customers.",
+        "TITLE": "APIチャンネル",
+        "DESC": "APIチャンネルと連携し、顧客のサポートを開始します。",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "チャンネル名",
+          "PLACEHOLDER": "チャンネル名を入力してください",
+          "ERROR": "このフィールドは必須項目です"
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "イベントのコールバックを受信するURLを設定してください。",
           "PLACEHOLDER": "Webhook URL"
         },
-        "SUBMIT_BUTTON": "Create API Channel",
+        "SUBMIT_BUTTON": "API チャンネルを作成",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the api channel"
+          "ERROR_MESSAGE": "APIチャンネルを保存できませんでした"
         }
       },
       "EMAIL_CHANNEL": {
-        "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "TITLE": "Eメールチャンネル",
+        "DESC": "メール受信トレイを連携する",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
-          "ERROR": "This field is required"
+          "LABEL": "チャンネル名",
+          "PLACEHOLDER": "チャンネル名を入力してください",
+          "ERROR": "このフィールドは必須項目です"
         },
         "EMAIL": {
-          "LABEL": "Email",
+          "LABEL": "Eメール",
           "SUBTITLE": "Email where your customers sends you support tickets",
-          "PLACEHOLDER": "Email"
+          "PLACEHOLDER": "Eメール"
         },
-        "SUBMIT_BUTTON": "Create Email Channel",
+        "SUBMIT_BUTTON": "Eメールチャンネルを作成",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the email channel"
+          "ERROR_MESSAGE": "Eメールチャンネルを保存できませんでした"
         },
-        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+        "FINISH_MESSAGE": "以下のメールアドレスにメールを転送します。"
       },
       "AUTH": {
-        "TITLE": "Channels",
+        "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": "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."
+        "TITLE": "担当者",
+        "DESC": "ここでは、新しく作成した受信トレイを管理するエージェントを追加できます。選択された担当者のみが受信トレイにアクセスできます。 この受信トレイに割り当てられていない担当者は、ログイン時にこの受信トレイ内のメッセージを表示または応答することができません。 <br> <b>PS:</b> 管理者として、すべての受信ボックスにアクセスする必要がある場合、 あなたが作成したすべての受信トレイに担当者として自分自身を追加する必要があります。"
       },
       "DETAILS": {
-        "TITLE": "Inbox Details",
-        "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
+        "TITLE": "受信トレイの詳細",
+        "DESC": "下のドロップダウンから、Chatwoot に接続する Facebook ページを選択してください。 わかりやすくするために受信トレイの名前をカスタマイズすることもできます。"
       },
       "FINISH": {
-        "TITLE": "Nailed It!",
-        "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
+        "TITLE": "ばっちりです！",
+        "DESC": "FacebookページとChatwootとの統合が正常に完了しました。次回から、あなたのページに送信された顧客からのメッセージや会話は、自動的に受信トレイに表示されます。<br>また、ウェブサイトに簡単に追加できるウィジェットスクリプトを提供しています。 一度これをあなたのウェブサイトに設定すれば、 顧客は他のツールの助けを借りずにWebサイトから直接メッセージを送信でき、Chatwoot上に会話が表示されます。 <br><br>素敵でしょ？まあ、私たちはきっとそうしますけどね:)"
       }
     },
     "DETAILS": {
-      "LOADING_FB": "Authenticating you with Facebook...",
-      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
-      "CREATING_CHANNEL": "Creating your Inbox...",
-      "TITLE": "Configure Inbox Details",
+      "LOADING_FB": "Facebook を認証中...",
+      "ERROR_FB_AUTH": "問題が発生しました。ページを更新してください...",
+      "CREATING_CHANNEL": "受信トレイを作成しています...",
+      "TITLE": "受信トレイの詳細の設定",
       "DESC": ""
     },
     "AGENTS": {
-      "BUTTON_TEXT": "Add agents",
-      "ADD_AGENTS": "Adding Agents to your Inbox..."
+      "BUTTON_TEXT": "担当者を追加",
+      "ADD_AGENTS": "受信トレイに担当者を追加しています..."
     },
     "FINISH": {
-      "TITLE": "Your Inbox is ready!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "TITLE": "受信トレイの準備ができました！",
+      "MESSAGE": "新しいチャネルを通じてお客様と交流できるようになりました。 ",
       "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."
+      "WEBSITE_SUCCESS": "ウェブサイトチャンネルの作成が正常に完了しました。以下のコードをコピーしてウェブサイトに貼り付けてください。 次回、お客様がライブチャットを使用すると、会話は自動的に受信トレイに表示されます。"
     },
-    "REAUTH": "Reauthorize",
-    "VIEW": "View",
+    "REAUTH": "再認証",
+    "VIEW": "表示",
     "EDIT": {
       "API": {
-        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
-        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
-        "ERROR_MESSAGE": "Could not update widget color. Please try again later."
+        "SUCCESS_MESSAGE": "受信トレイの設定が正常に更新されました",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "自動割り当ての更新に成功しました",
+        "ERROR_MESSAGE": "ウィジェットの色を更新できませんでした。後でもう一度お試しください"
       },
       "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "有効です",
+        "DISABLED": "無効です"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "削除",
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "削除の確認",
+        "MESSAGE": "削除してもよろしいですか？ ",
+        "YES": "削除する ",
+        "NO": "いいえ、保存しておきます "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Inbox deleted successfully",
-        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+        "SUCCESS_MESSAGE": "受信トレイの削除に成功しました",
+        "ERROR_MESSAGE": "受信箱を削除できませんでした。後でもう一度お試しください。"
       }
     },
     "TABS": {
-      "SETTINGS": "Settings",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration"
+      "SETTINGS": "設定",
+      "COLLABORATORS": "共同編集者",
+      "CONFIGURATION": "設定"
     },
-    "SETTINGS": "Settings",
+    "SETTINGS": "設定",
     "FEATURES": {
-      "LABEL": "Features",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+      "LABEL": "機能",
+      "DISPLAY_FILE_PICKER": "ウィジェットにファイルピッカーを表示する",
+      "DISPLAY_EMOJI_PICKER": "ウィジェットに絵文字ピッカーを表示する"
     },
     "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."
+      "MESSENGER_HEADING": "Messengerスクリプト",
+      "MESSENGER_SUB_HEAD": "このボタンをbodyタグの中に配置してください。",
+      "INBOX_AGENTS": "担当者",
+      "INBOX_AGENTS_SUB_TEXT": "この受信トレイから担当者を追加または削除する",
+      "UPDATE": "更新",
+      "AUTO_ASSIGNMENT": "自動割り当てを有効にする",
+      "INBOX_UPDATE_TITLE": "受信トレイの設定",
+      "INBOX_UPDATE_SUB_TEXT": "受信トレイの設定を更新する",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "この受信トレイに追加された担当者への新しい会話の自動割り当てを有効または無効にします。"
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "再認証",
+      "SUBTITLE": "Facebookの接続が期限切れになりました。サービスを継続するには、Facebookページを再接続してください。",
+      "MESSAGE_SUCCESS": "再接続に成功しました",
+      "MESSAGE_ERROR": "エラーが発生しました。もう一度お試しください。"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index 17952efd1..c458d5a42 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -1,63 +1,63 @@
 {
   "INTEGRATION_SETTINGS": {
-    "HEADER": "Integrations",
+    "HEADER": "連携",
     "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>",
+      "CONFIGURE": "設定",
+      "HEADER": "Webhookの設定",
+      "HEADER_BTN_TXT": "新しいWebhookを追加",
+      "INTEGRATION_TXT": "Webhookイベントは、Chatwootアカウントで何が起こっているかについてのリアルタイムの情報を提供します。 Webhookを使用して、SlackやGithubなどのお気に入りのアプリにイベントを伝えることができます。 設定をクリックしてWebhookを設定します。",
+      "LOADING": "添付されたWebhookを取得しています",
+      "SEARCH_404": "検索内容（クエリ）に一致する項目はありませんでした",
+      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks は、すべてのアカウントで定義可能なHTTP コールバックです。これらは、メッセージの作成などChatwoot上でのイベントをきっかけに実行されます。このアカウントでは、1つ以上のwebhookが作成できます。 <br /><br /> <b>webhook</b>を作成するには、<b>webhookを作成</b>ボタンをクリックしてください。また、作成した webhook を削除ボタンを押して削除することもできます。</p>",
       "LIST": {
-        "404": "There are no webhooks configured for this account.",
-        "TITLE": "Manage webhooks",
-        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "404": "このアカウントに紐付けされたWebフックはありません。",
+        "TITLE": "Webhookの管理",
+        "DESC": "Webhookは、事前に設定した文章をテンプレートとし、チケットに対して迅速に返信するためのものです。",
         "TABLE_HEADER": [
-          "Webhook endpoint",
-          "Actions"
+          "Webhookエンドポイント",
+          "操作"
         ]
       },
       "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.",
+        "CANCEL": "キャンセル",
+        "TITLE": "新しいWebhookを追加",
+        "DESC": "Webhookイベントは、Chatwootアカウントで何が起こっているかについてのリアルタイムの情報を提供します。コールバックを設定するには有効なURLを入力してください。",
         "FORM": {
           "END_POINT": {
             "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
+            "PLACEHOLDER": "例: https://example/api/webhook",
+            "ERROR": "有効な URL を入力してください"
           },
-          "SUBMIT": "Create webhook"
+          "SUBMIT": "Webhookを作成"
         },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "SUCCESS_MESSAGE": "Webhookの追加に成功しました",
+          "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
         }
       },
       "DELETE": {
-        "BUTTON_TEXT": "Delete",
+        "BUTTON_TEXT": "削除",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook deleted successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "SUCCESS_MESSAGE": "Webhookの削除に成功しました",
+          "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
         },
         "CONFIRM": {
-          "TITLE": "Confirm Deletion",
-          "MESSAGE": "Are you sure to delete ",
-          "YES": "Yes, Delete ",
-          "NO": "No, Keep it"
+          "TITLE": "削除の確認",
+          "MESSAGE": "削除してもよろしいですか？ ",
+          "YES": "削除する ",
+          "NO": "いいえ、保存しておきます"
         }
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "削除",
       "API": {
-        "SUCCESS_MESSAGE": "Integration deleted successfully"
+        "SUCCESS_MESSAGE": "連携が正常に削除されました"
       }
     },
     "CONNECT": {
-      "BUTTON_TEXT": "Connect"
+      "BUTTON_TEXT": "接続"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
index b0dbe439f..1a7dc5439 100644
--- a/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
@@ -1,67 +1,67 @@
 {
   "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>",
+    "HEADER": "ラベル",
+    "HEADER_BTN_TXT": "ラベルを追加",
+    "LOADING": "ラベルを取得中",
+    "SEARCH_404": "検索内容（クエリ）に一致する項目はありませんでした",
+    "SIDEBAR_TXT": "<p><b>ラベル</b> <p>ラベルは会話のカテゴリー分けや優先順位づけに便利です。サイドパネルから、会話に対してラベルを設定することができます。<br /><br />ラベルはアカウントと関連付けられ、組織内のカスタムワークフローにも利用できます。ラベルには個別の色を設定できるので、認識が容易になります。サイドバーにラベルを表示させることによって、会話を絞り込むことが簡単にできます。</p>",
     "LIST": {
-      "404": "There are no labels available in this account.",
-      "TITLE": "Manage labels",
-      "DESC": "Labels let you group the conversations together.",
+      "404": "このアカウントには利用可能なラベルがありません。",
+      "TITLE": "ラベルの管理",
+      "DESC": "ラベルを使用すると、会話をグループ化できます。",
       "TABLE_HEADER": [
-        "Name",
-        "Description",
-        "Color"
+        "名前",
+        "説明",
+        "色"
       ]
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Label Name",
-        "PLACEHOLDER": "Label name",
-        "ERROR": "Label Name is required"
+        "LABEL": "ラベル名",
+        "PLACEHOLDER": "ラベル名",
+        "ERROR": "ラベル名は必須です"
       },
       "DESCRIPTION": {
-        "LABEL": "Description",
-        "PLACEHOLDER": "Label Description"
+        "LABEL": "説明",
+        "PLACEHOLDER": "ラベルの説明"
       },
       "COLOR": {
-        "LABEL": "Color"
+        "LABEL": "色"
       },
       "SHOW_ON_SIDEBAR": {
-        "LABEL": "Show label on sidebar"
+        "LABEL": "サイドバーにラベルを表示"
       },
-      "EDIT": "Edit",
-      "CREATE": "Create",
-      "DELETE": "Delete",
-      "CANCEL": "Cancel"
+      "EDIT": "編集",
+      "CREATE": "作成",
+      "DELETE": "削除",
+      "CANCEL": "キャンセル"
     },
     "ADD": {
-      "TITLE": "Add label",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "ラベルを追加",
+      "DESC": "ラベルを使用すると、会話をグループ化できます。",
       "API": {
-        "SUCCESS_MESSAGE": "Label added successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "ラベルの追加に成功しました",
+        "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
       }
     },
     "EDIT": {
-      "TITLE": "Edit label",
+      "TITLE": "ラベルを編集",
       "API": {
-        "SUCCESS_MESSAGE": "Label updated successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "ラベルが正常に更新されました",
+        "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "削除",
       "API": {
-        "SUCCESS_MESSAGE": "Label deleted successfully",
-        "ERROR_MESSAGE": "There was an error, please try again"
+        "SUCCESS_MESSAGE": "ラベルの削除に成功しました",
+        "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "削除の確認",
+        "MESSAGE": "削除してもよろしいですか？ ",
+        "YES": "削除する ",
+        "NO": "いいえ "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ja/login.json b/app/javascript/dashboard/i18n/locale/ja/login.json
index 30f667052..3e2c8cc47 100644
--- a/app/javascript/dashboard/i18n/locale/ja/login.json
+++ b/app/javascript/dashboard/i18n/locale/ja/login.json
@@ -1,21 +1,21 @@
 {
   "LOGIN": {
-    "TITLE": "Login to Chatwoot",
+    "TITLE": "Chatwootにログイン",
     "EMAIL": {
-      "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "LABEL": "Eメール",
+      "PLACEHOLDER": "Eメール　例：someone@example.com"
     },
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password"
+      "LABEL": "パスワード",
+      "PLACEHOLDER": "パスワード"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "ログインしました",
+      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。",
+      "UNAUTH": "ユーザー名/パスワードが正しくありません。もう一度やり直してください"
     },
-    "FORGOT_PASSWORD": "Forgot your password?",
-    "CREATE_NEW_ACCOUNT": "Create new account",
-    "SUBMIT": "Login"
+    "FORGOT_PASSWORD": "パスワードをお忘れですか?",
+    "CREATE_NEW_ACCOUNT": "新しいアカウントを作成",
+    "SUBMIT": "ログイン"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/report.json b/app/javascript/dashboard/i18n/locale/ja/report.json
index 8a4d53485..f05a01d91 100644
--- a/app/javascript/dashboard/i18n/locale/ja/report.json
+++ b/app/javascript/dashboard/i18n/locale/ja/report.json
@@ -1,42 +1,42 @@
 {
   "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.",
+    "HEADER": "レポート",
+    "LOADING_CHART": "グラフデータを読み込んでいます...",
+    "NO_ENOUGH_DATA": "レポートを生成するための十分なデータポイントを受信していません。後でもう一度お試しください。",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
-        "DESC": "( Total )"
+        "NAME": "会話データ",
+        "DESC": "(合計)"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "受信メッセージ",
+        "DESC": "(合計)"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "送信メッセージ",
+        "DESC": "(合計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "NAME": "最初の応答時間",
+        "DESC": "(平均)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )"
+        "NAME": "処理時間",
+        "DESC": "(平均)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "処理件数",
+        "DESC": "(合計)"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "過去 7 日間"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "過去 30 日間"
       }
     ]
   }
diff --git a/app/javascript/dashboard/i18n/locale/ja/resetPassword.json b/app/javascript/dashboard/i18n/locale/ja/resetPassword.json
index bb678e809..62f0afdb5 100644
--- a/app/javascript/dashboard/i18n/locale/ja/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ja/resetPassword.json
@@ -1,15 +1,15 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "パスワードをリセットします",
     "EMAIL": {
-      "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "LABEL": "Eメール",
+      "PLACEHOLDER": "メールアドレスを入力してください。",
+      "ERROR": "有効なメールアドレスを入力してください"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "パスワードリセット用のリンクがあなたのメールアドレス宛に送信されました",
+      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "送信"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
index 94a3fd2e1..d58e41027 100644
--- a/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
@@ -1,20 +1,20 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "新しいパスワードを設定",
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "LABEL": "パスワード",
+      "PLACEHOLDER": "パスワード",
+      "ERROR": "パスワードが短すぎます"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "LABEL": "パスワードの確認",
+      "PLACEHOLDER": "パスワードの確認",
+      "ERROR": "パスワードが一致しません"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "パスワードは正常に変更されました",
+      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "送信"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index f300f5fa3..8254cffc8 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -1,148 +1,151 @@
 {
   "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",
+    "LINK": "プロフィール設定",
+    "TITLE": "プロフィール設定",
+    "BTN_TEXT": "プロフィールを更新",
+    "AFTER_EMAIL_CHANGED": "あなたのプロフィールは正常に更新されました。ログイン情報（パスワード等）が変更されたため、再度ログインしてください。",
     "FORM": {
-      "AVATAR": "Profile Image",
-      "ERROR": "Please fix form errors",
-      "REMOVE_IMAGE": "Remove",
-      "UPLOAD_IMAGE": "Upload image",
-      "UPDATE_IMAGE": "Update image",
+      "AVATAR": "プロフィール画像",
+      "ERROR": "正しくフォームに入力してください",
+      "REMOVE_IMAGE": "削除",
+      "UPLOAD_IMAGE": "画像をアップロード",
+      "UPDATE_IMAGE": "画像を更新",
       "PROFILE_SECTION": {
-        "TITLE": "Profile",
-        "NOTE": "Your email address is your identity and is used to log in."
+        "TITLE": "プロフィール",
+        "NOTE": "あなたのメールアドレスはあなたのIDであり、ログインに使用されます。"
       },
       "PASSWORD_SECTION": {
-        "TITLE": "Password",
-        "NOTE": "Updating your password would reset your logins in multiple devices."
+        "TITLE": "パスワード",
+        "NOTE": "パスワードを更新すると、複数のデバイスでログインがリセットされます。"
       },
       "ACCESS_TOKEN": {
-        "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "TITLE": "アクセストークン",
+        "NOTE": "このトークンは、API 連携を構築する場合に利用します。"
       },
       "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"
+        "TITLE": "Eメール通知",
+        "NOTE": "メール通知設定を更新する",
+        "CONVERSATION_ASSIGNMENT": "会話が自分に割り当てられたときにメールで通知を送信する",
+        "CONVERSATION_CREATION": "新しい会話が作成されたときにメールで通知を送信する",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "割り当てられた会話で新しいメッセージが作成されたときにメールで通知を送信します"
       },
       "API": {
-        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
-        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+        "UPDATE_SUCCESS": "通知設定が正常に更新されました",
+        "UPDATE_ERROR": "設定の更新中にエラーが発生しました。もう一度やり直して下さい。"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Push Notifications",
-        "NOTE": "Update your push notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
-        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
-        "REQUEST_PUSH": "Enable push notifications"
+        "TITLE": "プッシュ通知",
+        "NOTE": "ここでプッシュ通知の設定を更新します",
+        "CONVERSATION_ASSIGNMENT": "会話が自分に割り当てられたときにプッシュ通知を送信する",
+        "CONVERSATION_CREATION": "新しい会話が作成されたときにプッシュ通知を送信する",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "割り当てられた会話で新しいメッセージが作成されたときにプッシュ通知を送信する",
+        "HAS_ENABLED_PUSH": "このブラウザーでプッシュ通知を有効にしました。",
+        "REQUEST_PUSH": "プッシュ通知を有効にする"
       },
       "PROFILE_IMAGE": {
-        "LABEL": "Profile Image"
+        "LABEL": "プロフィール画像"
       },
       "NAME": {
-        "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
-        "PLACEHOLDER": "Please enter your full name"
+        "LABEL": "あなたのフルネーム",
+        "ERROR": "有効な氏名を入力してください",
+        "PLACEHOLDER": "氏名を入力してください。"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
-        "ERROR": "Please enter a valid display name",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "LABEL": "表示名",
+        "ERROR": "有効な表示名を入力してください",
+        "PLACEHOLDER": "表示名を入力してください。これは会話に表示されます。"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "利用可能期間",
         "STATUSES_LIST": [
           {
-            "value": "online",
-            "label": "Online"
+            "value": "オンライン",
+            "label": "オンライン"
           },
           {
-            "value": "busy",
-            "label": "Busy"
+            "value": "取り込み中",
+            "label": "取り込み中"
           },
           {
-            "value": "offline",
-            "label": "Offline"
+            "value": "オフライン",
+            "label": "オフライン"
           }
         ]
       },
       "EMAIL": {
-        "LABEL": "Your email address",
-        "ERROR": "Please enter a valid email address",
-        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+        "LABEL": "あなたのメールアドレス",
+        "ERROR": "正しいメールアドレスを入力してください",
+        "PLACEHOLDER": "メールアドレスを入力してください。これは会話に表示されます"
       },
       "PASSWORD": {
-        "LABEL": "Password",
-        "ERROR": "Please enter a password of length 6 or more",
-        "PLACEHOLDER": "Please enter a new password"
+        "LABEL": "パスワード",
+        "ERROR": "6文字以上のパスワードを入力してください",
+        "PLACEHOLDER": "新しいパスワードを入力してください"
       },
       "PASSWORD_CONFIRMATION": {
-        "LABEL": "Confirm new password",
-        "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your password"
+        "LABEL": "パスワードの確認",
+        "ERROR": "パスワードは一致している必要があります",
+        "PLACEHOLDER": "パスワードを再入力してください"
       }
     }
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Change",
-    "CHANGE_ACCOUNTS": "Switch Account",
-    "SELECTOR_SUBTITLE": "Select an account from the following list",
-    "PROFILE_SETTINGS": "Profile Settings",
-    "LOGOUT": "Logout"
+    "CHANGE_ACCOUNTS": "アカウントの切り替え",
+    "SELECTOR_SUBTITLE": "次のリストからアカウントを選択してください",
+    "PROFILE_SETTINGS": "プロフィール設定",
+    "LOGOUT": "ログアウト"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "days trial remaining.",
-    "TRAIL_BUTTON": "Buy Now"
+    "TRIAL_MESSAGE": "日、トライアル期間が残っています。",
+    "TRAIL_BUTTON": "今すぐ購入"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copy",
-      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+      "BUTTON_TEXT": "コピー",
+      "COPY_SUCCESSFUL": "コードが正常にクリップボードにコピーされました"
     },
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
-      "UPLOADING": "Uploading..."
+      "DOWNLOAD": "ダウンロード",
+      "UPLOADING": "アップロード中..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "送信"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "確認中...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Add Inbox"
+      "NEW_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"
+    "CONVERSATIONS": "会話データ",
+    "REPORTS": "レポート",
+    "CONTACTS": "Contacts (Beta)",
+    "SETTINGS": "設定",
+    "HOME": "ホーム",
+    "AGENTS": "担当者",
+    "INBOXES": "受信トレイ",
+    "CANNED_RESPONSES": "定型文",
+    "INTEGRATIONS": "連携",
+    "ACCOUNT_SETTINGS": "アカウント設定",
+    "LABELS": "ラベル"
   },
   "CREATE_ACCOUNT": {
-    "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "NEW_ACCOUNT": "新規アカウント",
+    "SELECTOR_SUBTITLE": "新しいアカウントを作成",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "アカウントが正常に作成されました",
+      "EXIST_MESSAGE": "アカウントはすでに存在します",
+      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Account Name",
-        "PLACEHOLDER": "Wayne Enterprises"
+        "LABEL": "アカウント名",
+        "PLACEHOLDER": "Wayne Enterprise"
       },
-      "SUBMIT": "Submit"
+      "SUBMIT": "送信"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/signup.json b/app/javascript/dashboard/i18n/locale/ja/signup.json
index e52705224..41f66684d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ja/signup.json
@@ -1,32 +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>",
+    "TRY_WOOT": "アカウントを登録",
+    "TITLE": "登録",
+    "TERMS_ACCEPT": "サインアップすることで、 <a href=\"https://www.chatwoot.com/terms\">T & C</a> および <a href=\"https://www.chatwoot.com/privacy-policy\">プライバシー ポリシー</a> に同意したことになります。",
     "ACCOUNT_NAME": {
-      "LABEL": "Account Name",
-      "PLACEHOLDER": "Wayne Enterprises",
-      "ERROR": "Account Name is too short"
+      "LABEL": "アカウント名",
+      "PLACEHOLDER": "Wayne Enterprise",
+      "ERROR": "アカウント名が短すぎます"
     },
     "EMAIL": {
-      "LABEL": "Email",
-      "PLACEHOLDER": "bruce@wayne.enterprises",
-      "ERROR": "Email is invalid"
+      "LABEL": "Eメール",
+      "PLACEHOLDER": "bruce@wayne.companies",
+      "ERROR": "Eメールアドレスが無効です"
     },
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "LABEL": "パスワード",
+      "PLACEHOLDER": "パスワード",
+      "ERROR": "パスワードが短すぎます"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "パスワードの確認",
+      "PLACEHOLDER": "パスワードの確認",
+      "ERROR": "パスワードが一致しません"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "登録に成功しました",
+      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "送信"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/webhooks.json b/app/javascript/dashboard/i18n/locale/ja/webhooks.json
index 347c96893..9fd9002a5 100644
--- a/app/javascript/dashboard/i18n/locale/ja/webhooks.json
+++ b/app/javascript/dashboard/i18n/locale/ja/webhooks.json
@@ -1,5 +1,5 @@
 {
   "WEBHOOKS_SETTINGS": {
-    "HEADER": "Webhook Settings"
+    "HEADER": "Webhook設定"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 0e21c0d5d..684a56ee5 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Email Address",
     "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
     "CONVERSATION_TITLE": "Conversation Details",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index f8ea61643..d271c7895 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
     "NO_INBOX_2": " to get started",
     "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click here",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index fb4c71134..be76d2e50 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Color",
           "PLACEHOLDER": "Update the widget color used in widget"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index f300f5fa3..866d76cee 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
         "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created"
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index ce683b9b0..3813af8ab 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "ഇമെയിൽ വിലാസം",
     "PHONE_NUMBER": "ഫോൺ നമ്പർ",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "സ്ഥാനം",
     "CONVERSATION_TITLE": "സംഭാഷണ വിശദാംശങ്ങൾ",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "ഈ സംഭാഷണത്തിലേക്ക് ലേബലുകളൊന്നും ചേർത്തിട്ടില്ല."
     },
     "MUTE_CONTACT": "സംഭാഷണം ഒച്ചയിലാതാക്കുക",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "ഈ സംഭാഷണം 6 മണിക്കൂർ നിശബ്ദമാക്കി",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "ട്രാൻസ്ക്രിപ്റ്റ് അയയ്ക്കുക",
     "EDIT_LABEL": "എഡിറ്റുചെയ്യുക"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "പേര്",
+        "Phone Number",
+        "സംഭാഷണങ്ങൾ",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index 1661cd72d..7dc31aaf1 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "നിങ്ങൾ ഇത് വരെ ഇൻബോക്സുകൾ ഒന്നും സ്രഷ്ടിച്ചിട്ടില്ലെന്നു തോന്നുന്നു.",
     "NO_INBOX_2": " ആരംഭിക്കുന്നതിന്",
     "NO_INBOX_AGENT": "നിങ്ങൾ ഏതെങ്കിലും ഇൻ‌ബോക്സിന്റെ ഭാഗമല്ലെന്ന് തോന്നുന്നു. നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "ഇവിടെ ക്ലിക്കു ചെയ്യുക",
     "LOADING_INBOXES": "ഇൻ‌ബോക്സുകൾ‌ ലോഡു ചെയ്യുന്നു",
     "LOADING_CONVERSATIONS": "സംഭാഷണങ്ങൾ ലോഡു ചെയ്യുന്നു",
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 1d3e2e0ef..d77369076 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
           "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "വിജറ്റ് നിറം",
           "PLACEHOLDER": "വിജറ്റിൽ ഉപയോഗിച്ച വിജറ്റ് നിറം അപ്‌ഡേറ്റ് ചെയ്യുക"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "പുതിയ സംഭാഷണങ്ങളിൽ ലഭ്യമായ ഏജന്റുമാരുടെ ഓട്ടോമാറ്റിക് അസൈൻമെന്റ് പ്രാപ്തമാക്കുകയോ അപ്രാപ്തമാക്കുകയോ ചെയ്യുക"
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "വീണ്ടും അംഗീകാരം നൽകുക",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 2db22a48a..84e346dc2 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "ഇമെയിൽ അറിയിപ്പുകൾ",
         "NOTE": "നിങ്ങളുടെ ഇമെയിൽ അറിയിപ്പ് മുൻ‌ഗണനകൾ ഇവിടെ അപ്‌ഡേറ്റു ചെയ്യുക",
         "CONVERSATION_ASSIGNMENT": "ഒരു സംഭാഷണം എനിക്ക് നിയോഗിക്കുമ്പോൾ ഇമെയിൽ അറിയിപ്പുകൾ അയയ്‌ക്കുക",
-        "CONVERSATION_CREATION": "ഒരു പുതിയ സംഭാഷണം സൃഷ്ടിക്കുമ്പോൾ ഇമെയിൽ അറിയിപ്പുകൾ അയയ്ക്കുക"
+        "CONVERSATION_CREATION": "ഒരു പുതിയ സംഭാഷണം സൃഷ്ടിക്കുമ്പോൾ ഇമെയിൽ അറിയിപ്പുകൾ അയയ്ക്കുക",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
     "REPORTS": "റിപ്പോർട്ടുകൾ",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "ക്രമീകരണങ്ങൾ",
     "HOME": "ഹോം",
     "AGENTS": "ഏജന്റുമാർ",
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 49706871b..2f4a189ac 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Uw e-mailadres",
     "PHONE_NUMBER": "Telefoon nummer",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Locatie",
     "CONVERSATION_TITLE": "Gesprekdetails",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Bewerken"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Naam",
+        "Phone Number",
+        "Gesprekken",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index ccdde5159..95ef401ff 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Het lijkt erop dat je nog geen postvakken hebt toegevoegd.",
     "NO_INBOX_2": " om te beginnen",
     "NO_INBOX_AGENT": "Oh Oh! Het lijkt erop dat u geen deel uitmaakt van een inbox. Neem contact op met uw beheerder",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Klik hier",
     "LOADING_INBOXES": "Inboxen laden",
     "LOADING_CONVERSATIONS": "Conversaties laden",
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 94f50906f..9866d0ca7 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Ingeschakeld",
           "DISABLED": "Uitgeschakeld"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Kleur van widget",
           "PLACEHOLDER": "Update de widget kleur gebruikt in widget"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Instellingen Postvak In",
       "INBOX_UPDATE_SUB_TEXT": "Update uw inbox instellingen",
       "AUTO_ASSIGNMENT_SUB_TEXT": "In- of uitschakelen van de automatische toewijzing van nieuwe gesprekken aan de agenten die aan deze inbox zijn toegevoegd."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Autoriseer",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "Er is een fout opgetreden, probeer het opnieuw"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 2ae98e3b3..46d329e2b 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "E-mail notificaties",
         "NOTE": "Update hier uw e-mailvoorkeuren",
         "CONVERSATION_ASSIGNMENT": "E-mailberichten verzenden wanneer een gesprek aan mij is toegewezen",
-        "CONVERSATION_CREATION": "E-mailberichten verzenden wanneer een nieuw gesprek is gemaakt"
+        "CONVERSATION_CREATION": "E-mailberichten verzenden wanneer een nieuw gesprek is gemaakt",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Uw notificatie-instellingen zijn succesvol bijgewerkt",
@@ -37,6 +38,7 @@
         "NOTE": "Werk je pushberichtvoorkeuren hier bij",
         "CONVERSATION_ASSIGNMENT": "Stuur pushberichten wanneer een gesprek aan mij is toegewezen",
         "CONVERSATION_CREATION": "Stuur pushberichten wanneer een nieuw gesprek is aangemaakt",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "Je hebt pushberichten voor deze browser ingeschakeld.",
         "REQUEST_PUSH": "Pushberichten inschakelen"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Gesprekken",
     "REPORTS": "Rapporten",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Instellingen",
     "HOME": "Startpagina",
     "AGENTS": "Medewerkers",
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 375fb521c..f0cfd8b4d 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Adres e-mail",
     "PHONE_NUMBER": "Numer telefonu",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Lokalizacja",
     "CONVERSATION_TITLE": "Szczegóły konwersacji",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edytuj"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Nazwisko",
+        "Phone Number",
+        "Rozmowy",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 84a59fd47..7164daf55 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Wygląda na to, że nie dodałeś jeszcze żadnej skrzynki odbiorczej.",
     "NO_INBOX_2": " rozpocząć",
     "NO_INBOX_AGENT": "Uh Oh! Wygląda na to, że nie jesteś częścią żadnej skrzynki odbiorczej. Skontaktuj się z administratorem",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Kliknij tutaj",
     "LOADING_INBOXES": "Ładowanie skrzynek odbiorczych",
     "LOADING_CONVERSATIONS": "Ładowanie konwersacji",
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index 1aebf1077..e0e75818c 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Włączone",
           "DISABLED": "Wyłączone"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Kolor widżetu",
           "PLACEHOLDER": "Aktualizuj kolor widżetu używany w widżecie"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Ponowna autoryzacja",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 1693e37d4..ddfc196de 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -26,7 +26,8 @@
         "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"
+        "CONVERSATION_CREATION": "Wysyłaj powiadomienia e-mail po utworzeniu nowej rozmowy",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -105,7 +107,7 @@
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Pobierz",
-      "UPLOADING": "Uploading..."
+      "UPLOADING": "Przesyłanie..."
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Prześlij"
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Rozmowy",
     "REPORTS": "Raporty",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Ustawienia",
     "HOME": "Home",
     "AGENTS": "Agenci",
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 2f6ee407a..152a45377 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Endereço de e-mail",
     "PHONE_NUMBER": "Número de telefone",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Local:",
     "CONVERSATION_TITLE": "Detalhes da conversa",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Alterar"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Nome:",
+        "Phone Number",
+        "Conversas",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 22ab5291e..a69447def 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Parece que você não adicionou nenhuma caixa de entrada ainda.",
     "NO_INBOX_2": " para começar",
     "NO_INBOX_AGENT": "Uh Oh! Parece que você não faz parte de nenhuma caixa de entrada. Por favor, contate seu administrador",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Clique aqui",
     "LOADING_INBOXES": "Carregando caixas de entrada",
     "LOADING_CONVERSATIONS": "Carregando conversas",
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index b78055f84..61b129c86 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Ativado",
           "DISABLED": "Desabilitado"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Cor do widget",
           "PLACEHOLDER": "Atualizar a cor do widget usada no widget"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Configurações da Caixa de Entrada",
       "INBOX_UPDATE_SUB_TEXT": "Atualize suas configurações da caixa de entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ativar ou desativar a atribuição automática de novas conversas aos agentes adicionados a essa caixa de entrada."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reautorizar",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index ae7be9ae0..4762c031f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -26,7 +26,8 @@
         "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"
+        "CONVERSATION_CREATION": "Enviar notificações por email quando uma nova conversa é criada",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversas",
     "REPORTS": "relatórios",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Confirgurações",
     "HOME": "Home",
     "AGENTS": "agentes",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index fcd2a1888..48f3dbc39 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Endereço de e-mail",
     "PHONE_NUMBER": "Número de telefone",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Localização",
     "CONVERSATION_TITLE": "Detalhes da conversa",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "Não há rótulos adicionados a esta conversa."
     },
     "MUTE_CONTACT": "Silenciar a conversa",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "Esta conversa está silenciada por 6 horas",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Enviar Transcrição",
     "EDIT_LABEL": "Alterar"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Nome",
+        "Phone Number",
+        "Conversas",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index ac66df597..40b4cb233 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Parece que você não adicionou nenhuma caixa de entrada ainda.",
     "NO_INBOX_2": " para começar",
     "NO_INBOX_AGENT": "Uh Oh! Parece que você não faz parte de nenhuma caixa de entrada. Por favor, contate seu administrador",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Clique aqui",
     "LOADING_INBOXES": "Carregando caixas de entrada",
     "LOADING_CONVERSATIONS": "Carregando conversas",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 79ab038ca..200fef1bd 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Ativado",
           "DISABLED": "Desativado"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Cor do Widget",
           "PLACEHOLDER": "Atualize a cor do widget"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Configurações da Caixa de entrada",
       "INBOX_UPDATE_SUB_TEXT": "Atualize suas configurações de caixa de entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ativar ou desativar a atribuição automática de novas conversas aos agentes adicionados a essa caixa de entrada."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reautorizar",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "Ocorreu um erro, por favor tente novamente"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index fd322753a..6b82d5e8d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -26,7 +26,8 @@
         "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 for atribuída a mim",
-        "CONVERSATION_CREATION": "Enviar notificações por email quando uma nova conversa for criada"
+        "CONVERSATION_CREATION": "Enviar notificações por email quando uma nova conversa for criada",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Suas preferências de notificação foram atualizadas com sucesso",
@@ -37,6 +38,7 @@
         "NOTE": "Atualize suas preferências de notificação Push aqui",
         "CONVERSATION_ASSIGNMENT": "Enviar notificações push quando uma conversa é atribuída a mim",
         "CONVERSATION_CREATION": "Enviar notificações push quando uma nova conversa é criada",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "Você ativou push para este navegador.",
         "REQUEST_PUSH": "Habilitar notificações push"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversas",
     "REPORTS": "Relatórios",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Confirgurações",
     "HOME": "Principal",
     "AGENTS": "Agentes",
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index 7311cd8f3..8664123ae 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Adresa Email",
     "PHONE_NUMBER": "Număr de telefon",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Locaţie",
     "CONVERSATION_TITLE": "Detalii conversație",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "Nu există etichete adăugate la această conversație."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Editare"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Nume",
+        "Phone Number",
+        "Conversații",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index 3dbdd886b..fee47db39 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Se pare că nu ai adăugat încă nici o căsuță poștală.",
     "NO_INBOX_2": " pentru a începe",
     "NO_INBOX_AGENT": "Uh Oh! Se pare că nu faci parte din nici o căsuță de e-mail. Te rugăm să contactezi administratorul",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click aici",
     "LOADING_INBOXES": "Încărcare mesaje primite",
     "LOADING_CONVERSATIONS": "Încărcare conversații",
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 17e3c3832..d2a5df46e 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Activat",
           "DISABLED": "Dezactivat"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Culoare widget",
           "PLACEHOLDER": "Actualizează culoarea folosită în widget"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Setări Inbox",
       "INBOX_UPDATE_SUB_TEXT": "Actualizează setările de inbox",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activează sau dezactivează atribuirea automată a conversațiilor noi la agenții adăugați la această căsuță poștală."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reautorizează",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "A apărut o eroare, încercați din nou"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index c35110a7a..980bf7449 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Notificări prin e-mail",
         "NOTE": "Actualizați preferințele de notificare prin e-mail aici",
         "CONVERSATION_ASSIGNMENT": "Trimite notificări prin e-mail atunci când o conversație îmi este atribuită",
-        "CONVERSATION_CREATION": "Trimite notificări prin e-mail atunci când o conversație nouă este creată"
+        "CONVERSATION_CREATION": "Trimite notificări prin e-mail atunci când o conversație nouă este creată",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Preferințele de notificare sunt actualizate cu succes",
@@ -37,6 +38,7 @@
         "NOTE": "Actualizați preferințele de notificare push aici",
         "CONVERSATION_ASSIGNMENT": "Trimite notificări push atunci când o conversație îmi este atribuită",
         "CONVERSATION_CREATION": "Trimite notificări push atunci când o conversație nouă este creată",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "Ați activat apăsarea pentru acest browser.",
         "REQUEST_PUSH": "Activează notificările push"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversații",
     "REPORTS": "Rapoarte",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Setări",
     "HOME": "Acasa",
     "AGENTS": "Agenți",
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index 1aec00cdf..9109d9767 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Недоступен",
     "EMAIL_ADDRESS": "Email",
     "PHONE_NUMBER": "Номер телефона",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Компания",
     "LOCATION": "Местоположение",
     "CONVERSATION_TITLE": "Детали диалога",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "У диалога больше нет категорий."
     },
     "MUTE_CONTACT": "Заглушить диалог",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "Этот диалог заглушен на 6 часов",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Отправить субтитры",
     "EDIT_LABEL": "Редактировать"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Контакт успешно обновлен",
     "CONTACT_ALREADY_EXIST": "Этот адрес электронной почты используется для другого контакта.",
     "ERROR_MESSAGE": "При сохранении настроек произошла ошибка, пожалуйста, попробуйте еще раз"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Имя",
+        "Номер телефона",
+        "Диалоги",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 318fbcce0..a61fcab56 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Хола! Похоже, вы еще не добавили ни одного источника.",
     "NO_INBOX_2": " для начала",
     "NO_INBOX_AGENT": "Ой! Похоже, вы не добавлены ни к одному источнику сообщений. Обратитесь к администратору",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Нажмите здесь",
     "LOADING_INBOXES": "Загружаем источники",
     "LOADING_CONVERSATIONS": "Загрузка диалогов",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 9a1a9cf07..96908846e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Включено",
           "DISABLED": "Выключено"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Цвет виджета",
           "PLACEHOLDER": "Изменить цвет виджета"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Настройки источника",
       "INBOX_UPDATE_SUB_TEXT": "Изменить настройки источника",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Включить или отключить автоматическое назначение новых разговоров к агентам, добавленным к этому источнику."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Войти заново",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "Произошла ошибка, попробуйте еще раз"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index ca64801e3..e3fdba3f5 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Уведомления",
         "NOTE": "Настраивайте email уведомления здесь",
         "CONVERSATION_ASSIGNMENT": "Отправлять email уведомление, когда мне назначен диалог",
-        "CONVERSATION_CREATION": "Отправлять email уведомление, когда новый диалог создан"
+        "CONVERSATION_CREATION": "Отправлять email уведомление, когда новый диалог создан",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Настройки уведомлений сохранены",
@@ -37,6 +38,7 @@
         "NOTE": "Редактируйте настройки push-уведомлений здесь",
         "CONVERSATION_ASSIGNMENT": "Отправлять push уведомление при назначении мне диалога",
         "CONVERSATION_CREATION": "Отправлять push уведомление, когда новый диалог создан",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "Вы включили push уведомления для этого браузера.",
         "REQUEST_PUSH": "Включить push-уведомления"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Диалоги",
     "REPORTS": "Отчёты",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Настройки",
     "HOME": "Главная",
     "AGENTS": "Операторы",
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index 0e21c0d5d..684a56ee5 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Email Address",
     "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
     "CONVERSATION_TITLE": "Conversation Details",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index f8ea61643..d271c7895 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
     "NO_INBOX_2": " to get started",
     "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click here",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index fb4c71134..be76d2e50 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Color",
           "PLACEHOLDER": "Update the widget color used in widget"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index f300f5fa3..866d76cee 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
         "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created"
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index 5c0d2f639..3c7eae9c2 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "E-postadress",
     "PHONE_NUMBER": "Telefonnummer",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Plats",
     "CONVERSATION_TITLE": "Konversation Detaljer",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Redigera"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Namn",
+        "Phone Number",
+        "Konversationer",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 632596c82..b2d5d9b91 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Ser ut som om du inte har lagt till några inkorgar än.",
     "NO_INBOX_2": " att komma igång",
     "NO_INBOX_AGENT": "Oh Oh! Ser ut som om du inte är en del av någon inkorg. Kontakta administratören",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Klicka här",
     "LOADING_INBOXES": "Laddar inkorgar",
     "LOADING_CONVERSATIONS": "Laddar konversationer",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index ac1a84f8b..efa6a0a2d 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Aktiverad",
           "DISABLED": "Inaktiverad"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget färg",
           "PLACEHOLDER": "Uppdatera widgetens färg som används i widget"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Återauktorisera",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 23a0908c4..4e2ad7b97 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -26,7 +26,8 @@
         "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"
+        "CONVERSATION_CREATION": "Skicka e-postmeddelanden när en ny konversation skapas",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Konversationer",
     "REPORTS": "Rapporter",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Inställningar",
     "HOME": "Home",
     "AGENTS": "Agenter",
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index 12a045732..50402054a 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "ஈ-மெயில் முகவரி",
     "PHONE_NUMBER": "தொலைபேசி எண்",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "இருப்பிடம்",
     "CONVERSATION_TITLE": "உரையாடல் விவரங்கள்",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "திருத்து"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "பெயர்",
+        "Phone Number",
+        "உரையாடல்கள்",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index 9c3443e3b..8c2a58f5b 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "அடடே! நீங்கள் இதுவரை எந்த இன்பாக்ஸையும் சேர்க்கவில்லை.",
     "NO_INBOX_2": " தொடங்குவதற்கு",
     "NO_INBOX_AGENT": "அட டா! நீங்கள் எந்த இன்பாக்ஸின் பகுதியும் இல்லை என்று தெரிகிறது. உங்கள் நிர்வாகியைத் தொடர்பு கொள்ளவும்",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "இங்கே கிளிக் செய்யவும்",
     "LOADING_INBOXES": "இன்பாக்ஸை ஏற்றுகிறது",
     "LOADING_CONVERSATIONS": "மேலும் உரையாடல்களை ஏற்றுகிறோம்",
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index c83e6db51..483ce4597 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "இயக்கப்பட்டது",
           "DISABLED": "முடக்கப்பட்டது"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "விட்ஜெட் நிறம்",
           "PLACEHOLDER": "விட்ஜெட்டில் பயன்படுத்தப்படும் விட்ஜெட் நிறத்தைப் புதுப்பிக்கவும்"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "இன்பாக்ஸ் அமைப்புகள்",
       "INBOX_UPDATE_SUB_TEXT": "உங்கள் இன்பாக்ஸ் அமைப்புகளைப் புதுப்பிக்கவும்",
       "AUTO_ASSIGNMENT_SUB_TEXT": "இந்த இன்பாக்ஸில் சேர்க்கப்பட்ட ஏஜென்ட்களுக்கு புதிய உரையாடல்களின் தானியங்கி ஒதுக்கீட்டை இயக்கவும் அல்லது முடக்கவும்."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "மறு அங்கீகாரம்",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index b208da409..529eae574 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "ஈமெயில் வழியான அறிவிப்புகள்",
         "NOTE": "உங்கள் ஈமெயில் வழியான அறிவிப்பு தொடர்பான விருப்பங்களை இங்கே புதுப்பிக்கவும்",
         "CONVERSATION_ASSIGNMENT": "ஒரு உரையாடல் எனக்கு ஒதுக்கப்பட்டால் ஈமெயிலில் அறிவிப்புகளை அனுப்பவும்",
-        "CONVERSATION_CREATION": "புதிய உரையாடல் உருவாக்கப்படும்போது ஈ-மெயிலில் அறிவிப்புகளை அனுப்பவும்"
+        "CONVERSATION_CREATION": "புதிய உரையாடல் உருவாக்கப்படும்போது ஈ-மெயிலில் அறிவிப்புகளை அனுப்பவும்",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "உங்களின் அறிவிப்பு விருப்பத்தேர்வுகள் வெற்றிகரமாக புதுப்பிக்கப்பட்டன",
@@ -37,6 +38,7 @@
         "NOTE": "உங்கள் புஷ் அறிவிப்பு விருப்பங்களை இங்கே புதுப்பிக்கவும்",
         "CONVERSATION_ASSIGNMENT": "ஒரு உரையாடல் எனக்கு ஒதுக்கப்படும் போது புஷ் அறிவிப்புகளை அனுப்பவும்",
         "CONVERSATION_CREATION": "புதிய உரையாடல் உருவாக்கப்படும்போது புஷ் அறிவிப்புகளை அனுப்பவும்",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "இந்த பிரௌசருக்கான புஷ் அறிவிப்புகளை இயக்கியுள்ளீர்கள்.",
         "REQUEST_PUSH": "புஷ் அறிவிப்புகளை இயக்கு"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "உரையாடல்கள்",
     "REPORTS": "அறிக்கைகள்",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "அமைப்புகள்",
     "HOME": "முகப்பு",
     "AGENTS": "ஏஜென்ட்கள்",
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index 1f8cb5c50..d7b2c0b97 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "ไม่พร้อมใช้งาน",
     "EMAIL_ADDRESS": "ที่อยู่อีเมล์",
     "PHONE_NUMBER": "หมายเลขโทรศัพท์",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "บริษัท",
     "LOCATION": "สถานที่",
     "CONVERSATION_TITLE": "รายละเอียดการสนทนา",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "ไม่มีป้ายกำกับที่เพิ่มให้การสนทนานี้"
     },
     "MUTE_CONTACT": "ระงับการสนทนา",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "การสนทนานี้ถูกระงับ 6 ชั่วโมง",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "ส่งประวัติเเชท",
     "EDIT_LABEL": "เเก้ไข"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "อัพเดทเนื้อหาเสร็จสิ้น",
     "CONTACT_ALREADY_EXIST": "อีเมล์นี้ถูกใช้ในผู้ติดต่อคนอื่นเเล้ว",
     "ERROR_MESSAGE": "มีปัญหาในการอัพเดทผู้ติดต่อ กรุณาลองใหม่อีกครั้ง"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "ชื่อ",
+        "หมายเลขโทรศัพท์",
+        "การสนทนา",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index c33ddee62..98a5f70a3 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "โฮล่า! ดูเหมือนว่าคุณยังไม่ได้เพิ่มกล่องจดหมายเลยนะ",
     "NO_INBOX_2": " ที่จะเริ่มต้น",
     "NO_INBOX_AGENT": "เอ่อโอ้! ดูเหมือนว่าคุณไม่ได้เป็นส่วนหนึ่งของกล่องจดหมายใด ๆ โปรดติดต่อผู้ดูแลระบบของคุณ",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "กดที่นี้",
     "LOADING_INBOXES": "กำลังโหลดกล่องข้อความ",
     "LOADING_CONVERSATIONS": "กำลังโหลดการสนทนา",
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 7c0619041..9db51e980 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "เปิด",
           "DISABLED": "ปิด"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "สีของวิดเจ็ต",
           "PLACEHOLDER": "อัพเดทสีที่ใช้ในวิดเจ็ต"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 74dba3a40..d88e4e183 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
         "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created"
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "การสนทนา",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "พนักงาน",
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 0e21c0d5d..684a56ee5 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Email Address",
     "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Location",
     "CONVERSATION_TITLE": "Conversation Details",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index f8ea61643..d271c7895 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
     "NO_INBOX_2": " to get started",
     "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click here",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index fb4c71134..be76d2e50 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Color",
           "PLACEHOLDER": "Update the widget color used in widget"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index f300f5fa3..866d76cee 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Email Notifications",
         "NOTE": "Update your email notification preferences here",
         "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created"
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Conversations",
     "REPORTS": "Reports",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Settings",
     "HOME": "Home",
     "AGENTS": "Agents",
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 1299e1463..e4e336b8c 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "Адреса електронної пошти",
     "PHONE_NUMBER": "Номер телефону",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "Місцезнаходження",
     "CONVERSATION_TITLE": "Деталі бесіди",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Редагувати"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Ім'я",
+        "Phone Number",
+        "Бесіди",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 04606b412..fd268d0f0 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Галас! Схоже, ви ще не додали скриньк.",
     "NO_INBOX_2": " для початку",
     "NO_INBOX_AGENT": "Ой! Схоже, ви не маєте доступу до скриньки \"Вхідні\". Будь ласка, зверніться до адміністратора",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Натисніть тут",
     "LOADING_INBOXES": "Завантаження скриньок",
     "LOADING_CONVERSATIONS": "Завантаження бесід",
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 187e04cbc..1a58f82bd 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Увімкнено",
           "DISABLED": "Вимкнено"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Колір віджета",
           "PLACEHOLDER": "Оновити колір віджета"
@@ -233,6 +240,12 @@
       "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."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Повторна авторизація",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index f7ce7d81b..301cf2d1b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Сповіщення електронною поштою",
         "NOTE": "Тут оновлюються налаштування повідомлень електронною поштою",
         "CONVERSATION_ASSIGNMENT": "Надсилати сповіщення коли бесіду призначають мені",
-        "CONVERSATION_CREATION": "Надсилати сповіщення при створенні нової бесіди"
+        "CONVERSATION_CREATION": "Надсилати сповіщення при створенні нової бесіди",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Налаштування сповіщень для вашого акаунту оновлено успішно",
@@ -37,6 +38,7 @@
         "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",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Бесіди",
     "REPORTS": "Звіти",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Налаштування",
     "HOME": "Головна",
     "AGENTS": "Агенти",
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 18ee5b808..30eb94cd5 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Không có sẵn",
     "EMAIL_ADDRESS": "Địa chỉ email",
     "PHONE_NUMBER": "Số điện thoại",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Công ty",
     "LOCATION": "Vị trí",
     "CONVERSATION_TITLE": "Chi tiết của cuộc trò chuyện",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "Không có nhãn nào được thêm vào cuộc trò chuyện này."
     },
     "MUTE_CONTACT": "Tắt tiếng cuộc trò chuyện",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "Cuộc trò chuyện này bị tắt tiếng trong 6 giờ",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Gửi bản ghi",
     "EDIT_LABEL": "Chỉnh sửa"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Đã cập nhật liên hệ thành công",
     "CONTACT_ALREADY_EXIST": "Địa chỉ email này đang được sử dụng cho một liên hệ khác.",
     "ERROR_MESSAGE": "Đã xảy ra lỗi khi cập nhật địa chỉ liên hệ, vui lòng thử lại"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "Tên",
+        "Số điện thoại",
+        "Các cuộc hội thoại",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index e6eb0622c..7d291078d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "Hola! Có vẻ như bạn chưa thêm bất kỳ hộp thư đến nào.",
     "NO_INBOX_2": " để bắt đầu",
     "NO_INBOX_AGENT": "Uh Oh! Có vẻ như bạn không thuộc bất kỳ hộp thư đến nào. Vui lòng liên hệ với quản trị viên của bạn",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "Click vào đây",
     "LOADING_INBOXES": "Đang tải hộp thư đến",
     "LOADING_CONVERSATIONS": "Đang tải cuộc trò chuyện",
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 562b3b5ee..4f3416ced 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "Bật",
           "DISABLED": "Không bật"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Màu tiện ích",
           "PLACEHOLDER": "Cập nhật màu tiện ích con được sử dụng trong tiện ích con"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "Cài đặt Hộp thư đến",
       "INBOX_UPDATE_SUB_TEXT": "Cập nhật cài đặt hộp thư đến của bạn",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Bật hoặc tắt tính năng tự động gán các cuộc hội thoại mới cho các tác nhân được thêm vào hộp thư đến này."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Ủy quyền lại",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "Đã có lỗi, vui lòng thử lại"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index bab577dd5..37b26bff6 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -10,7 +10,7 @@
       "LOADING": "Đang tải về các webhooks",
       "SEARCH_404": "Không có kết quả nào được tìm thấy",
       "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhook là các lệnh gọi lại HTTP có thể được xác định cho mọi tài khoản. Chúng được kích hoạt bởi các sự kiện như tạo tin nhắn trong Chatwoot. Bạn có thể tạo nhiều webhook cho tài khoản này. <br /><br /> Để tạo một <b>webhook</b>, click vào <b>Tạo mới</b>. Bạn cũng có thể xóa bất kỳ webhook hiện có nào bằng cách nhấp vào nút Xóa.</p>",
-      "LIST": { 
+      "LIST": {
         "404": "Không có webhook nào được định cấu hình cho tài khoản này.",
         "TITLE": "Quản lý webhooks",
         "DESC": "Webhook là các mẫu trả lời được xác định trước có thể được sử dụng để nhanh chóng gửi câu trả lời cho vé",
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 0a6be1f87..c5a55e94b 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "Thông Báo Email",
         "NOTE": "Cập nhật tùy chọn thông báo qua email của bạn tại đây",
         "CONVERSATION_ASSIGNMENT": "Gửi thông báo qua email khi cuộc trò chuyện được chỉ định cho tôi",
-        "CONVERSATION_CREATION": "Gửi thông báo qua email khi cuộc trò chuyện mới được tạo"
+        "CONVERSATION_CREATION": "Gửi thông báo qua email khi cuộc trò chuyện mới được tạo",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Tùy chọn thông báo của bạn đã được cập nhật thành công",
@@ -37,6 +38,7 @@
         "NOTE": "Cập nhật tùy chọn thông báo của bạn tại đây",
         "CONVERSATION_ASSIGNMENT": "Gửi thông báo khi cuộc trò chuyện được chỉ định cho tôi",
         "CONVERSATION_CREATION": "Gửi thông báo khi cuộc trò chuyện mới được tạo",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "Bạn đã bật tính năng thông báo cho trình duyệt này.",
         "REQUEST_PUSH": "Bật thông báo"
       },
@@ -120,11 +122,12 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Cuộc trò chuyện",
     "REPORTS": "Báo cáo",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "Cài Đặt",
     "HOME": "Trang Chủ",
     "AGENTS": "Đại lý",
     "INBOXES": "Hộp thư đến",
-    "CANNED_RESPONSES": "Canned Responses",
+    "CANNED_RESPONSES": "Thư mẫu phẩn hồi",
     "INTEGRATIONS": "Tích hợp",
     "ACCOUNT_SETTINGS": "Cài Đặt Tài Khoản",
     "LABELS": "Nhãn"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index f1115bfba..cc1360e9f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "电子邮件地址",
     "PHONE_NUMBER": "电话号码",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "位置",
     "CONVERSATION_TITLE": "对话详情",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "没有标签添加到此对话。"
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "编辑"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "Updated contact successfully",
     "CONTACT_ALREADY_EXIST": "This email address is in use for another contact.",
     "ERROR_MESSAGE": "There was an error updating the contact, please try again"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "姓名：",
+        "Phone Number",
+        "会话",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index f34ef7328..bc565e376 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "看来你还没有添加任何收件箱。",
     "NO_INBOX_2": " 开始吧",
     "NO_INBOX_AGENT": "看起来您还没有分配到收件箱。请联系您的管理员",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "点击这里",
     "LOADING_INBOXES": "正在加载收件箱",
     "LOADING_CONVERSATIONS": "加载更多对话",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 3de55f306..9f750d3d3 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "已启用",
           "DISABLED": "已禁用"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "窗口小部件颜色",
           "PLACEHOLDER": "更新小部件中使用的部件颜色"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "收件箱设置",
       "INBOX_UPDATE_SUB_TEXT": "更新收件箱设置",
       "AUTO_ASSIGNMENT_SUB_TEXT": "启用或禁用添加到此收件箱的代理人自动分配新的会话。"
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "重新授权",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "出现错误，请重试"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 3d998f821..10b5875f6 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "电子邮件通知",
         "NOTE": "在此更新您的电子邮件通知设置",
         "CONVERSATION_ASSIGNMENT": "当对话分配给我时发送电子邮件通知",
-        "CONVERSATION_CREATION": "当对话分配给我时发送电子邮件通知"
+        "CONVERSATION_CREATION": "当对话分配给我时发送电子邮件通知",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "您的通知设置已成功更新",
@@ -37,6 +38,7 @@
         "NOTE": "在此更新您的电子邮件通知设置",
         "CONVERSATION_ASSIGNMENT": "当对话被分配给我时发送推送通知",
         "CONVERSATION_CREATION": "创建新对话时发送推送通知",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "您已启用此浏览器的推送。",
         "REQUEST_PUSH": "启用推送通知"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "会话",
     "REPORTS": "报告",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "设置",
     "HOME": "首页",
     "AGENTS": "客服代理们",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 080281d04..ab6e04a5b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -3,6 +3,7 @@
     "NOT_AVAILABLE": "Not Available",
     "EMAIL_ADDRESS": "電子信箱地址",
     "PHONE_NUMBER": "電話號碼",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
     "COMPANY": "Company",
     "LOCATION": "位置",
     "CONVERSATION_TITLE": "對話詳情",
@@ -32,7 +33,9 @@
       "NO_AVAILABLE_LABELS": "没有標籤建立到此對話。"
     },
     "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "編輯"
   },
@@ -92,5 +95,20 @@
     "SUCCESS_MESSAGE": "成功更新聯絡人資訊",
     "CONTACT_ALREADY_EXIST": "這個電子信箱已經被其他聯絡人使用了。",
     "ERROR_MESSAGE": "更新聯絡人資訊發生錯誤，請重試"
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "TABLE_HEADER": [
+        "姓名：",
+        "聯絡人電話",
+        "會話",
+        "Last Contacted"
+      ]
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index feece22b5..5a6ae25da 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -6,6 +6,13 @@
     "NO_INBOX_1": "看來你還没有建立任何收件匣。",
     "NO_INBOX_2": " 開始吧",
     "NO_INBOX_AGENT": "看起來您還没有分配到收件匣。請聯繫您的管理員",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "There are no messages matching the search parameters."
+    },
     "CLICK_HERE": "點擊這裡",
     "LOADING_INBOXES": "正在加載收件匣",
     "LOADING_CONVERSATIONS": "加載更多對話",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index f0c7c509d..ce0266185 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -73,6 +73,13 @@
           "ENABLED": "已啟用",
           "DISABLED": "已停用"
         },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
         "WIDGET_COLOR": {
           "LABEL": "視窗小元件顏色",
           "PLACEHOLDER": "更新小元件中使用的元件顏色"
@@ -233,6 +240,12 @@
       "INBOX_UPDATE_TITLE": "收件匣設定",
       "INBOX_UPDATE_SUB_TEXT": "更新收件匣設定",
       "AUTO_ASSIGNMENT_SUB_TEXT": "啟用或停用建立到此收件匣的代理人自動分配新的會話。"
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "重新授權",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "出現錯誤，請重試"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 41e23efdc..c9240a4f6 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -26,7 +26,8 @@
         "TITLE": "電子信箱通知",
         "NOTE": "在此更新您的電子信箱通知設定",
         "CONVERSATION_ASSIGNMENT": "當對話分配給我時發送電子信箱通知",
-        "CONVERSATION_CREATION": "當對話分配給我時發送電子信箱通知"
+        "CONVERSATION_CREATION": "當對話分配給我時發送電子信箱通知",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "您的通知設定已成功更新",
@@ -37,6 +38,7 @@
         "NOTE": "在此更新您的電子信箱通知設定",
         "CONVERSATION_ASSIGNMENT": "當對話被分配給我時發送推送通知",
         "CONVERSATION_CREATION": "建立新對話時發送推送通知",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
         "HAS_ENABLED_PUSH": "您已啟用此瀏覽器的推送。",
         "REQUEST_PUSH": "啟用推送通知"
       },
@@ -120,6 +122,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "會話",
     "REPORTS": "報表",
+    "CONTACTS": "Contacts (Beta)",
     "SETTINGS": "設定",
     "HOME": "首頁",
     "AGENTS": "客服代理們",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index 4a09f4893..d683bddc7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -25,7 +25,7 @@
             {{ $t('GENERAL_SETTINGS.FORM.LANGUAGE.LABEL') }}
             <select v-model="locale">
               <option
-                v-for="lang in enabledLanguages"
+                v-for="lang in languagesSortedByCode"
                 :key="lang.iso_639_1_code"
                 :value="lang.iso_639_1_code"
               >
@@ -132,7 +132,12 @@ export default {
       getAccount: 'accounts/getAccount',
       uiFlags: 'accounts/getUIFlags',
     }),
-
+    languagesSortedByCode() {
+      const enabledLanguages = [...this.enabledLanguages];
+      return enabledLanguages.sort((l1, l2) =>
+        l1.iso_639_1_code.localeCompare(l2.iso_639_1_code)
+      );
+    },
     isUpdating() {
       return this.uiFlags.isUpdating;
     },
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 62342979a..1e1009394 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -8,12 +8,16 @@
       "SUBMIT": "إرسال"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "متاح",
-    "ARE_AVAILABLE": "متاح",
-    "OTHERS_ARE_AVAILABLE": "وآخرون متاحون",
-    "AND": "و"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "عرض الرسائل الجديدة",
     "CLOSE_MESSAGES_BUTTON": "أغلق"
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index 497dc7cff..6ce3f2a5a 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -2,26 +2,30 @@
   "COMPONENTS": {
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descarrega",
-      "UPLOADING": "Uploading..."
+      "UPLOADING": "S'està carregant..."
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Envia"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "Estem en línia",
+    "OFFLINE": "Estem fora de línia"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Normalment responem en pocs minuts",
+    "IN_A_FEW_HOURS": "Normalment responem en poques hores",
+    "IN_A_DAY": "Normalment respon en un dia"
+  },
+  "START_CONVERSATION": "Inicia la conversa",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
+    "VIEW_MESSAGES_BUTTON": "Veure missatges nous",
     "CLOSE_MESSAGES_BUTTON": "Tanca"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "Xateja amb nosaltres"
   },
-  "POWERED_BY": "Powered by Chatwoot",
+  "POWERED_BY": "Desenvolupat per Chatwoot",
   "EMAIL_PLACEHOLDER": "Introduïu el correu electrònic",
-  "CHAT_PLACEHOLDER": "Type your message"
+  "CHAT_PLACEHOLDER": "Escriu el missatge"
 }
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index 1ee459db3..dc24a2a85 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Odeslat"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Zavřít"
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index 45ffcc28f..e56a43a8a 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Submit"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close"
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index f0585420c..7f53a0730 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Καταχώρηση"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "είναι διαθέσιμος",
-    "ARE_AVAILABLE": "είναι διαθέσιμοι",
-    "OTHERS_ARE_AVAILABLE": "άλλοι είναι διαθέσιμοι",
-    "AND": "και"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "Είμαστε online",
+    "OFFLINE": "Είμαστε offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Τυπικά έχετε απάντηση σε μερικά λεπτά",
+    "IN_A_FEW_HOURS": "Τυπικά έχετε απάντηση σε μερικές σε μερικές ώρες",
+    "IN_A_DAY": "Τυπικά έχετε απάντηση σε μία ημέρα"
+  },
+  "START_CONVERSATION": "Έναρξη Συνομιλίας",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Δείτε τα νέα μηνύματα",
     "CLOSE_MESSAGES_BUTTON": "Κλείσιμο"
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index 9e1359733..63cdfa601 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -8,18 +8,22 @@
       "SUBMIT": "Enviar"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "está disponible",
-    "ARE_AVAILABLE": "están disponibles",
-    "OTHERS_ARE_AVAILABLE": "otros están disponibles",
-    "AND": "y"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "Estamos en línea",
+    "OFFLINE": "Estamos fuera de línea"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Normalmente responde en unos minutos",
+    "IN_A_FEW_HOURS": "Normalmente responde en unas pocas horas",
+    "IN_A_DAY": "Normalmente responde en un día"
+  },
+  "START_CONVERSATION": "Iniciar conversación",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver nuevos mensajes",
     "CLOSE_MESSAGES_BUTTON": "Cerrar"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "Chatea con nosotros"
   },
   "POWERED_BY": "Desarrollado por Chatwoot",
   "EMAIL_PLACEHOLDER": "Por favor ingrese su email",
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 16b139da1..116d34012 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -8,18 +8,22 @@
       "SUBMIT": "ثبت"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "آنلاین است",
-    "ARE_AVAILABLE": "آنلاین هستند",
-    "OTHERS_ARE_AVAILABLE": "دیگر آنلاین هستند",
-    "AND": "و"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "ما آنلاین هستیم",
+    "OFFLINE": "ما آفلاین هستیم"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "شروع گفتگو",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
-    "CLOSE_MESSAGES_BUTTON": "Close"
+    "VIEW_MESSAGES_BUTTON": "مشاهده پیام‌های جدید",
+    "CLOSE_MESSAGES_BUTTON": "بستن"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "با ما گفتگو کنید"
   },
   "POWERED_BY": "قدرت یافته از چت ووت",
   "EMAIL_PLACEHOLDER": "لطفا ایمیل خود را وارد کنید",
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index 45ffcc28f..e56a43a8a 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Submit"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close"
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index aaeb5be4c..e4b3e108e 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Envoyer"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "est disponible",
-    "ARE_AVAILABLE": "sont disponibles",
-    "OTHERS_ARE_AVAILABLE": "d'autres sont disponibles",
-    "AND": "et"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "Nous sommes en ligne",
+    "OFFLINE": "Nous sommes hors ligne"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Répond généralement en quelques minutes",
+    "IN_A_FEW_HOURS": "Répond généralement en quelques heures",
+    "IN_A_DAY": "Répond généralement dans la journée"
+  },
+  "START_CONVERSATION": "Démarrer la conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Voir les nouveaux messages",
     "CLOSE_MESSAGES_BUTTON": "Fermer"
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index 45ffcc28f..e56a43a8a 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Submit"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close"
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index 45ffcc28f..e56a43a8a 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Submit"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close"
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index d2e03fe2d..87dc6e2fd 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Invia"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "è disponibile",
-    "ARE_AVAILABLE": "sono disponibili",
-    "OTHERS_ARE_AVAILABLE": "altri sono disponibili",
-    "AND": "e"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Chiudi"
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index 45ffcc28f..83fb40849 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -1,27 +1,31 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
-      "UPLOADING": "Uploading..."
+      "DOWNLOAD": "ダウンロード",
+      "UPLOADING": "アップロード中..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "送信"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
-    "CLOSE_MESSAGES_BUTTON": "Close"
+    "VIEW_MESSAGES_BUTTON": "新しいメッセージを見る",
+    "CLOSE_MESSAGES_BUTTON": "閉じる"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "チャットをする"
   },
   "POWERED_BY": "Powered by Chatwoot",
-  "EMAIL_PLACEHOLDER": "Please enter your email",
-  "CHAT_PLACEHOLDER": "Type your message"
+  "EMAIL_PLACEHOLDER": "メールアドレスを入力してください。",
+  "CHAT_PLACEHOLDER": "メッセージを入力してください。"
 }
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index 45ffcc28f..e56a43a8a 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Submit"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close"
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index 6fd81aa1a..88da7ce5c 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -8,12 +8,16 @@
       "SUBMIT": "സമർപ്പിക്കുക"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "പുതിയ സന്ദേശങ്ങൾ കാണുക",
     "CLOSE_MESSAGES_BUTTON": "അടയ്ക്കുക"
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index 40c5df7b1..9b95adea0 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Bevestigen"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is beschikbaar",
-    "ARE_AVAILABLE": "zijn beschikbaar",
-    "OTHERS_ARE_AVAILABLE": "andere zijn beschikbaar",
-    "AND": "en"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Bekijk nieuwe berichten",
     "CLOSE_MESSAGES_BUTTON": "Sluiten"
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index 3cfcdbc33..5eb448a1f 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -8,12 +8,16 @@
       "SUBMIT": "submeter"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "FECHAR"
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 4706b5c53..eff1ee1ac 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Enviar"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "está disponível",
-    "ARE_AVAILABLE": "estão disponíveis",
-    "OTHERS_ARE_AVAILABLE": "outros estão disponíveis",
-    "AND": "e"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver novas mensagens",
     "CLOSE_MESSAGES_BUTTON": "Fechar"
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index 9e1e2784e..5d11613b7 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Trimite"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "este disponibil",
-    "ARE_AVAILABLE": "sunt disponibile",
-    "OTHERS_ARE_AVAILABLE": "altele sunt disponibile",
-    "AND": "şi"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Vezi mesajele noi",
     "CLOSE_MESSAGES_BUTTON": "Închide"
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index 4468b9189..84ea91f37 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Отправить"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "в сети",
-    "ARE_AVAILABLE": "в сети",
-    "OTHERS_ARE_AVAILABLE": "другие операторы в сети",
-    "AND": "и"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Посмотреть новые сообщения",
     "CLOSE_MESSAGES_BUTTON": "Закрыть"
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index 45ffcc28f..e56a43a8a 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Submit"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close"
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index fd5d83b08..d8ab65457 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Skicka"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Stäng"
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index d556493ca..c0c8b1dbb 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -8,12 +8,16 @@
       "SUBMIT": "சமர்பிக்கவும்"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "இருக்கிறார்",
-    "ARE_AVAILABLE": "இருக்கிறார்கள்",
-    "OTHERS_ARE_AVAILABLE": "மற்றவர்களும் இருக்கிறார்கள்",
-    "AND": "மற்றும்"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "மூடு"
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index c3ca175f0..f7c79934f 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -8,12 +8,16 @@
       "SUBMIT": "ส่ง"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "ปิด"
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index 45ffcc28f..e56a43a8a 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Submit"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Close"
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index e8d69be2d..2261711bb 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -8,12 +8,16 @@
       "SUBMIT": "Додати"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Закрити"
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index 45ffcc28f..fc45819be 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -1,27 +1,31 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
+      "DOWNLOAD": "Tải xuống",
       "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "Gửi"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
-    "CLOSE_MESSAGES_BUTTON": "Close"
+    "CLOSE_MESSAGES_BUTTON": "Đóng"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
   },
   "POWERED_BY": "Powered by Chatwoot",
-  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "EMAIL_PLACEHOLDER": "Vui lòng nhập email",
   "CHAT_PLACEHOLDER": "Type your message"
 }
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index 859b72777..c44bb9cbb 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -8,12 +8,16 @@
       "SUBMIT": "提交"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "可用的",
-    "ARE_AVAILABLE": "可用的",
-    "OTHERS_ARE_AVAILABLE": "其它可用的",
-    "AND": "和"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "查看新消息",
     "CLOSE_MESSAGES_BUTTON": "关闭"
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index 45ffcc28f..7342b5c1e 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -1,27 +1,31 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
+      "DOWNLOAD": "下載",
       "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "送出"
     }
   },
-  "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
-    "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are offline"
   },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
-    "CLOSE_MESSAGES_BUTTON": "Close"
+    "CLOSE_MESSAGES_BUTTON": "關閉"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
   },
   "POWERED_BY": "Powered by Chatwoot",
-  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "EMAIL_PLACEHOLDER": "請輸入您的電子信箱",
   "CHAT_PLACEHOLDER": "Type your message"
 }
diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index 1409ce424..1b0e32662 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -3,13 +3,13 @@
 
 LANGUAGES_CONFIG = {
   0 => { name: 'English (en)', iso_639_3_code: 'eng', iso_639_1_code: 'en', enabled: true },
-  1 => { name: 'العربية (ar)', iso_639_3_code: 'ara', iso_639_1_code: 'ar', enabled: false },
+  1 => { name: 'العربية (ar)', iso_639_3_code: 'ara', iso_639_1_code: 'ar', enabled: true },
   2 => { name: 'Nederlands (nl) ', iso_639_3_code: 'nld', iso_639_1_code: 'nl', enabled: true },
   3 => { name: 'Français (fr)', iso_639_3_code: 'fra', iso_639_1_code: 'fr', enabled: true },
   4 => { name: 'Deutsch (de)', iso_639_3_code: 'deu', iso_639_1_code: 'de', enabled: true },
   5 => { name: 'हिन्दी (hi)', iso_639_3_code: 'hin', iso_639_1_code: 'hi', enabled: false },
   6 => { name: 'Italiano (it)', iso_639_3_code: 'ita', iso_639_1_code: 'it', enabled: true },
-  7 => { name: '日本語 (ja)', iso_639_3_code: 'jpn', iso_639_1_code: 'ja', enabled: false },
+  7 => { name: '日本語 (ja)', iso_639_3_code: 'jpn', iso_639_1_code: 'ja', enabled: true },
   8 => { name: '한국어 (ko)', iso_639_3_code: 'kor', iso_639_1_code: 'ko', enabled: false },
   9 => { name: 'Português (pt)', iso_639_3_code: 'por', iso_639_1_code: 'pt', enabled: true },
   10 => { name: 'русский (ru)', iso_639_3_code: 'rus', iso_639_1_code: 'ru', enabled: true },
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 93dd98759..df6ec9182 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -34,8 +34,14 @@ ar:
         open: "تم إعادة فتح المحادثة بواسطة %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "تم إسنادها إلى %{assignee_name} بواسطة %{user_name}"
         removed: "المحادثة غير مسندة بواسطة %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} يرد عادة خلال بضع ساعات."
       ways_to_reach_you_message_body: "زودنا بوسيلة للتواصل معك."
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 124b55212..1db2a51c9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -32,14 +32,20 @@ ca:
       status:
         resolved: "La conversa va ser marcada com resolta per %{user_name}"
         open: "La conversa es va reobrir per %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        auto_resolved: "El sistema ha marcat que la conversa s'ha resolt a causa de %{duration} dies d'inactivitat"
       assignee:
+        self_assigned: "%{user_name} s'ha auto assignat aquesta conversa"
         assigned: "Assignada a %{assignee_name} per %{user_name}"
         removed: "%{user_name} ha tret l'assignació de la conversa"
+      labels:
+        added: "%{user_name} ha afegit %{labels}"
+        removed: "%{user_name} ha eliminat %{labels}"
+      muted: "%{user_name} ha silenciat la conversa"
+      unmuted: "%{user_name} ha desactivat el silenci de la conversa"
     templates:
       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"
-      transcript_subject: "Conversation Transcript"
+      email_subject: "Missatges nous en aquesta conversa"
+      transcript_subject: "Transcripció de conversa"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 48321e34d..4c230eb4a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -34,8 +34,14 @@ cs:
         open: "Konverzace byla znovu otevřena uživatelem %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Přiřazeno k %{assignee_name} uživatelem %{user_name}"
         removed: "Konverzace zrušena uživatelem %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Dejte týmu způsob, jak se k vám dostat."
diff --git a/config/locales/da.yml b/config/locales/da.yml
index f643ac7aa..0b1d69118 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -34,8 +34,14 @@ da:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 93e8e84bc..8af185395 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -34,8 +34,14 @@ de:
         open: "Das Gespräch wurde von wieder eröffnet %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{user_name} von %{assignee_name} zugewiesen"
         removed: "Gespräch nicht zugewiesen von %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} Antworten in der Regel in wenigen Stunden."
       ways_to_reach_you_message_body: "Geben Sie dem Team einen Weg, Sie zu erreichen."
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index f3f9b27e1..1acfd077c 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -2,59 +2,59 @@
 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."
+      confirmed: "あなたのメールアドレスを確認しました。"
+      send_instructions: "数分以内にメールアドレスを確認する方法が記載されたメールが届きます。"
+      send_paranoid_instructions: "メールアドレスがデータベースに存在する場合 数分後にメールアドレスの確認方法が記載されたメールが届きます。"
     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."
+      already_authenticated: "既にサインインしています。"
+      inactive: "あなたのアカウントはまだアクティベートされていません。"
+      invalid: "%{authentication_keys}/password が無効です。アカウントがまだ認証されていません。"
+      locked: "あなたのアカウントはロックされています。"
+      last_attempt: "アカウントがロックされる前にもう1回試行できます。"
+      not_found_in_database: "%{authentication_keys} またはパスワードが無効です。"
+      timeout: "セッションの有効期限が切れました。続行するには再度ログインしてください。"
+      unauthenticated: "続行するにはサインインまたはサインアップする必要があります。"
+      unconfirmed: "続行する前にメールアドレスを確認する必要があります。"
     mailer:
       confirmation_instructions:
-        subject: "Confirmation Instructions"
+        subject: "確認の手順"
       reset_password_instructions:
-        subject: "Reset password instructions"
+        subject: "パスワードのリセット手順"
       unlock_instructions:
-        subject: "Unlock instructions"
+        subject: "ロック解除の手順"
       password_change:
-        subject: "Password Changed"
+        subject: "パスワード変更完了"
     omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
+      failure: "%{reason} のため、「 %{kind} 」からの認証ができませんでした。"
+      success: "%{kind} アカウントから正常に認証されました。"
     passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password has been changed successfully. You are now signed in."
-      updated_not_active: "Your password has been changed successfully."
+      no_token: "このページは、パスワードリセットのメールに記載されたリンクからでしかアクセスすることはできません。パスワードリセットのメールから来た場合は、正しいURLをクリックしているか確認してください。"
+      send_instructions: "数分以内にパスワードをリセットする方法に関するメールが届きます。"
+      send_paranoid_instructions: "メールアドレスがデータベースに存在する場合 数分後にパスワード再発行の方法が記載されたメールが届きます。"
+      updated: "パスワードが正常に変更されました。サインインしています。"
+      updated_not_active: "パスワードが正常に変更されました。"
     registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
-      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."
+      destroyed: "さようなら！あなたのアカウントは正常にキャンセルされました。またお会いできることを楽しみにしています。"
+      signed_up: "ようこそ！正常にサインアップしました。"
+      signed_up_but_inactive: "正常にサインアップしました。ただし、アカウントが有効化されていないため、サインインできませんでした。"
+      signed_up_but_locked: "正常にサインアップしました。しかし、アカウントがロックされているため、サインインできませんでした。"
+      signed_up_but_unconfirmed: "確認リンクが記載されたメッセージがあなたのメールアドレスに送信されました。リンクに従ってアカウントを有効にしてください。"
+      update_needs_confirmation: "アカウントを正常に更新しましたが、新しいメールアドレスを確認する必要があります。 メールを確認し、新しいメールアドレスを確認するためのリンクをクリックしてください。"
+      updated: "アカウントが正常に更新されました"
     sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
+      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."
+      send_instructions: "数分でアカウントのロックを解除する方法が記載されたメールが届きます。"
+      send_paranoid_instructions: "アカウントが存在する場合、数分でロックを解除する方法が記載されたメールが届きます。"
+      unlocked: "アカウントのロックが解除されました。続行するにはログインしてください。"
   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"
+      already_confirmed: "が確認されました。サインインしてみてください"
+      confirmation_period_expired: "%{period} 以内に確認する必要があります。新しいものをリクエストしてください"
+      expired: "有効期限が切れました。新しいものをリクエストしてください"
+      not_found: "見つかりませんでした"
+      not_locked: "はロックされていません"
       not_saved:
-        other: "%{count} errors prohibited this %{resource} from being saved:"
+        other: "%{count} 個のエラーが発生し、 %{resource} を保存できませんでした："
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index b2e3adf2d..15dca044a 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -7,7 +7,7 @@ vi:
       send_paranoid_instructions: "Nếu địa chỉ email của bạn tồn tại trong cơ sở dữ liệu của chúng tôi, bạn sẽ nhận được một email có hướng dẫn cách xác nhận địa chỉ email của bạn trong vài phút."
     failure:
       already_authenticated: "Bạn đã đăng nhập."
-      inactive: Tài khoản của bạn chưa được kích hoạt.
+      inactive: "Tài khoản của bạn chưa được kích hoạt."
       invalid: "%{authentication_keys}/mật khẩu không hợp lệ hoặc tài khoản chưa được xác thực."
       locked: "Tài khoản của bạn đã bị khoá."
       last_attempt: "Bạn còn một lần thử nữa trước khi tài khoản của bạn bị khóa."
diff --git a/config/locales/devise.zh_TW.yml b/config/locales/devise.zh_TW.yml
index 05d47a166..d31370d3b 100644
--- a/config/locales/devise.zh_TW.yml
+++ b/config/locales/devise.zh_TW.yml
@@ -57,5 +57,4 @@ zh_TW:
       not_found: "找不到。"
       not_locked: "並未被鎖定。"
       not_saved:
-        one: "有一個錯誤導致 %{resource} 不能被儲存："
         other: "有 %{count} 個錯誤導致 %{resource} 不能被儲存："
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 26bb3b905..2a10147ab 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -32,10 +32,16 @@ el:
       status:
         resolved: "Η συνομιλία έχει επιλυθεί από τον %{user_name}"
         open: "Έγινε επαναφορά της συνομιλίας από τον %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        auto_resolved: "Η συνομιλία σημάνθηκε επιλυθείσα από το σύστημα με την παρέλευση %{duration} ημερών άνευ δραστηριότητας"
       assignee:
+        self_assigned: "Ο χρήστης %{user_name} ανέλαβε αυτήν την συνομιλία"
         assigned: "Ανατέθηκε στον %{assignee_name} από τον %{user_name}"
         removed: "Η συνομιλία σημάνθηκε ως μη ανατεθειμένη από τον %{user_name}"
+      labels:
+        added: "Ο %{user_name} πρόσθεσε ετικέτες %{labels}"
+        removed: "Ο %{user_name} αφαίρεσε τις ετικέτες %{labels}"
+      muted: "Ο χρήστης %{user_name} σίγασε την συνομιλία"
+      unmuted: "Ο χρήστης %{user_name} επανάφερε από την σίγαση την συνομιλία"
     templates:
       greeting_message_body: "Στον λογαριασμό %{account_name} τυπικά έχετε απάντηση σε μερικές ώρες."
       ways_to_reach_you_message_body: "Δώστε στην ομάδα ένα τρόπο να φτάσει σε σας."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b6ed2085d..d6cbca9af 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -32,14 +32,20 @@ es:
       status:
         resolved: "La conversación fue marcada por %{user_name}"
         open: "La conversación fue reabierta por %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        auto_resolved: "La conversación fue marcada por el sistema debido a %{duration} días de inactividad"
       assignee:
+        self_assigned: "%{user_name} auto-asignado a esta conversación"
         assigned: "Asignado a %{assignee_name} por %{user_name}"
         removed: "Conversación no asignada por %{user_name}"
+      labels:
+        added: "%{user_name} agregó %{labels}"
+        removed: "%{user_name} eliminó a %{labels}"
+      muted: "%{user_name} ha silenciado la conversación"
+      unmuted: "%{user_name} ha dessilenciado la conversación"
     templates:
       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:
       email_subject: "Nuevos mensajes en esta conversación"
-      transcript_subject: "Conversation Transcript"
+      transcript_subject: "Transcripción de la conversación"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ddadbf909..26cd7ca19 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -34,12 +34,18 @@ fa:
         open: "گفتگو توسط اپراتور %{user_name} مجددا باز شده بود"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{user_name} گفتگو را به %{assignee_name} اختصاص داد"
         removed: "گفتگو توسط اپراتور %{user_name} به وضعیت اختصاص داده نشده تغییر یافت"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} معمولا ظرف مدت کوتاهی پاسخ می‌دهد."
       ways_to_reach_you_message_body: "راهی برای ارتباط گرفتن تیم با شما قرار دهید"
       email_input_box_message_body: "پیام جدیدی به این گفتگو اضافه شده است"
     reply:
-      email_subject: "New messages on this conversation"
-      transcript_subject: "Conversation Transcript"
+      email_subject: "پیام‌های جدید در این مکالمه"
+      transcript_subject: "متن مکالمه"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 103e65f26..584d961fd 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -34,8 +34,14 @@ fi:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1f231b3ab..dea756ed3 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -32,10 +32,16 @@ fr:
       status:
         resolved: "La conversation a été marquée résolue par %{user_name}"
         open: "La conversation a été ré-ouverte par %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        auto_resolved: "La conversation a été marquée comme résolue par le système en raison de %{duration} jours d'inactivité"
       assignee:
+        self_assigned: "%{user_name} s'est auto-assigné cette conversation"
         assigned: "Assigné à %{assignee_name} par %{user_name}"
         removed: "Responsable de la conversation supprimé par %{user_name}"
+      labels:
+        added: "%{user_name} a ajouté %{labels}"
+        removed: "%{user_name} a supprimé %{labels}"
+      muted: "%{user_name} a mis la conversation en sourdine"
+      unmuted: "%{user_name} a rétabli le son de la conversation"
     templates:
       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."
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index df2df86bd..f630407e4 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -34,8 +34,14 @@ hi:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 452c4e8ec..4b8d0bc4c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -34,8 +34,14 @@ hu:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/config/locales/it.yml b/config/locales/it.yml
index c4c676044..d26fd0254 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -34,8 +34,14 @@ it:
         open: "La conversazione è stata riaperta da %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assegnato a %{assignee_name} da %{user_name}"
         removed: "Conversazione non assegnata da %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name}, in genere, risponde in poche ore."
       ways_to_reach_you_message_body: "Offri alla squadra un modo per raggiungerti."
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d098e2561..7f3d6d896 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -17,29 +17,35 @@
 #To learn more, please read the Rails Internationalization guide
 #available at https://guides.rubyonrails.org/i18n.html.
 ja:
-  hello: "Hello world"
+  hello: "こんにちは世界"
   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.
+    reset_password_success: やりましたね! パスワードのリセットリクエストが成功しました。手順についてはメールを確認してください。
+    reset_password_failure: メールアドレスが見つかりませんでした。
   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
+      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}"
+        resolved: "会話は %{user_name} によって解決済みになりました"
+        open: "%{user_name} によって会話が再開されました"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
-        assigned: "Assigned to %{assignee_name} by %{user_name}"
-        removed: "Conversation unassigned by %{user_name}"
+        self_assigned: "%{user_name} がこの会話を自身で割り当てました"
+        assigned: "%{assignee_name} によって %{user_name} に割り当てられました"
+        removed: "%{user_name} によって割り当てられていない会話です"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
-      greeting_message_body: "%{account_name} typically replies in a few hours."
-      ways_to_reach_you_message_body: "Give the team a way to reach you."
-      email_input_box_message_body: "Get notified by email"
+      greeting_message_body: "%{account_name} は通常数時間で返信します。"
+      ways_to_reach_you_message_body: "チームがあなたに連絡する方法を設定してください"
+      email_input_box_message_body: "Eメールで通知を受ける"
     reply:
-      email_subject: "New messages on this conversation"
-      transcript_subject: "Conversation Transcript"
+      email_subject: "この会話に新着メッセージがあります"
+      transcript_subject: "会話の記録"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c9d52591b..ce75fd92d 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -34,8 +34,14 @@ ko:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index d6ea4aaad..2e4190331 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -34,8 +34,14 @@ ml:
         open: "സംഭാഷണം %{user_name} വീണ്ടും തുറന്നു"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{assignee_name} %{user_name}-നെ നിയുക്തനാക്കി "
         removed: "%{user_name} സംഭാഷണം നിയുക്തമല്ലാതാക്കി"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} സാധാരണ കുറച്ച് മണിക്കൂറിനുള്ളിൽ മറുപടി നൽകുന്നു."
       ways_to_reach_you_message_body: "നിങ്ങളിലേക്ക് എത്താൻ ടീമിന് ഒരു വഴി നൽകുക."
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9d6f1b86f..28a79c4a0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -34,8 +34,14 @@ nl:
         open: "Gesprek werd heropend door %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Toegewezen aan %{assignee_name} door %{user_name}"
         removed: "Gesprek niet toegewezen door %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} reageert meestal binnen een paar uur."
       ways_to_reach_you_message_body: "Geef het team een manier om je te bereiken."
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b1b68c6f9..f6ac67850 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -34,8 +34,14 @@ pl:
         open: "Rozmowa została ponownie otwarta przez %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Przypisane do %{assignee_name} przez %{user_name}"
         removed: "Rozmowa nieprzypisana przez %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Daj drużynie możliwość dotarcia do Ciebie."
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 4fabf5940..78215e321 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -34,8 +34,14 @@ pt:
         open: "Conversa foi reaberta por %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Dê à equipe um jeito de contatá-lo."
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index f71338dc7..a0dc75497 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -34,8 +34,14 @@ pt:
         open: "Conversa foi reaberta por %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} normalmente responde em algumas horas."
       ways_to_reach_you_message_body: "Informe uma forma para entrarmos em contato com você."
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 2f87857cd..2906e27e6 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -34,8 +34,14 @@ ro:
         open: "Conversația a fost redeschisă de %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Atribuit lui %{assignee_name} de %{user_name}"
         removed: "Conversație neasociată de %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} răspunde de obicei în câteva ore."
       ways_to_reach_you_message_body: "Dă-i echipei o modalitate de a te contacta."
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ea629a0e1..b774787d2 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -34,8 +34,14 @@ ru:
         open: "%{user_name} открыл заново диалог"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{user_name} назначил %{assignee_name} ответственным"
         removed: "Ответственный снят %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} как правило отвечает в течении несколько часов."
       ways_to_reach_you_message_body: "Оставьте ваш email для связи"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 96bcbf93c..b011ccfc6 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -34,8 +34,14 @@ sk:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 31797969a..820b4b4d9 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -34,8 +34,14 @@ sv:
         open: "Konversationen öppnades igen av %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Tilldelad till %{assignee_name} av %{user_name}"
         removed: "Konversation otilldelad av %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Ge laget ett sätt att nå dig."
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index e2cbd3a2b..a42bfc15c 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -34,8 +34,14 @@ ta:
         open: "உரையாடலை %{user_name} மீண்டும் திறந்துள்ளார்"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{user_name} இதை %{assignee_name}க்கு ஒதுக்கியுள்ளார்"
         removed: "%{user_name} இதை ஒதுக்க படாத உரையாடளாக்கியுள்ளார்"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} பொதுவாக சில மணிநேரங்களில் பதிலளிப்பார்."
       ways_to_reach_you_message_body: "உங்களை அடைய அணிக்கு ஒரு வழியைக் கொடுங்கள்."
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 10c59759f..91b8af59b 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -34,8 +34,14 @@ th:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 203893e5b..09e8cd685 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -34,8 +34,14 @@ tr:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Give the team a way to reach you."
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 73bada315..e35a07374 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -34,8 +34,14 @@ uk:
         open: "Conversation was reopened by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Дайте команді можливість з вами зв'язатися."
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index e726c4bc8..588433857 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -34,8 +34,14 @@ vi:
         open: "Cuộc trò chuyện đã được mở lại bởi %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Chỉ định %{assignee_name} bởi %{user_name}"
         removed: "Cuộc hội thoại chưa được chỉ định bởi %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} thường trả lời trong vài giờ."
       ways_to_reach_you_message_body: "Cung cấp cho nhóm một cách để tiếp cận bạn."
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 93a9ef515..508458cf4 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -34,8 +34,14 @@ zh-CN:
         open: "对话被 %{user_name} 重新打开"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "由 %{assignee_name} 分配给 %{user_name}"
         removed: "对话未被 %{user_name} 分配"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
       greeting_message_body: "%{account_name} 通常在几小时内回复。"
       ways_to_reach_you_message_body: "给团队一个联系您的方法。"
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 714cdfc9b..2552d737b 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.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.
-
-zh_TW:
+#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: "你好。"
   messages:
-    reset_password_success: "密碼重設成功，請確認您的信箱有收到重設信件。"
-    reset_password_failure: "我們找不到用戶指定的電子郵件。"
-
+    reset_password_success: 密碼重設成功，請確認您的信箱有收到重設信件。
+    reset_password_failure: 我們找不到用戶指定的電子郵件。
   errors:
     signup:
-      disposable_email: "我們不允許一次性電子郵件。"
-      invalid_email: "您輸入的電子郵件無效。"
+      disposable_email: 我們不允許一次性電子郵件。
+      invalid_email: 您輸入的電子郵件無效。
       email_already_exists: "您已經註冊了一個帳號%{email}"
-      failed: "註冊失敗。"
-
+      failed: 註冊失敗。
   conversations:
     activity:
       status:
@@ -49,9 +34,18 @@ zh_TW:
         open: "被%{user_name}恢復對話。"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "被%{user_name}分配給%{assignee_name}。"
         removed: "對話被%{user_name}設定成未分配。"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
     templates:
-      typical_reply_message_body: "%{account_name}通常在幾小時內回覆。"
+      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"
+      transcript_subject: "Conversation Transcript"

From 2d70131097e80374c48b82dc438ac4437184e2e4 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Tue, 17 Nov 2020 09:15:57 +0530
Subject: [PATCH 35/36] fix: Remove duplicate API calls for conversation
 (#1419)

---
 app/javascript/dashboard/components/ChatList.vue  |  4 +++-
 .../dashboard/conversation/ConversationView.vue   | 15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 8a8c59551..27f89b550 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -184,7 +184,9 @@ export default {
       this.fetchConversations();
     },
     fetchConversations() {
-      this.$store.dispatch('fetchAllConversations', this.conversationFilters);
+      this.$store
+        .dispatch('fetchAllConversations', this.conversationFilters)
+        .then(() => this.$emit('conversation-load'));
     },
     updateAssigneeTab(selectedTab) {
       if (this.activeAssigneeTab !== selectedTab) {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index 14978599b..8f7709569 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -1,6 +1,10 @@
 <template>
   <section class="app-content columns">
-    <chat-list :conversation-inbox="inboxId" :label="label">
+    <chat-list
+      :conversation-inbox="inboxId"
+      :label="label"
+      @conversation-load="onConversationLoad"
+    >
       <button class="search--button" @click="onSearch">
         <i class="ion-ios-search-strong search--icon" />
         <div class="text-truncate">
@@ -83,24 +87,23 @@ export default {
 
   mounted() {
     this.$store.dispatch('agents/get');
-
     this.initialize();
-    this.fetchConversation();
-
     this.$watch('$store.state.route', () => this.initialize());
     this.$watch('chatList.length', () => {
-      this.fetchConversation();
       this.setActiveChat();
     });
   },
 
   methods: {
+    onConversationLoad() {
+      this.fetchConversationIfUnavailable();
+    },
     initialize() {
       this.$store.dispatch('setActiveInbox', this.inboxId);
       this.setActiveChat();
     },
 
-    fetchConversation() {
+    fetchConversationIfUnavailable() {
       if (!this.conversationId) {
         return;
       }

From 3ee453c01e9a093ec6dd09c673735587a033727d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Tue, 17 Nov 2020 10:39:46 +0530
Subject: [PATCH 36/36] fix: Avoid keys getting translated in availability
 (#1418)

---
 .../components/layout/AvailabilityStatus.vue  | 20 ++++++++++++----
 .../layout/specs/AvailabilityStatus.spec.js   |  2 +-
 .../dashboard/i18n/locale/ar/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/ca/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/cs/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/da/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/el/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/en/settings.json    | 16 ++++---------
 .../dashboard/i18n/locale/es/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/fa/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/fi/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/fr/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/hi/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/hu/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/it/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/ja/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/ko/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/ml/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/nl/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/pt/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/pt_BR/settings.json | 15 +++---------
 .../dashboard/i18n/locale/ro/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/ru/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/sk/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/sv/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/ta/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/th/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/tr/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/uk/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/vi/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/zh/settings.json    | 15 +++---------
 .../dashboard/i18n/locale/zh_CN/settings.json | 15 +++---------
 .../dashboard/i18n/locale/zh_TW/settings.json | 15 +++---------
 .../dashboard/settings/profile/Index.vue      | 24 -------------------
 34 files changed, 111 insertions(+), 401 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
index 6ab70b79f..d19e3ba0e 100644
--- a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
+++ b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
@@ -6,7 +6,7 @@
       />
 
       <div class="status-view--title">
-        {{ currentUserAvailabilityStatus }}
+        {{ availabilityDisplayLabel }}
       </div>
     </div>
 
@@ -47,6 +47,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { mixin as clickaway } from 'vue-clickaway';
+const AVAILABILITY_STATUS_KEYS = ['online', 'busy', 'offline'];
 
 export default {
   mixins: [clickaway],
@@ -62,14 +63,25 @@ export default {
     ...mapGetters({
       currentUser: 'getCurrentUser',
     }),
+    availabilityDisplayLabel() {
+      const availabilityIndex = AVAILABILITY_STATUS_KEYS.findIndex(
+        key => key === this.currentUserAvailabilityStatus
+      );
+      return this.$t('PROFILE_SETTINGS.FORM.AVAILABILITY.STATUSES_LIST')[
+        availabilityIndex
+      ];
+    },
     currentUserAvailabilityStatus() {
       return this.currentUser.availability_status;
     },
     availabilityStatuses() {
       return this.$t('PROFILE_SETTINGS.FORM.AVAILABILITY.STATUSES_LIST').map(
-        status => ({
-          ...status,
-          disabled: this.currentUserAvailabilityStatus === status.value,
+        (statusLabel, index) => ({
+          label: statusLabel,
+          value: AVAILABILITY_STATUS_KEYS[index],
+          disabled:
+            this.currentUserAvailabilityStatus ===
+            AVAILABILITY_STATUS_KEYS[index],
         })
       );
     },
diff --git a/app/javascript/dashboard/components/layout/specs/AvailabilityStatus.spec.js b/app/javascript/dashboard/components/layout/specs/AvailabilityStatus.spec.js
index 53a11406b..ede05392c 100644
--- a/app/javascript/dashboard/components/layout/specs/AvailabilityStatus.spec.js
+++ b/app/javascript/dashboard/components/layout/specs/AvailabilityStatus.spec.js
@@ -46,7 +46,7 @@ describe('AvailabilityStatus', () => {
   it('shows current user status', () => {
     const statusViewTitle = availabilityStatus.find('.status-view--title');
 
-    expect(statusViewTitle.text()).toBe(currentUser.availability_status);
+    expect(statusViewTitle.text()).toBe('Online');
   });
 
   it('opens the menu when user clicks "change"', async () => {
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index ba61eab02..be4724989 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "التوفر",
         "STATUSES_LIST": [
-          {
-            "value": "متصل",
-            "label": "متصل"
-          },
-          {
-            "value": "مشغول",
-            "label": "مشغول"
-          },
-          {
-            "value": "غير متصل",
-            "label": "غير متصل"
-          }
+          "متصل",
+          "مشغول",
+          "غير متصل"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 5e46eba95..6a3494009 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Disponibilitat",
         "STATUSES_LIST": [
-          {
-            "value": "en línia",
-            "label": "En línia"
-          },
-          {
-            "value": "ocupat",
-            "label": "Ocupat"
-          },
-          {
-            "value": "fora de línia",
-            "label": "Fora de línia"
-          }
+          "En línia",
+          "Ocupat",
+          "Fora de línia"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 4dc3a2f97..3fc24e742 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 866d76cee..e943912f4 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 706197058..8a4b4903e 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Διαθεσιμότητα",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Στην Γραμμή"
-          },
-          {
-            "value": "busy",
-            "label": "Απασχολημένος"
-          },
-          {
-            "value": "offline",
-            "label": "Εκτός"
-          }
+          "Στην Γραμμή",
+          "Απασχολημένος",
+          "Εκτός"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index adab59092..67a4e89d3 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -57,18 +57,10 @@
       },
       "AVAILABILITY": {
         "LABEL": "Availability",
-        "STATUSES_LIST": [{
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+        "STATUSES_LIST": [
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index fadc3cd01..33d414947 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Disponibilidad",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "En línea"
-          },
-          {
-            "value": "busy",
-            "label": "Ocupado"
-          },
-          {
-            "value": "offline",
-            "label": "Fuera de línea"
-          }
+          "En línea",
+          "Ocupado",
+          "Fuera de línea"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 9b24dd3d2..25b717fec 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "در دسترس",
         "STATUSES_LIST": [
-          {
-            "value": "آنلاین",
-            "label": "آنلاین"
-          },
-          {
-            "value": "مشغول",
-            "label": "مشغول"
-          },
-          {
-            "value": "آفلاین",
-            "label": "آفلاین"
-          }
+          "آنلاین",
+          "مشغول",
+          "آفلاین"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index 866d76cee..e943912f4 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index fe4a162e7..1eb027a0c 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Disponibilité",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "En ligne"
-          },
-          {
-            "value": "busy",
-            "label": "Occupé(e)"
-          },
-          {
-            "value": "offline",
-            "label": "Hors-ligne"
-          }
+          "En ligne",
+          "Occupé(e)",
+          "Hors-ligne"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 866d76cee..e943912f4 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 2ca7e30a4..3875cac43 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 01d848eda..77cc47bf5 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 8254cffc8..b59604325 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "利用可能期間",
         "STATUSES_LIST": [
-          {
-            "value": "オンライン",
-            "label": "オンライン"
-          },
-          {
-            "value": "取り込み中",
-            "label": "取り込み中"
-          },
-          {
-            "value": "オフライン",
-            "label": "オフライン"
-          }
+          "オンライン",
+          "取り込み中",
+          "オフライン"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 866d76cee..e943912f4 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 84e346dc2..10109699b 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "ലഭ്യത",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "ഓൺ‌ലൈൻ"
-          },
-          {
-            "value": "busy",
-            "label": "തിരക്ക്"
-          },
-          {
-            "value": "offline",
-            "label": "ഓഫ്‌ലൈൻ"
-          }
+          "ഓൺ‌ലൈൻ",
+          "തിരക്ക്",
+          "ഓഫ്‌ലൈൻ"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 46d329e2b..791e27115 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Druk",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 4762c031f..9b9d2b6ee 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 6b82d5e8d..d26dd3fa1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Disponibilidade",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Disponível"
-          },
-          {
-            "value": "busy",
-            "label": "Ocupado"
-          },
-          {
-            "value": "offline",
-            "label": "Desconectado"
-          }
+          "Disponível",
+          "Ocupado",
+          "Desconectado"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 980bf7449..2ca87fc46 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Disponibilitate",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Ocupat"
-          },
-          {
-            "value": "offline",
-            "label": "Deconectat"
-          }
+          "Online",
+          "Ocupat",
+          "Deconectat"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index e3fdba3f5..d4da79826 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Доступность",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "В сети"
-          },
-          {
-            "value": "busy",
-            "label": "Занят"
-          },
-          {
-            "value": "offline",
-            "label": "Оффлайн"
-          }
+          "В сети",
+          "Занят",
+          "Оффлайн"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 866d76cee..e943912f4 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 4e2ad7b97..34e019baf 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 529eae574..7827372fa 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index d88e4e183..e2e4d2428 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 866d76cee..e943912f4 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 301cf2d1b..1d04a5059 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Availability",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Online"
-          },
-          {
-            "value": "busy",
-            "label": "Busy"
-          },
-          {
-            "value": "offline",
-            "label": "Offline"
-          }
+          "Online",
+          "Busy",
+          "Offline"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index c5a55e94b..d5665c23a 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "Khả dụng",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "Trực Tuyến"
-          },
-          {
-            "value": "busy",
-            "label": "Bận"
-          },
-          {
-            "value": "offline",
-            "label": "Không Trực Tuyến"
-          }
+          "Trực Tuyến",
+          "Bận",
+          "Không Trực Tuyến"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/zh/settings.json b/app/javascript/dashboard/i18n/locale/zh/settings.json
index 3d998f821..e9449cff0 100644
--- a/app/javascript/dashboard/i18n/locale/zh/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh/settings.json
@@ -56,18 +56,9 @@
       "AVAILABILITY": {
         "LABEL": "有效的",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "在线的"
-          },
-          {
-            "value": "busy",
-            "label": "忙碌中"
-          },
-          {
-            "value": "offline",
-            "label": "离线的"
-          }
+          "在线的",
+          "忙碌中",
+          "离线的"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 10b5875f6..a813f2b30 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "有效的",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "在线的"
-          },
-          {
-            "value": "busy",
-            "label": "忙碌中"
-          },
-          {
-            "value": "offline",
-            "label": "离线的"
-          }
+          "在线的",
+          "忙碌中",
+          "离线的"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index c9240a4f6..b2198d9a7 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -58,18 +58,9 @@
       "AVAILABILITY": {
         "LABEL": "有效的",
         "STATUSES_LIST": [
-          {
-            "value": "online",
-            "label": "線上的"
-          },
-          {
-            "value": "busy",
-            "label": "忙碌中"
-          },
-          {
-            "value": "offline",
-            "label": "離線的"
-          }
+          "線上的",
+          "忙碌中",
+          "離線的"
         ]
       },
       "EMAIL": {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index e0575ccaa..acb70a145 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -49,21 +49,6 @@
               {{ $t('PROFILE_SETTINGS.FORM.EMAIL.ERROR') }}
             </span>
           </label>
-          <label>
-            {{ $t('PROFILE_SETTINGS.FORM.AVAILABILITY.LABEL') }}
-            <select v-model="availability">
-              <option
-                v-for="status in $t(
-                  'PROFILE_SETTINGS.FORM.AVAILABILITY.STATUSES_LIST'
-                )"
-                :key="status.key"
-                class="text-capitalize"
-                :value="status.value"
-              >
-                {{ status.label }}
-              </option>
-            </select>
-          </label>
         </div>
       </div>
       <div class="profile--settings--row row">
@@ -145,7 +130,6 @@ export default {
       email: '',
       password: '',
       passwordConfirmation: '',
-      availability: 'online',
       isUpdating: false,
     };
   },
@@ -175,7 +159,6 @@ export default {
     ...mapGetters({
       currentUser: 'getCurrentUser',
       currentUserId: 'getCurrentUserID',
-      currentAvailabilityStatus: 'getCurrentUserAvailabilityStatus',
     }),
   },
   watch: {
@@ -184,11 +167,6 @@ export default {
         this.initializeUser();
       }
     },
-    currentAvailabilityStatus(newStatus, oldStatus) {
-      if (newStatus !== oldStatus) {
-        this.availability = newStatus;
-      }
-    },
   },
   mounted() {
     if (this.currentUserId) {
@@ -200,7 +178,6 @@ export default {
       this.name = this.currentUser.name;
       this.email = this.currentUser.email;
       this.avatarUrl = this.currentUser.avatar_url;
-      this.availability = this.currentUser.availability_status;
       this.displayName = this.currentUser.display_name;
     },
     async updateUser() {
@@ -218,7 +195,6 @@ export default {
           avatar: this.avatarFile,
           password: this.password,
           displayName: this.displayName,
-          availability: this.availability,
           password_confirmation: this.passwordConfirmation,
         });
         this.isUpdating = false;