From 49ef4e54cae187d3fae77eb85b009afcb859048a Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 16 May 2023 16:57:25 -0700
Subject: [PATCH 01/93] feat: Add cmd/ctrl click open on the conversation cards
 (#7100)

---
 .../widgets/conversation/ConversationCard.vue | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 83c40e027..c646b9b6f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -9,7 +9,7 @@
     }"
     @mouseenter="onCardHover"
     @mouseleave="onCardLeave"
-    @click="cardClick(chat)"
+    @click="onCardClick"
     @contextmenu="openContextMenu($event)"
   >
     <label v-if="hovered || selected" class="checkbox-wrapper" @click.stop>
@@ -313,21 +313,33 @@ export default {
     },
   },
   methods: {
-    cardClick(chat) {
-      const { activeInbox } = this;
-      const path = conversationUrl({
-        accountId: this.accountId,
-        activeInbox,
-        id: chat.id,
-        label: this.activeLabel,
-        teamId: this.teamId,
-        foldersId: this.foldersId,
-        conversationType: this.conversationType,
-      });
+    onCardClick(e) {
+      const { activeInbox, chat } = this;
+      const path = frontendURL(
+        conversationUrl({
+          accountId: this.accountId,
+          activeInbox,
+          id: chat.id,
+          label: this.activeLabel,
+          teamId: this.teamId,
+          foldersId: this.foldersId,
+          conversationType: this.conversationType,
+        })
+      );
+
+      if (e.metaKey || e.ctrlKey) {
+        window.open(
+          window.chatwootConfig.hostURL + path,
+          '_blank',
+          'noopener noreferrer nofollow'
+        );
+        return;
+      }
       if (this.isActiveChat) {
         return;
       }
-      router.push({ path: frontendURL(path) });
+
+      router.push({ path });
     },
     onCardHover() {
       this.hovered = !this.hideThumbnail;

From 6382707146bfd00790ff3420b51f0e3ecfcd20a7 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 17 May 2023 15:41:23 +0530
Subject: [PATCH 02/93] chore: Check assignee exists or not before rendering
 the assignee avatar (#7104)

---
 .../notifications/components/NotificationPanelList.vue       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
index 107fe6723..679fd37b6 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
@@ -37,7 +37,7 @@
             </div>
             <div>
               <thumbnail
-                v-if="notificationItem.primary_actor.meta.assignee"
+                v-if="hasAssignee(notificationItem)"
                 :src="notificationItem.primary_actor.meta.assignee.thumbnail"
                 size="16px"
                 :username="notificationItem.primary_actor.meta.assignee.name"
@@ -127,6 +127,9 @@ export default {
         });
       }
     },
+    hasAssignee(notification) {
+      return notification.primary_actor.meta?.assignee;
+    },
   },
 };
 </script>

From aea9470b6ae682133c62e3305d2c9fe68c17933a Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 18 May 2023 15:06:18 +0530
Subject: [PATCH 03/93] fix: RTL issue for basic filter dropdown (#7118)

---
 app/javascript/dashboard/assets/scss/_rtl.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 0ed2fe2f4..4f7efaab9 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -261,6 +261,12 @@
       }
     }
 
+    // Basic filter dropdown
+    .basic-filter {
+      left: 0;
+      right: unset;
+    }
+
     // Card label
     .label-container {
       .label {

From a25179c342fe3c6a2fdcabc9ab9f0284a3a448a4 Mon Sep 17 00:00:00 2001
From: Clairton Rodrigo Heinzen <clairton.rodrigo@gmail.com>
Date: Thu, 18 May 2023 06:52:01 -0300
Subject: [PATCH 04/93] fix: Instagram events job NoMethodError: undefined
 method  for nil:NilClass (#7105)

- Sometimes tag entry does not have messaging or standby and cause a error
---
 app/jobs/webhooks/instagram_events_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/webhooks/instagram_events_job.rb b/app/jobs/webhooks/instagram_events_job.rb
index ad02a3c18..ef4dd0247 100644
--- a/app/jobs/webhooks/instagram_events_job.rb
+++ b/app/jobs/webhooks/instagram_events_job.rb
@@ -31,6 +31,6 @@ class Webhooks::InstagramEventsJob < ApplicationJob
   end
 
   def messages(entry)
-    (entry[:messaging].presence || entry[:standby])
+    (entry[:messaging].presence || entry[:standby] || [])
   end
 end

From 590ce788b99c7634936af07bf999c05abadb0416 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Thu, 18 May 2023 16:53:47 +0530
Subject: [PATCH 05/93] fix: update linux script(cwctl) to account for rails7
 upgrade (#7106)

* chore: modify cwctl to fetch latest redis version on new installations

* fix: add libvips for activestorage imageprocessing support

* chore: update cwctl version

* feat: upgrade redis and install libvps for existing installations
---
 VERSION_CW                |  2 +-
 VERSION_CWCTL             |  2 +-
 deployment/setup_20.04.sh | 30 +++++++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/VERSION_CW b/VERSION_CW
index ccbccc3dc..d76bd2ba3 100644
--- a/VERSION_CW
+++ b/VERSION_CW
@@ -1 +1 @@
-2.2.0
+2.17.0
diff --git a/VERSION_CWCTL b/VERSION_CWCTL
index 7ec1d6db4..276cbf9e2 100644
--- a/VERSION_CWCTL
+++ b/VERSION_CWCTL
@@ -1 +1 @@
-2.1.0
+2.3.0
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 20cc672df..8cd0a4e1a 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -2,7 +2,7 @@
 
 # Description: Install and manage a Chatwoot installation.
 # OS: Ubuntu 20.04 LTS
-# Script Version: 2.2.0
+# Script Version: 2.3.0
 # Run this script as root
 
 set -eu -o errexit -o pipefail -o noclobber -o nounset
@@ -19,7 +19,7 @@ fi
 # option --output/-o requires 1 argument
 LONGOPTS=console,debug,help,install,Install:,logs:,restart,ssl,upgrade,webserver,version
 OPTIONS=cdhiI:l:rsuwv
-CWCTL_VERSION="2.2.0"
+CWCTL_VERSION="2.3.0"
 pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '')
 
 # if user does not specify an option
@@ -175,6 +175,8 @@ function install_dependencies() {
   curl -sL https://deb.nodesource.com/setup_16.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
+  curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
+  echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
   apt update
 
   apt install -y \
@@ -183,7 +185,8 @@ function install_dependencies() {
       libssl-dev libyaml-dev libreadline-dev gnupg2 \
       postgresql-client redis-tools \
       nodejs yarn patch ruby-dev zlib1g-dev liblzma-dev \
-      libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev sudo
+      libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev sudo \
+      libvips
 }
 
 ##############################################################################
@@ -708,6 +711,26 @@ function upgrade_prereq() {
 EOF
 }
 
+##############################################################################
+# Update redis to v7+ for Rails 7 support(-u/--upgrade)
+# and install libvips for image processing support in Rails 7
+# Globals:
+#   None
+# Arguments:
+#   None
+# Outputs:
+#   None
+##############################################################################
+function upgrade_redis() {
+  echo "Upgrading Redis to v7+ for Rails 7 support(Chatwoot v2.17+)"
+  curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
+  echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
+  apt update -y
+  apt upgrade redis-server -y
+  apt install libvips -y
+}
+
+
 ##############################################################################
 # Upgrade an existing installation to latest stable version(-u/--upgrade)
 # Globals:
@@ -722,6 +745,7 @@ function upgrade() {
   echo "Upgrading Chatwoot to v$CW_VERSION"
   sleep 3
   upgrade_prereq
+  upgrade_redis
   sudo -i -u chatwoot << "EOF"
 
   # Navigate to the Chatwoot directory

From f2f33038f2d730f535504f5bd19545192fd9f5be Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 18 May 2023 18:42:28 +0530
Subject: [PATCH 06/93] fix: Make category non-mandatory (#7117)

Creating articles in a new help center without categories throws an error. This PR fixes that.
---
 .../accounts/articles/_article.json.jbuilder  |  7 +++---
 .../v1/accounts/articles_controller_spec.rb   | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/views/api/v1/accounts/articles/_article.json.jbuilder b/app/views/api/v1/accounts/articles/_article.json.jbuilder
index 0de240a1a..8c03f8f7b 100644
--- a/app/views/api/v1/accounts/articles/_article.json.jbuilder
+++ b/app/views/api/v1/accounts/articles/_article.json.jbuilder
@@ -8,11 +8,12 @@ json.position article.position
 json.account_id article.account_id
 json.updated_at article.updated_at.to_i
 json.meta article.meta
+
 json.category do
   json.id article.category_id
-  json.name article.category.name
-  json.slug article.category.slug
-  json.locale article.category.locale
+  json.name article.category&.name
+  json.slug article.category&.slug
+  json.locale article.category&.locale
 end
 
 json.views article.views
diff --git a/spec/controllers/api/v1/accounts/articles_controller_spec.rb b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
index e204a346a..703542bb2 100644
--- a/spec/controllers/api/v1/accounts/articles_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
@@ -41,6 +41,29 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
         expect(json_response['payload']['position']).to be(3)
       end
 
+      it 'creates article even if category is not provided' do
+        article_params = {
+          article: {
+            category_id: nil,
+            description: 'test description',
+            title: 'MyTitle',
+            slug: 'my-title',
+            content: 'This is my content.',
+            status: :published,
+            author_id: agent.id,
+            position: 3
+          }
+        }
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
+             params: article_params,
+             headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['payload']['title']).to eql('MyTitle')
+        expect(json_response['payload']['status']).to eql('draft')
+        expect(json_response['payload']['position']).to be(3)
+      end
+
       it 'associate to the root article' do
         root_article = create(:article, category: category, slug: 'root-article', portal: portal, account_id: account.id, author_id: agent.id,
                                         associated_article_id: nil)

From 132cf802d5b5cbf898bf9446ce9e31d754aa15b5 Mon Sep 17 00:00:00 2001
From: steffenhaak <haak@aucentiq.com>
Date: Thu, 18 May 2023 15:20:48 +0200
Subject: [PATCH 07/93] fix: Open AI Integration should respond in conversation
 language (#7092)

Appended "Reply in the user's language." to obtain the answer in the user's language.
Fixes: https://linear.app/chatwoot/issue/CW-1735/chore-use-account-language-for-the-prompts


Co-authored-by: Sojan <sojan@pepalo.com>
---
 lib/integrations/openai/processor_service.rb        |  8 +++++---
 .../integrations/openai/processor_service_spec.rb   | 13 +++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/integrations/openai/processor_service.rb b/lib/integrations/openai/processor_service.rb
index 84afad27a..17a34e23f 100644
--- a/lib/integrations/openai/processor_service.rb
+++ b/lib/integrations/openai/processor_service.rb
@@ -28,7 +28,8 @@ class Integrations::Openai::ProcessorService
       model: GPT_MODEL,
       messages: [
         { role: 'system',
-          content: "You are a helpful support agent. Please rephrase the following response to a more #{event['data']['tone']} tone." },
+          content: "You are a helpful support agent. Please rephrase the following response to a more #{event['data']['tone']} tone. " \
+                   "Reply in the user's language." },
         { role: 'user', content: event['data']['content'] }
       ]
     }.to_json
@@ -96,7 +97,7 @@ class Integrations::Openai::ProcessorService
       messages: [
         { role: 'system',
           content: 'Please summarize the key points from the following conversation between support agents and ' \
-                   'customer as bullet points for the next support agent looking into the conversation' },
+                   'customer as bullet points for the next support agent looking into the conversation. Reply in the user\'s language.' },
         { role: 'user', content: conversation_messages }
       ]
     }.to_json
@@ -106,7 +107,8 @@ class Integrations::Openai::ProcessorService
     {
       model: GPT_MODEL,
       messages: [
-        { role: 'system', content: 'Please suggest a reply to the following conversation between support agents and customer' }
+        { role: 'system',
+          content: 'Please suggest a reply to the following conversation between support agents and customer. Reply in the user\'s language.' }
       ].concat(conversation_messages(in_array_format: true))
     }.to_json
   end
diff --git a/spec/lib/integrations/openai/processor_service_spec.rb b/spec/lib/integrations/openai/processor_service_spec.rb
index 2accf1070..686fa564f 100644
--- a/spec/lib/integrations/openai/processor_service_spec.rb
+++ b/spec/lib/integrations/openai/processor_service_spec.rb
@@ -29,8 +29,12 @@ RSpec.describe Integrations::Openai::ProcessorService do
         request_body = {
           'model' => 'gpt-3.5-turbo',
           'messages' => [
-            { 'role' => 'system',
-              'content' => "You are a helpful support agent. Please rephrase the following response to a more #{event['data']['tone']} tone." },
+            {
+              'role' => 'system',
+              'content' => 'You are a helpful support agent. ' \
+                           'Please rephrase the following response to a more ' \
+                           "#{event['data']['tone']} tone. Reply in the user's language."
+            },
             { 'role' => 'user', 'content' => event['data']['content'] }
           ]
         }.to_json
@@ -51,7 +55,8 @@ RSpec.describe Integrations::Openai::ProcessorService do
         request_body = {
           'model' => 'gpt-3.5-turbo',
           'messages' => [
-            { role: 'system', content: 'Please suggest a reply to the following conversation between support agents and customer' },
+            { role: 'system',
+              content: 'Please suggest a reply to the following conversation between support agents and customer. Reply in the user\'s language.' },
             { role: 'user', content: customer_message.content },
             { role: 'assistant', content: agent_message.content }
           ]
@@ -79,7 +84,7 @@ RSpec.describe Integrations::Openai::ProcessorService do
           'messages' => [
             { 'role' => 'system',
               'content' => 'Please summarize the key points from the following conversation between support agents and customer ' \
-                           'as bullet points for the next support agent looking into the conversation' },
+                           'as bullet points for the next support agent looking into the conversation. Reply in the user\'s language.' },
             { 'role' => 'user', 'content' => conversation_messages }
           ]
         }.to_json

From 105f9a27d28fe2a196513e033d9ca23d81cbc267 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 18 May 2023 22:50:46 +0530
Subject: [PATCH 08/93] feat: more CSAT filters (#7038)

* refactor: use grid instead of flex

* refactor: let the parent layout decide the spacing

* feat: add a separate date-range component

* refactor: use new date-range component

* fix: destructure all options

* refactor: separate group by component

* refactor: better handle group by data

* fix: defaul group by

* refactor: variable naming

* refactor: use DATE_RANGE_OPTIONS directly

* chore: update platform in gemfile.lock

* refactor: trigger fetch on filter change

* refactor: remove redundant method

* refactor: simplify methods and emitting

* refactor: simplify filter logic

* refactor: simplify fetching

* refactor: imports

* refactor: prop name

* refactor: CSAT response to use new APIs

* refactor: use common filter event

* refactor: use computed value for validGroupBy

* refactor: better function names

* refactor: rename prop

* refactor: remove redundant props

* refactor: separate agents filter component

* feat: add labels filter

* feat: add inboxes filter

* fix: event

* refactor: send label and inbox along with request payload

* feat: add inbox filter

* feat: add inbox to download

* refactor: use request payload from computed property

* refactor: params

* feat: add team to csat filters

* feat: add team to csat filters

* feat: add filter for rating

* feat: reverse options

* feat: add labels for ratings and translations

* feat: update translation

* fix: margin and spacing

* fix: trailing whitespace

* feat: add tests for filters

* chore: move files

* feat: add try catch with alerts

* feat: update import

* fix: imports

* Updates broken imports

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 Gemfile.lock                                  |   1 +
 .../csat_survey_responses_controller.rb       |   9 +-
 app/javascript/dashboard/api/csatReports.js   |  15 +-
 .../dashboard/assets/scss/_date-picker.scss   |  16 +-
 .../assets/scss/plugins/_multiselect.scss     |   4 +-
 .../dashboard/i18n/locale/en/csatMgmt.json    |   9 +-
 .../dashboard/i18n/locale/en/report.json      |  17 +
 .../settings/reports/CsatResponses.vue        | 105 ++++---
 .../dashboard/settings/reports/Index.vue      |  95 ++----
 .../reports/components/FilterSelector.vue     | 296 ++++++++++--------
 .../reports/components/Filters/Agents.vue     |  45 +++
 .../components/Filters/DateGroupBy.vue        |  67 ++++
 .../reports/components/Filters/DateRange.vue  |  46 +++
 .../reports/components/Filters/Inboxes.vue    |  40 +++
 .../reports/components/Filters/Labels.vue     |  71 +++++
 .../reports/components/Filters/Ratings.vue    |  39 +++
 .../reports/components/Filters/Teams.vue      |  40 +++
 .../specs/Filters/FiltersAgents.spec.js       |  59 ++++
 .../specs/Filters/FiltersDateGroupBy.spec.js  |  45 +++
 .../specs/Filters/FiltersDateRange.spec.js    |  42 +++
 .../specs/Filters/FiltersInboxes.spec.js      |  66 ++++
 .../specs/Filters/FiltersLabels.spec.js       |  66 ++++
 .../specs/Filters/FiltersRatings.spec.js      |  45 +++
 .../specs/Filters/FiltersTeams.spec.js        |  62 ++++
 .../dashboard/settings/reports/constants.js   |  79 +++++
 .../dashboard/store/modules/csat.js           |  11 +-
 app/javascript/shared/constants/messages.js   |   5 +
 app/javascript/shared/helpers/DateHelper.js   |   7 +
 app/models/csat_survey_response.rb            |   4 +
 29 files changed, 1150 insertions(+), 256 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Agents.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/DateGroupBy.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/DateRange.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Inboxes.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Labels.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Ratings.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Teams.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersAgents.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersDateGroupBy.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersDateRange.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersInboxes.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersLabels.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersRatings.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersTeams.spec.js

diff --git a/Gemfile.lock b/Gemfile.lock
index 3723a738c..bec62cc75 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -784,6 +784,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-22
   arm64-darwin-21
   ruby
   x86_64-darwin-18
diff --git a/app/controllers/api/v1/accounts/csat_survey_responses_controller.rb b/app/controllers/api/v1/accounts/csat_survey_responses_controller.rb
index 9495bbfa8..f5bed6c34 100644
--- a/app/controllers/api/v1/accounts/csat_survey_responses_controller.rb
+++ b/app/controllers/api/v1/accounts/csat_survey_responses_controller.rb
@@ -34,9 +34,12 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
   end
 
   def set_csat_survey_responses
-    @csat_survey_responses = filtrate(
-      Current.account.csat_survey_responses.includes([:conversation, :assigned_agent, :contact])
-    ).filter_by_created_at(range).filter_by_assigned_agent_id(params[:user_ids])
+    base_query = Current.account.csat_survey_responses.includes([:conversation, :assigned_agent, :contact])
+    @csat_survey_responses = filtrate(base_query).filter_by_created_at(range)
+                                                 .filter_by_assigned_agent_id(params[:user_ids])
+                                                 .filter_by_inbox_id(params[:inbox_id])
+                                                 .filter_by_team_id(params[:team_id])
+                                                 .filter_by_rating(params[:rating])
   end
 
   def set_current_page_surveys
diff --git a/app/javascript/dashboard/api/csatReports.js b/app/javascript/dashboard/api/csatReports.js
index 4decc8de3..46d5decd4 100644
--- a/app/javascript/dashboard/api/csatReports.js
+++ b/app/javascript/dashboard/api/csatReports.js
@@ -6,7 +6,7 @@ class CSATReportsAPI extends ApiClient {
     super('csat_survey_responses', { accountScoped: true });
   }
 
-  get({ page, from, to, user_ids } = {}) {
+  get({ page, from, to, user_ids, inbox_id, team_id, rating } = {}) {
     return axios.get(this.url, {
       params: {
         page,
@@ -14,24 +14,31 @@ class CSATReportsAPI extends ApiClient {
         until: to,
         sort: '-created_at',
         user_ids,
+        inbox_id,
+        team_id,
+        rating,
       },
     });
   }
 
-  download({ from, to, user_ids } = {}) {
+  download({ from, to, user_ids, inbox_id, team_id, rating } = {}) {
     return axios.get(`${this.url}/download`, {
       params: {
         since: from,
         until: to,
         sort: '-created_at',
         user_ids,
+        inbox_id,
+        team_id,
+        rating,
       },
     });
   }
 
-  getMetrics({ from, to, user_ids } = {}) {
+  getMetrics({ from, to, user_ids, inbox_id, team_id } = {}) {
+    // no ratings for metrics
     return axios.get(`${this.url}/metrics`, {
-      params: { since: from, until: to, user_ids },
+      params: { since: from, until: to, user_ids, inbox_id, team_id },
     });
   }
 }
diff --git a/app/javascript/dashboard/assets/scss/_date-picker.scss b/app/javascript/dashboard/assets/scss/_date-picker.scss
index ece12c999..4377480c9 100644
--- a/app/javascript/dashboard/assets/scss/_date-picker.scss
+++ b/app/javascript/dashboard/assets/scss/_date-picker.scss
@@ -5,12 +5,20 @@
 }
 
 .date-picker {
-  .mx-datepicker {
-    width: 100%;
+  &.no-margin {
+    .mx-input {
+      margin-bottom: 0;
+    }
   }
 
-  .mx-datepicker-range {
-    width: 320px;
+  &:not(.auto-width) {
+    .mx-datepicker-range {
+      width: 320px;
+    }
+  }
+
+  .mx-datepicker {
+    width: 100%;
   }
 
   .mx-input {
diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
index 3167b2085..f111a414f 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
@@ -13,7 +13,9 @@
 }
 
 .multiselect {
-  margin-bottom: var(--space-normal);
+  &:not(.no-margin) {
+    margin-bottom: var(--space-normal);
+  }
 
   &.multiselect--disabled {
     opacity: 0.8;
diff --git a/app/javascript/dashboard/i18n/locale/en/csatMgmt.json b/app/javascript/dashboard/i18n/locale/en/csatMgmt.json
index d7d2efc2a..9e16dc2b3 100644
--- a/app/javascript/dashboard/i18n/locale/en/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/csatMgmt.json
@@ -1,6 +1,13 @@
 {
   "CSAT": {
     "TITLE": "Rate your conversation",
-    "PLACEHOLDER": "Tell us more..."
+    "PLACEHOLDER": "Tell us more...",
+    "RATINGS": {
+      "POOR": "😞 Poor",
+      "FAIR": "😑 Fair",
+      "AVERAGE": "😐 Average",
+      "GOOD": "😀 Good",
+      "EXCELLENT": "😍 Excellent"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index 6ff093260..5858605a0 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -4,6 +4,8 @@
     "LOADING_CHART": "Loading chart data...",
     "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
     "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "DATA_FETCHING_FAILED": "Failed to fetch data, please try again later.",
+    "SUMMARY_FETCHING_FAILED": "Failed to fetch summary, please try again later.",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversations",
@@ -34,6 +36,14 @@
         "DESC": "( Total )"
       }
     },
+    "DATE_RANGE_OPTIONS": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_DATE_RANGE": "Custom date range"
+    },
     "DATE_RANGE": [
       {
         "id": 0,
@@ -66,6 +76,12 @@
     },
     "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
     "DURATION_FILTER_LABEL": "Duration",
+    "GROUPING_OPTIONS": {
+      "DAY": "Day",
+      "WEEK": "Week",
+      "MONTH": "Month",
+      "YEAR": "Year"
+    },
     "GROUP_BY_DAY_OPTIONS": [{ "id": 1, "groupBy": "Day" }],
     "GROUP_BY_WEEK_OPTIONS": [
       { "id": 1, "groupBy": "Day" },
@@ -356,6 +372,7 @@
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
     "DOWNLOAD": "Download CSAT Reports",
+    "DOWNLOAD_FAILED": "Failed to download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
index f72ad8bad..501dc5a7c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="column content-box">
     <report-filter-selector
-      agents-filter
-      :agents-filter-items-list="agentList"
+      :show-agents-filter="true"
+      :show-inbox-filter="true"
+      :show-rating-filter="true"
+      :show-team-filter="isTeamsEnabled"
       :show-business-hours-switch="false"
-      @date-range-change="onDateRangeChange"
-      @agents-filter-change="onAgentsFilterChange"
+      @filter-change="onFilterChange"
     />
     <woot-button
       color-scheme="success"
@@ -23,9 +24,11 @@
 import CsatMetrics from './components/CsatMetrics';
 import CsatTable from './components/CsatTable';
 import ReportFilterSelector from './components/FilterSelector';
-import { mapGetters } from 'vuex';
 import { generateFileName } from '../../../../helper/downloadHelper';
 import { REPORTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
+import { mapGetters } from 'vuex';
+import { FEATURE_FLAGS } from '../../../../featureFlags';
+import alertMixin from '../../../../../shared/mixins/alertMixin';
 
 export default {
   name: 'CsatResponses',
@@ -34,39 +37,78 @@ export default {
     CsatTable,
     ReportFilterSelector,
   },
+  mixins: [alertMixin],
   data() {
-    return { pageIndex: 1, from: 0, to: 0, userIds: [] };
+    return {
+      pageIndex: 1,
+      from: 0,
+      to: 0,
+      userIds: [],
+      inbox: null,
+      team: null,
+      rating: null,
+    };
   },
   computed: {
     ...mapGetters({
-      agentList: 'agents/getAgents',
+      accountId: 'getCurrentAccountId',
+      isFeatureEnabledOnAccount: 'accounts/isFeatureEnabledonAccount',
     }),
-  },
-  mounted() {
-    this.$store.dispatch('agents/get');
-  },
-  methods: {
-    getAllData() {
-      this.$store.dispatch('csat/getMetrics', {
+    requestPayload() {
+      return {
         from: this.from,
         to: this.to,
         user_ids: this.userIds,
-      });
-      this.getResponses();
+        inbox_id: this.inbox,
+        team_id: this.team,
+        rating: this.rating,
+      };
+    },
+    isTeamsEnabled() {
+      return this.isFeatureEnabledOnAccount(
+        this.accountId,
+        FEATURE_FLAGS.TEAM_MANAGEMENT
+      );
+    },
+  },
+  methods: {
+    getAllData() {
+      try {
+        this.$store.dispatch('csat/getMetrics', this.requestPayload);
+        this.getResponses();
+      } catch {
+        this.showAlert(this.$t('REPORT.DATA_FETCHING_FAILED'));
+      }
     },
     getResponses() {
       this.$store.dispatch('csat/get', {
         page: this.pageIndex,
-        from: this.from,
-        to: this.to,
-        user_ids: this.userIds,
+        ...this.requestPayload,
       });
     },
+    downloadReports() {
+      const type = 'csat';
+      try {
+        this.$store.dispatch('csat/downloadCSATReports', {
+          fileName: generateFileName({ type, to: this.to }),
+          ...this.requestPayload,
+        });
+      } catch (error) {
+        this.showAlert(this.$t('REPORT.CSAT_REPORTS.DOWNLOAD_FAILED'));
+      }
+    },
     onPageNumberChange(pageIndex) {
       this.pageIndex = pageIndex;
       this.getResponses();
     },
-    onDateRangeChange({ from, to }) {
+    onFilterChange({
+      from,
+      to,
+      selectedAgents,
+      selectedInbox,
+      selectedTeam,
+      selectedRating,
+    }) {
       // do not track filter change on inital load
       if (this.from !== 0 && this.to !== 0) {
         this.$track(REPORTS_EVENTS.FILTER_REPORT, {
@@ -74,27 +116,16 @@ export default {
           reportType: 'csat',
         });
       }
+
       this.from = from;
       this.to = to;
+      this.userIds = selectedAgents.map(el => el.id);
+      this.inbox = selectedInbox?.id;
+      this.team = selectedTeam?.id;
+      this.rating = selectedRating?.value;
+
       this.getAllData();
     },
-    onAgentsFilterChange(agents) {
-      this.userIds = agents.map(el => el.id);
-      this.getAllData();
-      this.$track(REPORTS_EVENTS.FILTER_REPORT, {
-        filterType: 'agent',
-        reportType: 'csat',
-      });
-    },
-    downloadReports() {
-      const type = 'csat';
-      this.$store.dispatch('csat/downloadCSATReports', {
-        from: this.from,
-        to: this.to,
-        user_ids: this.userIds,
-        fileName: generateFileName({ type, to: this.to }),
-      });
-    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index 6754f7668..0d9d00003 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -9,12 +9,9 @@
       {{ $t('REPORT.DOWNLOAD_AGENT_REPORTS') }}
     </woot-button>
     <report-filter-selector
-      group-by-filter
-      :selected-group-by-filter="selectedGroupByFilter"
-      :filter-items-list="filterItemsList"
-      @date-range-change="onDateRangeChange"
+      :show-agents-filter="false"
+      :show-group-by-filter="true"
       @filter-change="onFilterChange"
-      @business-hours-toggle="onBusinessHoursToggle"
     />
     <div class="row">
       <woot-report-stats-card
@@ -55,7 +52,8 @@ import fromUnixTime from 'date-fns/fromUnixTime';
 import format from 'date-fns/format';
 import ReportFilterSelector from './components/FilterSelector';
 import { GROUP_BY_FILTER, METRIC_CHART } from './constants';
-import reportMixin from '../../../../mixins/reportMixin';
+import reportMixin from 'dashboard/mixins/reportMixin';
+import alertMixin from 'shared/mixins/alertMixin';
 import { formatTime } from '@chatwoot/utils';
 import { REPORTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
 
@@ -73,15 +71,13 @@ export default {
   components: {
     ReportFilterSelector,
   },
-  mixins: [reportMixin],
+  mixins: [reportMixin, alertMixin],
   data() {
     return {
       from: 0,
       to: 0,
       currentSelection: 0,
       groupBy: GROUP_BY_FILTER[1],
-      filterItemsList: this.$t('REPORT.GROUP_BY_DAY_OPTIONS'),
-      selectedGroupByFilter: {},
       businessHours: false,
     };
   },
@@ -191,24 +187,35 @@ export default {
   },
   methods: {
     fetchAllData() {
-      const { from, to, groupBy, businessHours } = this;
-      this.$store.dispatch('fetchAccountSummary', {
-        from,
-        to,
-        groupBy: groupBy.period,
-        businessHours,
-      });
+      this.fetchAccountSummary();
       this.fetchChartData();
     },
+    fetchAccountSummary() {
+      try {
+        this.$store.dispatch('fetchAccountSummary', this.getRequestPayload());
+      } catch {
+        this.showAlert(this.$t('REPORT.SUMMARY_FETCHING_FAILED'));
+      }
+    },
     fetchChartData() {
+      try {
+        this.$store.dispatch('fetchAccountReport', {
+          metric: this.metrics[this.currentSelection].KEY,
+          ...this.getRequestPayload(),
+        });
+      } catch {
+        this.showAlert(this.$t('REPORT.DATA_FETCHING_FAILED'));
+      }
+    },
+    getRequestPayload() {
       const { from, to, groupBy, businessHours } = this;
-      this.$store.dispatch('fetchAccountReport', {
-        metric: this.metrics[this.currentSelection].KEY,
+
+      return {
         from,
         to,
         groupBy: groupBy.period,
         businessHours,
-      });
+      };
     },
     downloadAgentReports() {
       const { from, to } = this;
@@ -222,57 +229,15 @@ export default {
       this.currentSelection = index;
       this.fetchChartData();
     },
-    onDateRangeChange({ from, to, groupBy }) {
-      // do not track filter change on inital load
-      if (this.from !== 0 && this.to !== 0) {
-        this.$track(REPORTS_EVENTS.FILTER_REPORT, {
-          filterType: 'date',
-          reportType: 'conversations',
-        });
-      }
+    onFilterChange({ from, to, groupBy, businessHours }) {
       this.from = from;
       this.to = to;
-      this.filterItemsList = this.fetchFilterItems(groupBy);
-      const filterItems = this.filterItemsList.filter(
-        item => item.id === this.groupBy.id
-      );
-      if (filterItems.length > 0) {
-        this.selectedGroupByFilter = filterItems[0];
-      } else {
-        this.selectedGroupByFilter = this.filterItemsList[0];
-        this.groupBy = GROUP_BY_FILTER[this.selectedGroupByFilter.id];
-      }
-      this.fetchAllData();
-    },
-    onFilterChange(payload) {
-      this.groupBy = GROUP_BY_FILTER[payload.id];
+      this.groupBy = groupBy;
+      this.businessHours = businessHours;
       this.fetchAllData();
 
       this.$track(REPORTS_EVENTS.FILTER_REPORT, {
-        filterType: 'groupBy',
-        filterValue: this.groupBy?.period,
-        reportType: 'conversations',
-      });
-    },
-    fetchFilterItems(groupBy) {
-      switch (groupBy) {
-        case GROUP_BY_FILTER[2].period:
-          return this.$t('REPORT.GROUP_BY_WEEK_OPTIONS');
-        case GROUP_BY_FILTER[3].period:
-          return this.$t('REPORT.GROUP_BY_MONTH_OPTIONS');
-        case GROUP_BY_FILTER[4].period:
-          return this.$t('REPORT.GROUP_BY_YEAR_OPTIONS');
-        default:
-          return this.$t('REPORT.GROUP_BY_DAY_OPTIONS');
-      }
-    },
-    onBusinessHoursToggle(value) {
-      this.businessHours = value;
-      this.fetchAllData();
-
-      this.$track(REPORTS_EVENTS.FILTER_REPORT, {
-        filterType: 'businessHours',
-        filterValue: value,
+        filterValue: { from, to, groupBy, businessHours },
         reportType: 'conversations',
       });
     },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
index 989a18e40..62ea95b70 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
@@ -1,72 +1,43 @@
 <template>
-  <div class="flex-container flex-dir-column medium-flex-dir-row">
-    <div class="small-12 medium-3 pull-right multiselect-wrap--small">
-      <multiselect
-        v-model="currentDateRangeSelection"
-        track-by="name"
-        label="name"
-        :placeholder="$t('FORMS.MULTISELECT.SELECT_ONE')"
-        selected-label
-        :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
-        deselect-label=""
-        :options="dateRange"
-        :searchable="false"
-        :allow-empty="false"
-        @select="changeDateSelection"
-      />
-    </div>
+  <div class="filter-container">
+    <reports-filters-date-range @on-range-change="onDateRangeChange" />
     <woot-date-range-picker
       v-if="isDateRangeSelected"
-      class="margin-left-1"
       show-range
+      class="no-margin auto-width"
       :value="customDateRange"
       :confirm-text="$t('REPORT.CUSTOM_DATE_RANGE.CONFIRM')"
       :placeholder="$t('REPORT.CUSTOM_DATE_RANGE.PLACEHOLDER')"
-      @change="onChange"
+      @change="onCustomDateRangeChange"
     />
-    <div
-      v-if="notLast7Days && groupByFilter"
-      class="small-12 medium-3 pull-right margin-left-1 margin-right-1 multiselect-wrap--small"
-    >
-      <p aria-hidden="true" class="hide">
-        {{ $t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL') }}
-      </p>
-      <multiselect
-        v-model="currentSelectedFilter"
-        track-by="id"
-        label="groupBy"
-        :placeholder="$t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL')"
-        :options="filterItemsList"
-        :allow-empty="false"
-        :show-labels="false"
-        @input="changeFilterSelection"
-      />
-    </div>
-    <div
-      v-if="agentsFilter"
-      class="small-12 medium-3 pull-right margin-left-1 margin-right-1 multiselect-wrap--small"
-    >
-      <multiselect
-        v-model="selectedAgents"
-        :options="agentsFilterItemsList"
-        track-by="id"
-        label="name"
-        :multiple="true"
-        :close-on-select="false"
-        :clear-on-select="false"
-        :hide-selected="true"
-        :placeholder="$t('CSAT_REPORTS.FILTERS.AGENTS.PLACEHOLDER')"
-        selected-label
-        :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
-        :deselect-label="$t('FORMS.MULTISELECT.ENTER_TO_REMOVE')"
-        @input="handleAgentsFilterSelection"
-      />
-    </div>
-    <div
-      v-if="showBusinessHoursSwitch"
-      class="small-12 medium-3 business-hours"
-    >
-      <span class="business-hours-text margin-right-1">
+    <reports-filters-date-group-by
+      v-if="showGroupByFilter && isGroupByPossible"
+      :valid-group-options="validGroupOptions"
+      :selected-option="selectedGroupByFilter"
+      @on-grouping-change="onGroupingChange"
+    />
+    <reports-filters-agents
+      v-if="showAgentsFilter"
+      @agents-filter-selection="handleAgentsFilterSelection"
+    />
+    <reports-filters-labels
+      v-if="showLabelsFilter"
+      @labels-filter-selection="handleLabelsFilterSelection"
+    />
+    <reports-filters-teams
+      v-if="showTeamFilter"
+      @team-filter-selection="handleTeamFilterSelection"
+    />
+    <reports-filters-inboxes
+      v-if="showInboxFilter"
+      @inbox-filter-selection="handleInboxFilterSelection"
+    />
+    <reports-filters-ratings
+      v-if="showRatingFilter"
+      @rating-filter-selection="handleRatingFilterSelection"
+    />
+    <div v-if="showBusinessHoursSwitch" class="business-hours">
+      <span class="business-hours-text ">
         {{ $t('REPORT.BUSINESS_HOURS') }}
       </span>
       <span>
@@ -77,36 +48,54 @@
 </template>
 <script>
 import WootDateRangePicker from 'dashboard/components/ui/DateRangePicker.vue';
+import ReportsFiltersDateRange from './Filters/DateRange.vue';
+import ReportsFiltersDateGroupBy from './Filters/DateGroupBy.vue';
+import ReportsFiltersAgents from './Filters/Agents.vue';
+import ReportsFiltersLabels from './Filters/Labels.vue';
+import ReportsFiltersInboxes from './Filters/Inboxes.vue';
+import ReportsFiltersTeams from './Filters/Teams.vue';
+import ReportsFiltersRatings from './Filters/Ratings.vue';
 import subDays from 'date-fns/subDays';
-import startOfDay from 'date-fns/startOfDay';
-import getUnixTime from 'date-fns/getUnixTime';
-import { GROUP_BY_FILTER } from '../constants';
-import endOfDay from 'date-fns/endOfDay';
-
-const CUSTOM_DATE_RANGE_ID = 5;
+import { DATE_RANGE_OPTIONS } from '../constants';
+import { getUnixStartOfDay, getUnixEndOfDay } from 'helpers/DateHelper';
 
 export default {
   components: {
     WootDateRangePicker,
+    ReportsFiltersDateRange,
+    ReportsFiltersDateGroupBy,
+    ReportsFiltersAgents,
+    ReportsFiltersLabels,
+    ReportsFiltersInboxes,
+    ReportsFiltersTeams,
+    ReportsFiltersRatings,
   },
   props: {
     filterItemsList: {
       type: Array,
       default: () => [],
     },
-    agentsFilterItemsList: {
-      type: Array,
-      default: () => [],
-    },
-    selectedGroupByFilter: {
-      type: Object,
-      default: () => {},
-    },
-    groupByFilter: {
+    showGroupByFilter: {
       type: Boolean,
       default: false,
     },
-    agentsFilter: {
+    showAgentsFilter: {
+      type: Boolean,
+      default: false,
+    },
+    showLabelsFilter: {
+      type: Boolean,
+      default: false,
+    },
+    showInboxFilter: {
+      type: Boolean,
+      default: false,
+    },
+    showRatingFilter: {
+      type: Boolean,
+      default: false,
+    },
+    showTeamFilter: {
       type: Boolean,
       default: false,
     },
@@ -117,95 +106,134 @@ export default {
   },
   data() {
     return {
-      currentDateRangeSelection: this.$t('REPORT.DATE_RANGE')[0],
-      dateRange: this.$t('REPORT.DATE_RANGE'),
-      customDateRange: [new Date(), new Date()],
-      currentSelectedFilter: null,
+      // default value, need not be translated
+      selectedDateRange: DATE_RANGE_OPTIONS.LAST_7_DAYS,
+      selectedGroupByFilter: null,
+      selectedLabel: null,
+      selectedInbox: null,
+      selectedTeam: null,
+      selectedRating: null,
       selectedAgents: [],
+      customDateRange: [new Date(), new Date()],
       businessHoursSelected: false,
     };
   },
   computed: {
     isDateRangeSelected() {
-      return this.currentDateRangeSelection.id === CUSTOM_DATE_RANGE_ID;
+      return (
+        this.selectedDateRange.id === DATE_RANGE_OPTIONS.CUSTOM_DATE_RANGE.id
+      );
+    },
+    isGroupByPossible() {
+      return this.selectedDateRange.id !== DATE_RANGE_OPTIONS.LAST_7_DAYS.id;
     },
     to() {
       if (this.isDateRangeSelected) {
-        return this.toCustomDate(this.customDateRange[1]);
+        return getUnixEndOfDay(this.customDateRange[1]);
       }
-      return this.toCustomDate(new Date());
+      return getUnixEndOfDay(new Date());
     },
     from() {
       if (this.isDateRangeSelected) {
-        return this.fromCustomDate(this.customDateRange[0]);
+        return getUnixStartOfDay(this.customDateRange[0]);
       }
-      const dateRange = {
-        0: 6,
-        1: 29,
-        2: 89,
-        3: 179,
-        4: 364,
-      };
-      const diff = dateRange[this.currentDateRangeSelection.id];
-      const fromDate = subDays(new Date(), diff);
-      return this.fromCustomDate(fromDate);
+
+      const { offset } = this.selectedDateRange;
+      const fromDate = subDays(new Date(), offset);
+      return getUnixStartOfDay(fromDate);
     },
-    groupBy() {
-      if (this.isDateRangeSelected) {
-        return GROUP_BY_FILTER[4].period;
+    validGroupOptions() {
+      return this.selectedDateRange.groupByOptions;
+    },
+    validGroupBy() {
+      if (!this.selectedGroupByFilter) {
+        return this.validGroupOptions[0];
       }
-      const groupRange = {
-        0: GROUP_BY_FILTER[1].period,
-        1: GROUP_BY_FILTER[2].period,
-        2: GROUP_BY_FILTER[3].period,
-        3: GROUP_BY_FILTER[3].period,
-        4: GROUP_BY_FILTER[3].period,
-      };
-      return groupRange[this.currentDateRangeSelection.id];
-    },
-    notLast7Days() {
-      return this.groupBy !== GROUP_BY_FILTER[1].period;
+
+      const validIds = this.validGroupOptions.map(opt => opt.id);
+      if (validIds.includes(this.selectedGroupByFilter.id)) {
+        return this.selectedGroupByFilter;
+      }
+      return this.validGroupOptions[0];
     },
   },
   watch: {
-    filterItemsList() {
-      this.currentSelectedFilter = this.selectedGroupByFilter;
-    },
     businessHoursSelected() {
-      this.$emit('business-hours-toggle', this.businessHoursSelected);
+      this.emitChange();
     },
   },
   mounted() {
-    this.onDateRangeChange();
+    this.emitChange();
   },
   methods: {
-    onDateRangeChange() {
-      this.$emit('date-range-change', {
-        from: this.from,
-        to: this.to,
-        groupBy: this.groupBy,
+    emitChange() {
+      const {
+        from,
+        to,
+        selectedGroupByFilter: groupBy,
+        businessHoursSelected: businessHours,
+        selectedAgents,
+        selectedLabel,
+        selectedInbox,
+        selectedTeam,
+        selectedRating,
+      } = this;
+      this.$emit('filter-change', {
+        from,
+        to,
+        groupBy,
+        businessHours,
+        selectedAgents,
+        selectedLabel,
+        selectedInbox,
+        selectedTeam,
+        selectedRating,
       });
     },
-    fromCustomDate(date) {
-      return getUnixTime(startOfDay(date));
+    onDateRangeChange(selectedRange) {
+      this.selectedDateRange = selectedRange;
+      this.selectedGroupByFilter = this.validGroupBy;
+      this.emitChange();
     },
-    toCustomDate(date) {
-      return getUnixTime(endOfDay(date));
-    },
-    changeDateSelection(selectedRange) {
-      this.currentDateRangeSelection = selectedRange;
-      this.onDateRangeChange();
-    },
-    onChange(value) {
+    onCustomDateRangeChange(value) {
       this.customDateRange = value;
-      this.onDateRangeChange();
+      this.selectedGroupByFilter = this.validGroupBy;
+      this.emitChange();
     },
-    changeFilterSelection() {
-      this.$emit('filter-change', this.currentSelectedFilter);
+    onGroupingChange(payload) {
+      this.selectedGroupByFilter = payload;
+      this.emitChange();
     },
-    handleAgentsFilterSelection() {
-      this.$emit('agents-filter-change', this.selectedAgents);
+    handleAgentsFilterSelection(selectedAgents) {
+      this.selectedAgents = selectedAgents;
+      this.emitChange();
+    },
+    handleLabelsFilterSelection(selectedLabel) {
+      this.selectedLabel = selectedLabel;
+      this.emitChange();
+    },
+    handleInboxFilterSelection(selectedInbox) {
+      this.selectedInbox = selectedInbox;
+      this.emitChange();
+    },
+    handleTeamFilterSelection(selectedTeam) {
+      this.selectedTeam = selectedTeam;
+      this.emitChange();
+    },
+    handleRatingFilterSelection(selectedRating) {
+      this.selectedRating = selectedRating;
+      this.emitChange();
     },
   },
 };
 </script>
+
+<style scoped>
+.filter-container {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  grid-gap: var(--space-slab);
+
+  margin-bottom: var(--space-normal);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Agents.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Agents.vue
new file mode 100644
index 000000000..4baecbb48
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Agents.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="multiselect-wrap--small">
+    <multiselect
+      v-model="selectedOptions"
+      class="no-margin"
+      :options="options"
+      track-by="id"
+      label="name"
+      :multiple="true"
+      :close-on-select="false"
+      :clear-on-select="false"
+      :hide-selected="true"
+      :placeholder="$t('CSAT_REPORTS.FILTERS.AGENTS.PLACEHOLDER')"
+      selected-label
+      :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
+      :deselect-label="$t('FORMS.MULTISELECT.ENTER_TO_REMOVE')"
+      @input="handleInput"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+
+export default {
+  name: 'ReportsFiltersAgents',
+  data() {
+    return {
+      selectedOptions: [],
+    };
+  },
+  computed: {
+    ...mapGetters({
+      options: 'agents/getAgents',
+    }),
+  },
+  mounted() {
+    this.$store.dispatch('agents/get');
+  },
+  methods: {
+    handleInput() {
+      this.$emit('agents-filter-selection', this.selectedOptions);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/DateGroupBy.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/DateGroupBy.vue
new file mode 100644
index 000000000..a360c5e8d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/DateGroupBy.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="multiselect-wrap--small">
+    <p aria-hidden="true" class="hide">
+      {{ $t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL') }}
+    </p>
+    <multiselect
+      v-model="currentSelectedFilter"
+      class="no-margin"
+      track-by="id"
+      label="groupBy"
+      :placeholder="$t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL')"
+      :options="translatedOptions"
+      :allow-empty="false"
+      :show-labels="false"
+      @select="changeFilterSelection"
+    />
+  </div>
+</template>
+
+<script>
+import { GROUP_BY_OPTIONS } from '../../constants';
+
+const EVENT_NAME = 'on-grouping-change';
+
+export default {
+  name: 'ReportsFiltersDateGroupBy',
+  props: {
+    validGroupOptions: {
+      type: Array,
+      default: () => [GROUP_BY_OPTIONS.DAY],
+    },
+    selectedOption: {
+      type: Object,
+      default: () => GROUP_BY_OPTIONS.DAY,
+    },
+  },
+  data() {
+    return {
+      currentSelectedFilter: null,
+    };
+  },
+  computed: {
+    translatedOptions() {
+      return this.validGroupOptions.map(option => ({
+        ...option,
+        groupBy: this.$t(option.translationKey),
+      }));
+    },
+  },
+  watch: {
+    selectedOption: {
+      handler() {
+        this.currentSelectedFilter = {
+          ...this.selectedOption,
+          groupBy: this.$t(this.selectedOption.translationKey),
+        };
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    changeFilterSelection(selectedFilter) {
+      this.groupByOptions = this.$emit(EVENT_NAME, selectedFilter);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/DateRange.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/DateRange.vue
new file mode 100644
index 000000000..b98283ced
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/DateRange.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="multiselect-wrap--small">
+    <multiselect
+      v-model="selectedOption"
+      class="no-margin"
+      track-by="name"
+      label="name"
+      :placeholder="$t('FORMS.MULTISELECT.SELECT_ONE')"
+      selected-label
+      :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
+      deselect-label=""
+      :options="options"
+      :searchable="false"
+      :allow-empty="false"
+      @select="updateRange"
+    />
+  </div>
+</template>
+
+<script>
+import { DATE_RANGE_OPTIONS } from '../../constants';
+
+const EVENT_NAME = 'on-range-change';
+
+export default {
+  name: 'ReportFiltersDateRange',
+  data() {
+    const translatedOptions = Object.values(DATE_RANGE_OPTIONS).map(option => ({
+      ...option,
+      name: this.$t(option.translationKey),
+    }));
+
+    return {
+      // relies on translations, need to move it to constants
+      selectedOption: translatedOptions[0],
+      options: translatedOptions,
+    };
+  },
+  methods: {
+    updateRange(selectedRange) {
+      this.selectedOption = selectedRange;
+      this.$emit(EVENT_NAME, selectedRange);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Inboxes.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Inboxes.vue
new file mode 100644
index 000000000..652cb06a6
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Inboxes.vue
@@ -0,0 +1,40 @@
+<template>
+  <div class="multiselect-wrap--small">
+    <multiselect
+      v-model="selectedOption"
+      class="no-margin"
+      :placeholder="$t('INBOX_REPORTS.FILTER_DROPDOWN_LABEL')"
+      label="name"
+      track-by="id"
+      :options="options"
+      :option-height="24"
+      :show-labels="false"
+      @input="handleInput"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+
+export default {
+  name: 'ReportsFiltersInboxes',
+  data() {
+    return {
+      selectedOption: null,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      options: 'inboxes/getInboxes',
+    }),
+  },
+  mounted() {
+    this.$store.dispatch('inboxes/get');
+  },
+  methods: {
+    handleInput() {
+      this.$emit('inbox-filter-selection', this.selectedOption);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Labels.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Labels.vue
new file mode 100644
index 000000000..89491b788
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Labels.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="multiselect-wrap--small">
+    <multiselect
+      v-model="selectedOption"
+      class="no-margin"
+      :placeholder="$t('LABEL_REPORTS.FILTER_DROPDOWN_LABEL')"
+      label="title"
+      track-by="id"
+      :options="options"
+      :option-height="24"
+      :show-labels="false"
+      @input="handleInput"
+    >
+      <template slot="singleLabel" slot-scope="props">
+        <div class="reports-option__wrap">
+          <div
+            :style="{ backgroundColor: props.option.color }"
+            class="reports-option__rounded--item"
+          />
+          <span class="reports-option__desc">
+            <span class="reports-option__title">
+              {{ props.option.title }}
+            </span>
+          </span>
+        </div>
+      </template>
+      <template slot="option" slot-scope="props">
+        <div class="reports-option__wrap">
+          <div
+            :style="{ backgroundColor: props.option.color }"
+            class="
+                reports-option__rounded--item
+                reports-option__item
+                reports-option__label--swatch
+              "
+          />
+          <span class="reports-option__desc">
+            <span class="reports-option__title">
+              {{ props.option.title }}
+            </span>
+          </span>
+        </div>
+      </template>
+    </multiselect>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+
+export default {
+  name: 'ReportsFiltersLabels',
+  data() {
+    return {
+      selectedOption: null,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      options: 'labels/getLabels',
+    }),
+  },
+  mounted() {
+    this.$store.dispatch('labels/get');
+  },
+  methods: {
+    handleInput() {
+      this.$emit('labels-filter-selection', this.selectedOption);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Ratings.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Ratings.vue
new file mode 100644
index 000000000..49d6689ae
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Ratings.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="multiselect-wrap--small">
+    <multiselect
+      v-model="selectedOption"
+      class="no-margin"
+      :option-height="24"
+      :placeholder="$t('FORMS.MULTISELECT.SELECT_ONE')"
+      :options="options"
+      :show-labels="false"
+      track-by="value"
+      label="label"
+      @input="handleInput"
+    />
+  </div>
+</template>
+
+<script>
+import { CSAT_RATINGS } from 'shared/constants/messages';
+
+export default {
+  name: 'ReportFiltersRatings',
+  data() {
+    const translatedOptions = CSAT_RATINGS.reverse().map(option => ({
+      ...option,
+      label: this.$t(option.translationKey),
+    }));
+
+    return {
+      selectedOption: null,
+      options: translatedOptions,
+    };
+  },
+  methods: {
+    handleInput(selectedRating) {
+      this.$emit('rating-filter-selection', selectedRating);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Teams.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Teams.vue
new file mode 100644
index 000000000..f834a9e71
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Teams.vue
@@ -0,0 +1,40 @@
+<template>
+  <div class="multiselect-wrap--small">
+    <multiselect
+      v-model="selectedOption"
+      class="no-margin"
+      :placeholder="$t('TEAM_REPORTS.FILTER_DROPDOWN_LABEL')"
+      label="name"
+      track-by="id"
+      :options="options"
+      :option-height="24"
+      :show-labels="false"
+      @input="handleInput"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+
+export default {
+  name: 'ReportsFiltersTeams',
+  data() {
+    return {
+      selectedOption: null,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      options: 'teams/getTeams',
+    }),
+  },
+  mounted() {
+    this.$store.dispatch('teams/get');
+  },
+  methods: {
+    handleInput() {
+      this.$emit('team-filter-selection', this.selectedOption);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersAgents.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersAgents.spec.js
new file mode 100644
index 000000000..bb41685f9
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersAgents.spec.js
@@ -0,0 +1,59 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import ReportsFiltersAgents from '../../Filters/Agents';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+const mockStore = new Vuex.Store({
+  modules: {
+    agents: {
+      namespaced: true,
+      state: {
+        agents: [],
+      },
+      getters: {
+        getAgents: state => state.agents,
+      },
+      actions: {
+        get: jest.fn(),
+      },
+    },
+  },
+});
+
+const mountParams = {
+  localVue,
+  store: mockStore,
+  mocks: {
+    $t: msg => msg,
+  },
+  stubs: ['multiselect'],
+};
+
+describe('ReportsFiltersAgents.vue', () => {
+  it('emits "agents-filter-selection" event when handleInput is called', () => {
+    const wrapper = shallowMount(ReportsFiltersAgents, mountParams);
+
+    const selectedAgents = [
+      { id: 1, name: 'Agent 1' },
+      { id: 2, name: 'Agent 2' },
+    ];
+    wrapper.setData({ selectedOptions: selectedAgents });
+
+    wrapper.vm.handleInput();
+
+    expect(wrapper.emitted('agents-filter-selection')).toBeTruthy();
+    expect(wrapper.emitted('agents-filter-selection')[0]).toEqual([
+      selectedAgents,
+    ]);
+  });
+
+  it('dispatches the "agents/get" action when the component is mounted', () => {
+    const dispatchSpy = jest.spyOn(mockStore, 'dispatch');
+
+    shallowMount(ReportsFiltersAgents, mountParams);
+
+    expect(dispatchSpy).toHaveBeenCalledWith('agents/get');
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersDateGroupBy.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersDateGroupBy.spec.js
new file mode 100644
index 000000000..0823b7582
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersDateGroupBy.spec.js
@@ -0,0 +1,45 @@
+import { shallowMount } from '@vue/test-utils';
+import ReportsFiltersDateGroupBy from '../../Filters/DateGroupBy';
+import { GROUP_BY_OPTIONS } from '../../../constants';
+
+const mountParams = {
+  mocks: {
+    $t: msg => msg,
+  },
+  stubs: ['multiselect'],
+};
+
+describe('ReportsFiltersDateGroupBy.vue', () => {
+  it('emits "on-grouping-change" event when changeFilterSelection is called', () => {
+    const wrapper = shallowMount(ReportsFiltersDateGroupBy, mountParams);
+
+    const selectedFilter = GROUP_BY_OPTIONS.DAY;
+    wrapper.vm.changeFilterSelection(selectedFilter);
+
+    expect(wrapper.emitted('on-grouping-change')).toBeTruthy();
+    expect(wrapper.emitted('on-grouping-change')[0]).toEqual([selectedFilter]);
+  });
+
+  it('updates currentSelectedFilter when selectedOption is changed', async () => {
+    const wrapper = shallowMount(ReportsFiltersDateGroupBy, mountParams);
+
+    const newSelectedOption = GROUP_BY_OPTIONS.MONTH;
+    await wrapper.setProps({ selectedOption: newSelectedOption });
+
+    expect(wrapper.vm.currentSelectedFilter).toEqual({
+      ...newSelectedOption,
+      groupBy: newSelectedOption.translationKey,
+    });
+  });
+
+  it('initializes translatedOptions correctly', () => {
+    const wrapper = shallowMount(ReportsFiltersDateGroupBy, mountParams);
+
+    const expectedOptions = wrapper.vm.validGroupOptions.map(option => ({
+      ...option,
+      groupBy: option.translationKey,
+    }));
+
+    expect(wrapper.vm.translatedOptions).toEqual(expectedOptions);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersDateRange.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersDateRange.spec.js
new file mode 100644
index 000000000..6da4172fb
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersDateRange.spec.js
@@ -0,0 +1,42 @@
+import { shallowMount } from '@vue/test-utils';
+import ReportFiltersDateRange from '../../Filters/DateRange';
+import { DATE_RANGE_OPTIONS } from '../../../constants';
+
+const mountParams = {
+  mocks: {
+    $t: msg => msg,
+  },
+  stubs: ['multiselect'],
+};
+
+describe('ReportFiltersDateRange.vue', () => {
+  it('emits "on-range-change" event when updateRange is called', () => {
+    const wrapper = shallowMount(ReportFiltersDateRange, mountParams);
+
+    const selectedRange = DATE_RANGE_OPTIONS.LAST_7_DAYS;
+    wrapper.vm.updateRange(selectedRange);
+
+    expect(wrapper.emitted('on-range-change')).toBeTruthy();
+    expect(wrapper.emitted('on-range-change')[0]).toEqual([selectedRange]);
+  });
+
+  it('initializes options correctly', () => {
+    const wrapper = shallowMount(ReportFiltersDateRange, mountParams);
+
+    const expectedOptions = Object.values(DATE_RANGE_OPTIONS).map(option => ({
+      ...option,
+      name: option.translationKey,
+    }));
+
+    expect(wrapper.vm.options).toEqual(expectedOptions);
+  });
+
+  it('initializes selectedOption correctly', () => {
+    const wrapper = shallowMount(ReportFiltersDateRange, mountParams);
+    const expectedSelectedOption = Object.values(DATE_RANGE_OPTIONS)[0];
+    expect(wrapper.vm.selectedOption).toEqual({
+      ...expectedSelectedOption,
+      name: expectedSelectedOption.translationKey,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersInboxes.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersInboxes.spec.js
new file mode 100644
index 000000000..7b35a17e0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersInboxes.spec.js
@@ -0,0 +1,66 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import ReportsFiltersInboxes from '../../Filters/Inboxes';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+const mountParams = {
+  mocks: {
+    $t: msg => msg,
+  },
+  stubs: ['multiselect'],
+};
+
+describe('ReportsFiltersInboxes.vue', () => {
+  let store;
+  let inboxesModule;
+
+  beforeEach(() => {
+    inboxesModule = {
+      namespaced: true,
+      getters: {
+        getInboxes: () => () => [
+          { id: 1, name: 'Inbox 1' },
+          { id: 2, name: 'Inbox 2' },
+        ],
+      },
+      actions: {
+        get: jest.fn(),
+      },
+    };
+
+    store = new Vuex.Store({
+      modules: {
+        inboxes: inboxesModule,
+      },
+    });
+  });
+
+  it('dispatches "inboxes/get" action when component is mounted', () => {
+    shallowMount(ReportsFiltersInboxes, {
+      store,
+      localVue,
+      ...mountParams,
+    });
+    expect(inboxesModule.actions.get).toHaveBeenCalled();
+  });
+
+  it('emits "inbox-filter-selection" event when handleInput is called', () => {
+    const wrapper = shallowMount(ReportsFiltersInboxes, {
+      store,
+      localVue,
+      ...mountParams,
+    });
+
+    const selectedInbox = { id: 1, name: 'Inbox 1' };
+    wrapper.setData({ selectedOption: selectedInbox });
+
+    wrapper.vm.handleInput();
+
+    expect(wrapper.emitted('inbox-filter-selection')).toBeTruthy();
+    expect(wrapper.emitted('inbox-filter-selection')[0]).toEqual([
+      selectedInbox,
+    ]);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersLabels.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersLabels.spec.js
new file mode 100644
index 000000000..a95edefe4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersLabels.spec.js
@@ -0,0 +1,66 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import ReportsFiltersLabels from '../../Filters/Labels';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+const mountParams = {
+  mocks: {
+    $t: msg => msg,
+  },
+  stubs: ['multiselect'],
+};
+
+describe('ReportsFiltersLabels.vue', () => {
+  let store;
+  let labelsModule;
+
+  beforeEach(() => {
+    labelsModule = {
+      namespaced: true,
+      getters: {
+        getLabels: () => () => [
+          { id: 1, title: 'Label 1', color: 'red' },
+          { id: 2, title: 'Label 2', color: 'blue' },
+        ],
+      },
+      actions: {
+        get: jest.fn(),
+      },
+    };
+
+    store = new Vuex.Store({
+      modules: {
+        labels: labelsModule,
+      },
+    });
+  });
+
+  it('dispatches "labels/get" action when component is mounted', () => {
+    shallowMount(ReportsFiltersLabels, {
+      store,
+      localVue,
+      ...mountParams,
+    });
+    expect(labelsModule.actions.get).toHaveBeenCalled();
+  });
+
+  it('emits "labels-filter-selection" event when handleInput is called', () => {
+    const wrapper = shallowMount(ReportsFiltersLabels, {
+      store,
+      localVue,
+      ...mountParams,
+    });
+
+    const selectedLabel = { id: 1, title: 'Label 1', color: 'red' };
+    wrapper.setData({ selectedOption: selectedLabel });
+
+    wrapper.vm.handleInput();
+
+    expect(wrapper.emitted('labels-filter-selection')).toBeTruthy();
+    expect(wrapper.emitted('labels-filter-selection')[0]).toEqual([
+      selectedLabel,
+    ]);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersRatings.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersRatings.spec.js
new file mode 100644
index 000000000..f5d46b053
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersRatings.spec.js
@@ -0,0 +1,45 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import ReportFiltersRatings from '../../Filters/Ratings';
+import { CSAT_RATINGS } from 'shared/constants/messages';
+
+const mountParams = {
+  mocks: {
+    $t: msg => msg,
+  },
+  stubs: ['multiselect'],
+};
+
+const localVue = createLocalVue();
+
+describe('ReportFiltersRatings.vue', () => {
+  it('emits "rating-filter-selection" event when handleInput is called', () => {
+    const wrapper = shallowMount(ReportFiltersRatings, {
+      localVue,
+      ...mountParams,
+    });
+
+    const selectedRating = { value: 1, label: 'Rating 1' };
+    wrapper.setData({ selectedOption: selectedRating });
+
+    wrapper.vm.handleInput(selectedRating);
+
+    expect(wrapper.emitted('rating-filter-selection')).toBeTruthy();
+    expect(wrapper.emitted('rating-filter-selection')[0]).toEqual([
+      selectedRating,
+    ]);
+  });
+
+  it('initializes options correctly', () => {
+    const wrapper = shallowMount(ReportFiltersRatings, {
+      localVue,
+      ...mountParams,
+    });
+
+    const expectedOptions = CSAT_RATINGS.map(option => ({
+      ...option,
+      label: option.translationKey,
+    }));
+
+    expect(wrapper.vm.options).toEqual(expectedOptions);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersTeams.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersTeams.spec.js
new file mode 100644
index 000000000..3a693c32a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/Filters/FiltersTeams.spec.js
@@ -0,0 +1,62 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import ReportsFiltersTeams from '../../Filters/Teams.vue';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+const mountParams = {
+  mocks: {
+    $t: msg => msg,
+  },
+  stubs: ['multiselect'],
+};
+
+describe('ReportsFiltersTeams.vue', () => {
+  let store;
+  let teamsModule;
+
+  beforeEach(() => {
+    teamsModule = {
+      namespaced: true,
+      getters: {
+        getTeams: () => () => [
+          { id: 1, name: 'Team 1' },
+          { id: 2, name: 'Team 2' },
+        ],
+      },
+      actions: {
+        get: jest.fn(),
+      },
+    };
+
+    store = new Vuex.Store({
+      modules: {
+        teams: teamsModule,
+      },
+    });
+  });
+
+  it('dispatches "teams/get" action when component is mounted', () => {
+    shallowMount(ReportsFiltersTeams, {
+      store,
+      localVue,
+      ...mountParams,
+    });
+    expect(teamsModule.actions.get).toHaveBeenCalled();
+  });
+
+  it('emits "team-filter-selection" event when handleInput is called', () => {
+    const wrapper = shallowMount(ReportsFiltersTeams, {
+      store,
+      localVue,
+      ...mountParams,
+    });
+    wrapper.setData({ selectedOption: { id: 1, name: 'Team 1' } });
+    wrapper.vm.handleInput();
+    expect(wrapper.emitted('team-filter-selection')).toBeTruthy();
+    expect(wrapper.emitted('team-filter-selection')[0]).toEqual([
+      { id: 1, name: 'Team 1' },
+    ]);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
index 1e345fe22..46e7549f0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
@@ -7,6 +7,85 @@ export const GROUP_BY_FILTER = {
   4: { id: 4, period: 'year' },
 };
 
+export const GROUP_BY_OPTIONS = {
+  DAY: {
+    id: 'DAY',
+    period: 'day',
+    translationKey: 'REPORT.GROUPING_OPTIONS.DAY',
+  },
+  WEEK: {
+    id: 'WEEK',
+    period: 'week',
+    translationKey: 'REPORT.GROUPING_OPTIONS.WEEK',
+  },
+  MONTH: {
+    id: 'MONTH',
+    period: 'month',
+    translationKey: 'REPORT.GROUPING_OPTIONS.MONTH',
+  },
+  YEAR: {
+    id: 'YEAR',
+    period: 'year',
+    translationKey: 'REPORT.GROUPING_OPTIONS.YEAR',
+  },
+};
+
+export const DATE_RANGE_OPTIONS = {
+  LAST_7_DAYS: {
+    id: 'LAST_7_DAYS',
+    translationKey: 'REPORT.DATE_RANGE_OPTIONS.LAST_7_DAYS',
+    offset: 6,
+    groupByOptions: [GROUP_BY_OPTIONS.DAY],
+  },
+  LAST_30_DAYS: {
+    id: 'LAST_30_DAYS',
+    translationKey: 'REPORT.DATE_RANGE_OPTIONS.LAST_30_DAYS',
+    offset: 29,
+    groupByOptions: [GROUP_BY_OPTIONS.DAY, GROUP_BY_OPTIONS.WEEK],
+  },
+  LAST_3_MONTHS: {
+    id: 'LAST_3_MONTHS',
+    translationKey: 'REPORT.DATE_RANGE_OPTIONS.LAST_3_MONTHS',
+    offset: 89,
+    groupByOptions: [
+      GROUP_BY_OPTIONS.DAY,
+      GROUP_BY_OPTIONS.WEEK,
+      GROUP_BY_OPTIONS.MONTH,
+    ],
+  },
+  LAST_6_MONTHS: {
+    id: 'LAST_6_MONTHS',
+    translationKey: 'REPORT.DATE_RANGE_OPTIONS.LAST_6_MONTHS',
+    offset: 179,
+    groupByOptions: [
+      GROUP_BY_OPTIONS.DAY,
+      GROUP_BY_OPTIONS.WEEK,
+      GROUP_BY_OPTIONS.MONTH,
+    ],
+  },
+  LAST_YEAR: {
+    id: 'LAST_YEAR',
+    translationKey: 'REPORT.DATE_RANGE_OPTIONS.LAST_YEAR',
+    offset: 364,
+    groupByOptions: [
+      GROUP_BY_OPTIONS.DAY,
+      GROUP_BY_OPTIONS.WEEK,
+      GROUP_BY_OPTIONS.MONTH,
+    ],
+  },
+  CUSTOM_DATE_RANGE: {
+    id: 'CUSTOM_DATE_RANGE',
+    translationKey: 'REPORT.DATE_RANGE_OPTIONS.CUSTOM_DATE_RANGE',
+    offset: null,
+    groupByOptions: [
+      GROUP_BY_OPTIONS.DAY,
+      GROUP_BY_OPTIONS.WEEK,
+      GROUP_BY_OPTIONS.MONTH,
+      GROUP_BY_OPTIONS.YEAR,
+    ],
+  },
+};
+
 export const CHART_FONT_FAMILY =
   '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
 
diff --git a/app/javascript/dashboard/store/modules/csat.js b/app/javascript/dashboard/store/modules/csat.js
index 4806ef3a0..2cf929862 100644
--- a/app/javascript/dashboard/store/modules/csat.js
+++ b/app/javascript/dashboard/store/modules/csat.js
@@ -85,13 +85,10 @@ export const getters = {
 };
 
 export const actions = {
-  get: async function getResponses(
-    { commit },
-    { page = 1, from, to, user_ids } = {}
-  ) {
+  get: async function getResponses({ commit }, params) {
     commit(types.SET_CSAT_RESPONSE_UI_FLAG, { isFetching: true });
     try {
-      const response = await CSATReports.get({ page, from, to, user_ids });
+      const response = await CSATReports.get(params);
       commit(types.SET_CSAT_RESPONSE, response.data);
     } catch (error) {
       // Ignore error
@@ -99,10 +96,10 @@ export const actions = {
       commit(types.SET_CSAT_RESPONSE_UI_FLAG, { isFetching: false });
     }
   },
-  getMetrics: async function getMetrics({ commit }, { from, to, user_ids }) {
+  getMetrics: async function getMetrics({ commit }, params) {
     commit(types.SET_CSAT_RESPONSE_UI_FLAG, { isFetchingMetrics: true });
     try {
-      const response = await CSATReports.getMetrics({ from, to, user_ids });
+      const response = await CSATReports.getMetrics(params);
       commit(types.SET_CSAT_RESPONSE_METRICS, response.data);
     } catch (error) {
       // Ignore error
diff --git a/app/javascript/shared/constants/messages.js b/app/javascript/shared/constants/messages.js
index c21248607..1713fe70c 100644
--- a/app/javascript/shared/constants/messages.js
+++ b/app/javascript/shared/constants/messages.js
@@ -59,24 +59,28 @@ export const ALLOWED_FILE_TYPES_FOR_TWILIO_WHATSAPP =
 export const CSAT_RATINGS = [
   {
     key: 'disappointed',
+    translationKey: 'CSAT.RATINGS.POOR',
     emoji: '😞',
     value: 1,
     color: '#FDAD2A',
   },
   {
     key: 'expressionless',
+    translationKey: 'CSAT.RATINGS.FAIR',
     emoji: '😑',
     value: 2,
     color: '#FFC532',
   },
   {
     key: 'neutral',
+    translationKey: 'CSAT.RATINGS.AVERAGE',
     emoji: '😐',
     value: 3,
     color: '#FCEC56',
   },
   {
     key: 'grinning',
+    translationKey: 'CSAT.RATINGS.GOOD',
     emoji: '😀',
     value: 4,
     color: '#6FD86F',
@@ -84,6 +88,7 @@ export const CSAT_RATINGS = [
   {
     key: 'smiling',
     emoji: '😍',
+    translationKey: 'CSAT.RATINGS.EXCELLENT',
     value: 5,
     color: '#44CE4B',
   },
diff --git a/app/javascript/shared/helpers/DateHelper.js b/app/javascript/shared/helpers/DateHelper.js
index c8b0f231b..12de33755 100644
--- a/app/javascript/shared/helpers/DateHelper.js
+++ b/app/javascript/shared/helpers/DateHelper.js
@@ -2,6 +2,7 @@ import fromUnixTime from 'date-fns/fromUnixTime';
 import format from 'date-fns/format';
 import isToday from 'date-fns/isToday';
 import isYesterday from 'date-fns/isYesterday';
+import { endOfDay, getUnixTime, startOfDay } from 'date-fns';
 
 export const formatUnixDate = (date, dateFormat = 'MMM dd, yyyy') => {
   const unixDate = fromUnixTime(date);
@@ -31,6 +32,12 @@ export const isTimeAfter = (h1, m1, h2, m2) => {
   return true;
 };
 
+/** Get start of day as a UNIX timestamp */
+export const getUnixStartOfDay = date => getUnixTime(startOfDay(date));
+
+/** Get end of day as a UNIX timestamp */
+export const getUnixEndOfDay = date => getUnixTime(endOfDay(date));
+
 export const generateRelativeTime = (value, unit, languageCode) => {
   const rtf = new Intl.RelativeTimeFormat(languageCode, {
     numeric: 'auto',
diff --git a/app/models/csat_survey_response.rb b/app/models/csat_survey_response.rb
index 92ea25ebe..68edf0ab1 100644
--- a/app/models/csat_survey_response.rb
+++ b/app/models/csat_survey_response.rb
@@ -35,4 +35,8 @@ class CsatSurveyResponse < ApplicationRecord
 
   scope :filter_by_created_at, ->(range) { where(created_at: range) if range.present? }
   scope :filter_by_assigned_agent_id, ->(user_ids) { where(assigned_agent_id: user_ids) if user_ids.present? }
+  scope :filter_by_inbox_id, ->(inbox_id) { joins(:conversation).where(conversations: { inbox_id: inbox_id }) if inbox_id.present? }
+  scope :filter_by_team_id, ->(team_id) { joins(:conversation).where(conversations: { team_id: team_id }) if team_id.present? }
+  # filter by rating value
+  scope :filter_by_rating, ->(rating) { where(rating: rating) if rating.present? }
 end

From b988a01df367e725d30c0870850247a66e1a0077 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 19 May 2023 14:24:49 +0530
Subject: [PATCH 09/93] fix: exclude private and activity messages from public
 API (#7123)

- Exclude private messages
---
 .../api/v1/models/_conversation.json.jbuilder |  2 +-
 .../v1/inbox/conversations_controller_spec.rb | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/views/public/api/v1/models/_conversation.json.jbuilder b/app/views/public/api/v1/models/_conversation.json.jbuilder
index 793deec48..29ec89e28 100644
--- a/app/views/public/api/v1/models/_conversation.json.jbuilder
+++ b/app/views/public/api/v1/models/_conversation.json.jbuilder
@@ -4,7 +4,7 @@ json.contact_last_seen_at resource.contact_last_seen_at.to_i
 json.status resource.status
 json.agent_last_seen_at resource.agent_last_seen_at.to_i
 json.messages do
-  json.array! resource.messages do |message|
+  json.array! resource.messages.chat do |message|
     json.partial! 'public/api/v1/models/message', formats: [:json], resource: message
   end
 end
diff --git a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
index a4a711b04..c5b7402fc 100644
--- a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
@@ -14,6 +14,25 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
       data = JSON.parse(response.body)
       expect(data.length).to eq 1
     end
+
+    it 'does not return any private or activity message' do
+      conversation = create(:conversation, contact_inbox: contact_inbox)
+      create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'message-1')
+      create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'message-2')
+      create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'private-message-1',
+                       private: true)
+      create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'activity-message-1',
+                       message_type: :activity)
+
+      get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations"
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data.length).to eq 1
+      expect(data.first['messages'].length).to eq 2
+      expect(data.first['messages'].map { |m| m['content'] }).not_to include('private-message-1')
+      expect(data.first['messages'].map { |m| m['message_type'] }).not_to include('activity')
+    end
   end
 
   describe 'POST /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations' do

From 7ab7bac6bff9d700d7b3e50f9b36c2a7dd5c3dcc Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 19 May 2023 14:37:10 +0530
Subject: [PATCH 10/93] chore: Enable the new Rubocop rules (#7122)

fixes: https://linear.app/chatwoot/issue/CW-1574/renable-the-disabled-rubocop-rules
---
 .rubocop.yml                                  | 54 +++++++----------
 .../api/v1/accounts/articles_controller.rb    |  7 +--
 .../accounts/automation_rules_controller.rb   |  4 +-
 .../api/v1/accounts/campaigns_controller.rb   | 12 ++--
 .../api/v1/accounts/categories_controller.rb  |  4 +-
 .../v1/accounts/contacts/notes_controller.rb  | 12 ++--
 .../v1/accounts/conversations_controller.rb   |  4 +-
 .../v1/accounts/inbox_members_controller.rb   | 10 ++--
 .../api/v1/accounts/macros_controller.rb      | 28 ++++-----
 app/controllers/api/v1/accounts_controller.rb | 10 ++--
 .../devise_overrides/passwords_controller.rb  | 20 +++----
 .../devise_overrides/sessions_controller.rb   |  2 +-
 .../token_validations_controller.rb           |  2 +-
 .../platform/api/v1/accounts_controller.rb    |  4 +-
 .../platform/api/v1/agent_bots_controller.rb  |  4 +-
 .../platform/api/v1/users_controller.rb       |  4 +-
 .../api/v1/inboxes/contacts_controller.rb     |  4 +-
 .../super_admin/accounts_controller.rb        |  4 ++
 app/controllers/swagger_controller.rb         |  2 +-
 app/models/concerns/featurable.rb             |  4 +-
 app/models/conversation.rb                    |  4 +-
 app/models/installation_config.rb             |  2 +-
 config/initializers/actioncable.rb            |  2 +-
 db/migrate/20230202132107_install_audited.rb  |  4 +-
 db/seeds.rb                                   |  4 +-
 lib/custom_exceptions/base.rb                 |  2 +-
 lib/seeders/account_seeder.rb                 |  2 +-
 spec/actions/contact_identify_action_spec.rb  |  2 +-
 spec/actions/contact_merge_action_spec.rb     |  2 +-
 .../campaign_conversation_builder_spec.rb     |  2 +-
 spec/builders/contact_inbox_builder_spec.rb   |  2 +-
 ...contact_inbox_with_contact_builder_spec.rb |  2 +-
 spec/builders/conversation_builder_spec.rb    |  2 +-
 .../csat_surveys/response_builder_spec.rb     |  2 +-
 .../messages/facebook/message_builder_spec.rb |  2 +-
 .../instagram/message_builder_spec.rb         |  2 +-
 .../builders/messages/message_builder_spec.rb |  2 +-
 spec/builders/notification_builder_spec.rb    |  2 +-
 spec/builders/v2/report_builder_spec.rb       | 32 +++++-----
 spec/channels/room_channel_spec.rb            |  2 +-
 spec/configs/schedule_spec.rb                 |  2 +-
 spec/controllers/api/base_controller_spec.rb  |  2 +-
 .../actions/contact_merges_controller_spec.rb |  2 +-
 .../api/v1/accounts/agents_controller_spec.rb |  6 +-
 .../v1/accounts/articles_controller_spec.rb   | 26 ++++----
 .../automation_rules_controller_spec.rb       |  6 +-
 .../v1/accounts/campaigns_controller_spec.rb  |  2 +-
 .../canned_responses_controller_spec.rb       |  4 +-
 .../v1/accounts/categories_controller_spec.rb | 12 ++--
 .../twilio_channels_controller_spec.rb        | 16 ++---
 .../contacts/conversations_controller_spec.rb |  6 +-
 .../contacts/notes_controller_spec.rb         |  2 +-
 .../v1/accounts/contacts_controller_spec.rb   | 34 +++++------
 .../direct_uploads_controller_spec.rb         |  2 +-
 .../conversations/messages_controller_spec.rb |  4 +-
 .../accounts/conversations_controller_spec.rb |  4 +-
 .../csat_survey_responses_controller_spec.rb  | 12 ++--
 ...m_attribute_definitions_controller_spec.rb |  4 +-
 .../custom_filters_controller_spec.rb         |  4 +-
 .../dashboard_apps_controller_spec.rb         |  8 +--
 .../accounts/inbox_members_controller_spec.rb |  2 +-
 .../v1/accounts/inboxes_controller_spec.rb    |  8 +--
 .../integrations/apps_controller_spec.rb      | 16 ++---
 .../integrations/dyte_controller_spec.rb      |  6 +-
 .../integrations/hooks_controller_spec.rb     |  6 +-
 .../api/v1/accounts/macros_controller_spec.rb | 22 +++----
 .../authorization_controller_spec.rb          |  4 +-
 .../notification_settings_controller_spec.rb  |  4 +-
 .../accounts/notifications_controller_spec.rb |  4 +-
 .../v1/accounts/portals_controller_spec.rb    | 16 ++---
 .../api/v1/accounts/search_controller_spec.rb |  8 +--
 .../accounts/team_members_controller_spec.rb  |  8 +--
 .../api/v1/accounts/teams_controller_spec.rb  |  4 +-
 .../twitter/authorizations_controller_spec.rb |  2 +-
 .../v1/accounts/webhook_controller_spec.rb    | 14 ++---
 .../api/v1/accounts_controller_spec.rb        |  4 +-
 ...ification_subscriptions_controller_spec.rb |  6 +-
 .../api/v1/profiles_controller_spec.rb        | 16 ++---
 .../v1/widget/campaigns_controller_spec.rb    |  2 +-
 .../api/v1/widget/configs_controller_spec.rb  |  8 +--
 .../api/v1/widget/contacts_controller_spec.rb | 12 ++--
 .../widget/conversations_controller_spec.rb   | 16 ++---
 .../widget/direct_uploads_controller_spec.rb  |  4 +-
 .../api/v1/widget/events_controller_spec.rb   |  2 +-
 .../widget/inbox_members_controller_spec.rb   |  2 +-
 .../integrations/dyte_controller_spec.rb      |  6 +-
 .../api/v1/widget/labels_controller_spec.rb   |  2 +-
 .../api/v1/widget/messages_controller_spec.rb | 12 ++--
 .../api/v2/accounts/report_controller_spec.rb | 12 ++--
 .../onboarding_controller_spec.rb             | 14 ++---
 .../api/v1/account_users_controller_spec.rb   |  4 +-
 .../api/v1/accounts_controller_spec.rb        |  4 +-
 .../api/v1/agent_bots_controller_spec.rb      | 10 ++--
 .../platform/api/v1/users_controller_spec.rb  | 12 ++--
 .../api/v1/csat_survey_controller_spec.rb     |  4 +-
 .../v1/inbox/conversations_controller_spec.rb |  4 +-
 .../api/v1/inbox/messages_controller_spec.rb  | 12 ++--
 .../public/api/v1/portals_controller_spec.rb  |  2 +-
 .../twilio/callbacks_controller_spec.rb       |  2 +-
 .../twitter/callbacks_controller_spec.rb      | 12 ++--
 .../webhooks/instagram_controller_spec.rb     |  4 +-
 spec/controllers/widgets_controller_spec.rb   |  2 +-
 .../app_commands/activerecord_fixtures.rb     |  2 +-
 spec/cypress/app_commands/log_fail.rb         |  2 +-
 spec/drops/contact_drop_spec.rb               |  2 +-
 spec/drops/user_drop_spec.rb                  |  2 +-
 spec/factories/channel/channel_telegram.rb    |  4 +-
 spec/factories/channel/channel_whatsapp.rb    |  4 +-
 spec/factories/messages.rb                    |  4 +-
 spec/finders/conversation_finder_spec.rb      |  2 +-
 spec/finders/email_channel_finder_spec.rb     |  2 +-
 spec/finders/message_finder_spec.rb           |  2 +-
 spec/helpers/cache_keys_helper_spec.rb        |  2 +-
 spec/helpers/email_helper_spec.rb             |  2 +-
 spec/helpers/frontend_urls_helper_spec.rb     |  2 +-
 spec/helpers/message_format_helper_spec.rb    |  2 +-
 spec/helpers/url_helper_spec.rb               |  2 +-
 ...ersations_resolution_scheduler_job_spec.rb |  2 +-
 spec/jobs/agent_bots/csml_job_spec.rb         |  2 +-
 spec/jobs/agent_bots/webhook_job_spec.rb      |  2 +-
 spec/jobs/agents/destroy_job_spec.rb          |  2 +-
 .../avatar/avatar_from_gravatar_job_spec.rb   |  2 +-
 spec/jobs/avatar/avatar_from_url_job_spec.rb  |  2 +-
 spec/jobs/bulk_actions_job_spec.rb            |  2 +-
 .../trigger_oneoff_campaign_job_spec.rb       |  2 +-
 .../whatsapp/templates_sync_job_spec.rb       |  2 +-
 .../templates_sync_scheduler_job_spec.rb      |  2 +-
 .../reopen_snoozed_conversations_job_spec.rb  |  2 +-
 .../jobs/conversations/resolution_job_spec.rb |  2 +-
 spec/jobs/data_import_job_spec.rb             |  2 +-
 spec/jobs/delete_object_job_spec.rb           |  2 +-
 spec/jobs/event_dispatcher_job_spec.rb        |  2 +-
 spec/jobs/hook_job_spec.rb                    |  2 +-
 .../fetch_imap_email_inboxes_job_spec.rb      |  2 +-
 .../inboxes/fetch_imap_emails_job_spec.rb     |  2 +-
 ..._widget_pre_chat_custom_fields_job_spec.rb |  2 +-
 ..._widget_pre_chat_custom_fields_job_spec.rb |  2 +-
 .../internal/check_new_versions_job_spec.rb   |  4 +-
 spec/jobs/labels/update_job_spec.rb           |  2 +-
 ...rsations_first_reply_scheduler_job_spec.rb |  2 +-
 spec/jobs/send_reply_job_spec.rb              | 26 ++++----
 spec/jobs/trigger_scheduled_items_job_spec.rb |  2 +-
 spec/jobs/webhook_job_spec.rb                 |  2 +-
 .../jobs/webhooks/facebook_events_job_spec.rb | 10 ++--
 spec/jobs/webhooks/line_events_job_spec.rb    |  2 +-
 spec/jobs/webhooks/sms_events_job_spec.rb     |  2 +-
 .../jobs/webhooks/telegram_events_job_spec.rb |  2 +-
 .../jobs/webhooks/whatsapp_events_job_spec.rb |  2 +-
 .../db_resolver_service_spec.rb               |  2 +-
 .../dialogflow/processor_service_spec.rb      |  2 +-
 .../detect_language_service_spec.rb           |  4 +-
 .../slack/send_on_slack_service_spec.rb       |  2 +-
 spec/lib/online_status_tracker_spec.rb        |  6 +-
 spec/lib/redis/config_spec.rb                 | 10 ++--
 spec/mailboxes/application_mailbox_spec.rb    |  2 +-
 spec/mailboxes/imap/imap_mailbox_spec.rb      |  2 +-
 spec/mailboxes/reply_mailbox_spec.rb          |  2 +-
 spec/mailboxes/support_mailbox_spec.rb        |  2 +-
 .../channel_notifications_mailer_spec.rb      |  2 +-
 .../conversation_notifications_mailer_spec.rb |  6 +-
 .../mailers/confirmation_instructions_spec.rb |  2 +-
 .../mailers/conversation_reply_mailer_spec.rb |  2 +-
 spec/models/agent_bot_inbox_spec.rb           |  2 +-
 spec/models/agent_bot_spec.rb                 |  2 +-
 spec/models/article_spec.rb                   |  2 +-
 spec/models/attachment_spec.rb                |  6 +-
 spec/models/automation_rule_spec.rb           |  2 +-
 spec/models/campaign_spec.rb                  |  2 +-
 spec/models/category_spec.rb                  |  2 +-
 spec/models/channel/telegram_spec.rb          |  6 +-
 spec/models/channel/twilio_sms_spec.rb        |  2 +-
 spec/models/conversation_participants_spec.rb |  2 +-
 spec/models/conversation_spec.rb              |  2 +-
 spec/models/csat_survey_response_spec.rb      |  2 +-
 spec/models/data_import_spec.rb               |  2 +-
 spec/models/folder_spec.rb                    |  2 +-
 spec/models/inbox_member_spec.rb              |  1 +
 spec/models/integrations/hook_spec.rb         |  2 +-
 spec/models/label_spec.rb                     |  2 +-
 spec/models/macro_spec.rb                     |  2 +-
 spec/models/mention_spec.rb                   |  2 +-
 spec/models/message_spec.rb                   | 10 ++--
 spec/models/note_spec.rb                      |  2 +-
 spec/models/portal_member_spec.rb             |  2 +-
 spec/models/portal_spec.rb                    |  2 +-
 spec/models/related_category_spec.rb          |  2 +-
 spec/models/reporting_event_spec.rb           |  2 +-
 spec/models/team_member_spec.rb               |  2 +-
 spec/models/team_spec.rb                      |  2 +-
 spec/models/webhook_spec.rb                   |  2 +-
 .../integrations/slack_request_spec.rb        |  6 +-
 .../v1/integrations/webhooks_request_spec.rb  |  2 +-
 spec/services/action_service_spec.rb          |  2 +-
 .../agent_assignment_service_spec.rb          |  2 +-
 .../automation_rules/action_service_spec.rb   | 10 ++--
 spec/services/contacts/filter_service_spec.rb |  2 +-
 .../conversations/filter_service_spec.rb      |  2 +-
 .../facebook/send_on_facebook_service_spec.rb | 16 ++---
 .../send_on_instagram_service_spec.rb         |  9 +--
 .../hook_execution_service_spec.rb            | 60 +++++++++----------
 .../template/csat_survey_spec.rb              |  2 +-
 .../template/email_collect_spec.rb            |  2 +-
 .../template/greeting_spec.rb                 |  2 +-
 .../template/out_of_office_spec.rb            |  2 +-
 .../services/messages/mention_service_spec.rb |  2 +-
 spec/services/search_service_spec.rb          |  2 +-
 spec/services/sms/send_on_sms_service_spec.rb |  4 +-
 .../oneoff_sms_campaign_service_spec.rb       |  2 +-
 .../twilio/send_on_twilio_service_spec.rb     | 24 ++++----
 .../twilio/webhook_setup_service_spec.rb      |  4 +-
 .../twitter/send_on_twitter_service_spec.rb   | 20 +++----
 .../twitter/webhook_subscribe_service_spec.rb | 34 +++++------
 .../whatsapp/incoming_message_service_spec.rb |  8 +--
 .../providers/whatsapp_cloud_service_spec.rb  |  4 +-
 .../conversation_reply_email_worker_spec.rb   |  2 +-
 215 files changed, 609 insertions(+), 608 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 70c927242..914308551 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -162,41 +162,33 @@ Rails/RenderInline:
 Performance/CollectionLiteralInLoop:
   Exclude:
     - 'db/migrate/20210315101919_enable_email_channel.rb'
-RSpec/NamedSubject:
-  Enabled: false
-Style/RedundantConstantBase:
-  Enabled: false
-Rails/RootPathnameMethods:
-  Enabled: false
-RSpec/Rails/MinitestAssertions:
-  Enabled: false
-RSpec/Rails/InferredSpecType:
-  Enabled: false
+Rails/ThreeStateBooleanColumn:
+  Exclude:
+    - 'db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb'
+    - 'db/migrate/20200605130625_agent_away_message_to_auto_reply.rb'
+    - 'db/migrate/20200606132552_create_labels.rb'
+    - 'db/migrate/20201027135006_create_working_hours.rb'
+    - 'db/migrate/20210112174124_add_hmac_token_to_inbox.rb'
+    - 'db/migrate/20210114202310_create_teams.rb'
+    - 'db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb'
+    - 'db/migrate/20210428135041_add_campaigns.rb'
+    - 'db/migrate/20210602182058_add_hmac_to_api_channel.rb'
+    - 'db/migrate/20210609133433_add_email_collect_to_inboxes.rb'
+    - 'db/migrate/20210618095823_add_csat_toggle_for_inbox.rb'
+    - 'db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb'
+    - 'db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb'
+    - 'db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb'
+    - 'db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb'
+    - 'db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb'
+    - 'db/migrate/20220216151613_add_open_all_day_to_working_hour.rb'
+    - 'db/migrate/20220511072655_add_archive_column_to_portal.rb'
+    - 'db/migrate/20230503101201_create_sla_policies.rb'
 RSpec/IndexedLet:
   Enabled: false
-RSpec/MatchArray:
-  Enabled: false
-Rails/ResponseParsedBody:
-  Enabled: false
-RSpec/FactoryBot/ConsistentParenthesesStyle:
-  Enabled: false
-Rails/ThreeStateBooleanColumn:
-  Enabled: false
-Rails/Pluck:
-  Enabled: false
-Rails/TopLevelHashWithIndifferentAccess:
-  Enabled: false
-Rails/ActionOrder:
-  Enabled: false
-Style/ArrayIntersect:
-  Enabled: false
-RSpec/NoExpectationExample:
-  Enabled: false
-Style/RedundantReturn:
-  Enabled: false
-Rails/I18nLocaleTexts:
+RSpec/NamedSubject:
   Enabled: false
 
+
 # we should bring this down
 RSpec/MultipleMemoizedHelpers:
   Max: 14
diff --git a/app/controllers/api/v1/accounts/articles_controller.rb b/app/controllers/api/v1/accounts/articles_controller.rb
index cc0976375..a1e348723 100644
--- a/app/controllers/api/v1/accounts/articles_controller.rb
+++ b/app/controllers/api/v1/accounts/articles_controller.rb
@@ -16,6 +16,9 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
                 end
   end
 
+  def show; end
+  def edit; end
+
   def create
     @article = @portal.articles.create!(article_params)
     @article.associate_root_article(article_params[:associated_article_id])
@@ -23,10 +26,6 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
     render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
   end
 
-  def edit; end
-
-  def show; end
-
   def update
     @article.update!(article_params) if params[:article].present?
     render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
diff --git a/app/controllers/api/v1/accounts/automation_rules_controller.rb b/app/controllers/api/v1/accounts/automation_rules_controller.rb
index 0bb78d3ea..3431af9c3 100644
--- a/app/controllers/api/v1/accounts/automation_rules_controller.rb
+++ b/app/controllers/api/v1/accounts/automation_rules_controller.rb
@@ -6,6 +6,8 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
     @automation_rules = Current.account.automation_rules
   end
 
+  def show; end
+
   def create
     @automation_rule = Current.account.automation_rules.new(automation_rules_permit)
     @automation_rule.actions = params[:actions]
@@ -28,8 +30,6 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
     render json: { blob_key: file_blob.key, blob_id: file_blob.id }
   end
 
-  def show; end
-
   def update
     ActiveRecord::Base.transaction do
       automation_rule_update
diff --git a/app/controllers/api/v1/accounts/campaigns_controller.rb b/app/controllers/api/v1/accounts/campaigns_controller.rb
index 6d2fb7729..b1a132246 100644
--- a/app/controllers/api/v1/accounts/campaigns_controller.rb
+++ b/app/controllers/api/v1/accounts/campaigns_controller.rb
@@ -6,21 +6,21 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
     @campaigns = Current.account.campaigns
   end
 
+  def show; end
+
   def create
     @campaign = Current.account.campaigns.create!(campaign_params)
   end
 
+  def update
+    @campaign.update!(campaign_params)
+  end
+
   def destroy
     @campaign.destroy!
     head :ok
   end
 
-  def show; end
-
-  def update
-    @campaign.update!(campaign_params)
-  end
-
   private
 
   def campaign
diff --git a/app/controllers/api/v1/accounts/categories_controller.rb b/app/controllers/api/v1/accounts/categories_controller.rb
index e28e601d5..73fc5d885 100644
--- a/app/controllers/api/v1/accounts/categories_controller.rb
+++ b/app/controllers/api/v1/accounts/categories_controller.rb
@@ -9,6 +9,8 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
     @categories = @portal.categories.search(params)
   end
 
+  def show; end
+
   def create
     @category = @portal.categories.create!(category_params)
     @category.related_categories << related_categories_records
@@ -17,8 +19,6 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
     @category.save!
   end
 
-  def show; end
-
   def update
     @category.update!(category_params)
     @category.related_categories = related_categories_records if related_categories_records.any?
diff --git a/app/controllers/api/v1/accounts/contacts/notes_controller.rb b/app/controllers/api/v1/accounts/contacts/notes_controller.rb
index 7bc9dd121..58ba935db 100644
--- a/app/controllers/api/v1/accounts/contacts/notes_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts/notes_controller.rb
@@ -5,21 +5,21 @@ class Api::V1::Accounts::Contacts::NotesController < Api::V1::Accounts::Contacts
     @notes = @contact.notes.latest.includes(:user)
   end
 
+  def show; end
+
   def create
     @note = @contact.notes.create!(note_params)
   end
 
+  def update
+    @note.update(note_params)
+  end
+
   def destroy
     @note.destroy!
     head :ok
   end
 
-  def show; end
-
-  def update
-    @note.update(note_params)
-  end
-
   private
 
   def note
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index ebd673d6f..1f3fbae0b 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -26,6 +26,8 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     @attachments = @conversation.attachments
   end
 
+  def show; end
+
   def create
     ActiveRecord::Base.transaction do
       @conversation = ConversationBuilder.new(params: params, contact_inbox: @contact_inbox).perform
@@ -33,8 +35,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     end
   end
 
-  def show; end
-
   def filter
     result = ::Conversations::FilterService.new(params.permit!, current_user).perform
     @conversations = result[:conversations]
diff --git a/app/controllers/api/v1/accounts/inbox_members_controller.rb b/app/controllers/api/v1/accounts/inbox_members_controller.rb
index 22726a855..0cb1a0c85 100644
--- a/app/controllers/api/v1/accounts/inbox_members_controller.rb
+++ b/app/controllers/api/v1/accounts/inbox_members_controller.rb
@@ -2,6 +2,11 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
   before_action :fetch_inbox
   before_action :current_agents_ids, only: [:create, :update]
 
+  def show
+    authorize @inbox, :show?
+    fetch_updated_agents
+  end
+
   def create
     authorize @inbox, :create?
     ActiveRecord::Base.transaction do
@@ -10,11 +15,6 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
     fetch_updated_agents
   end
 
-  def show
-    authorize @inbox, :show?
-    fetch_updated_agents
-  end
-
   def update
     authorize @inbox, :update?
     update_agents_list
diff --git a/app/controllers/api/v1/accounts/macros_controller.rb b/app/controllers/api/v1/accounts/macros_controller.rb
index a13d74995..604e053f1 100644
--- a/app/controllers/api/v1/accounts/macros_controller.rb
+++ b/app/controllers/api/v1/accounts/macros_controller.rb
@@ -6,6 +6,10 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
     @macros = Macro.with_visibility(current_user, params)
   end
 
+  def show
+    head :not_found if @macro.nil?
+  end
+
   def create
     @macro = Current.account.macros.new(macros_with_user.merge(created_by_id: current_user.id))
     @macro.set_visibility(current_user, permitted_params)
@@ -18,8 +22,16 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
     @macro
   end
 
-  def show
-    head :not_found if @macro.nil?
+  def update
+    ActiveRecord::Base.transaction do
+      @macro.update!(macros_with_user)
+      @macro.set_visibility(current_user, permitted_params)
+      process_attachments
+      @macro.save!
+    rescue StandardError => e
+      Rails.logger.error e
+      render json: { error: @macro.errors.messages }.to_json, status: :unprocessable_entity
+    end
   end
 
   def destroy
@@ -37,18 +49,6 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
     render json: { blob_key: file_blob.key, blob_id: file_blob.id }
   end
 
-  def update
-    ActiveRecord::Base.transaction do
-      @macro.update!(macros_with_user)
-      @macro.set_visibility(current_user, permitted_params)
-      process_attachments
-      @macro.save!
-    rescue StandardError => e
-      Rails.logger.error e
-      render json: { error: @macro.errors.messages }.to_json, status: :unprocessable_entity
-    end
-  end
-
   def execute
     ::MacrosExecutionJob.perform_later(@macro, conversation_ids: params[:conversation_ids], user: Current.user)
 
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index af48ccdf3..5af8a1fd1 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -14,6 +14,11 @@ class Api::V1::AccountsController < Api::BaseController
               CustomExceptions::Account::UserErrors,
               with: :render_error_response
 
+  def show
+    @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
+    render 'api/v1/accounts/show', format: :json
+  end
+
   def create
     @user, @account = AccountBuilder.new(
       account_name: account_params[:account_name],
@@ -35,11 +40,6 @@ class Api::V1::AccountsController < Api::BaseController
     render json: { cache_keys: get_cache_keys }, status: :ok
   end
 
-  def show
-    @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
-    render 'api/v1/accounts/show', format: :json
-  end
-
   def update
     @account.update!(account_params.slice(:name, :locale, :domain, :support_email, :auto_resolve_duration))
   end
diff --git a/app/controllers/devise_overrides/passwords_controller.rb b/app/controllers/devise_overrides/passwords_controller.rb
index 06092c5ab..26a9d4555 100644
--- a/app/controllers/devise_overrides/passwords_controller.rb
+++ b/app/controllers/devise_overrides/passwords_controller.rb
@@ -4,6 +4,16 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
   skip_before_action :require_no_authentication, raise: false
   skip_before_action :authenticate_user!, raise: false
 
+  def create
+    @user = User.find_by(email: params[:email])
+    if @user
+      @user.send_reset_password_instructions
+      build_response(I18n.t('messages.reset_password_success'), 200)
+    else
+      build_response(I18n.t('messages.reset_password_failure'), 404)
+    end
+  end
+
   def update
     # params: reset_password_token, password, password_confirmation
     original_token = params[:reset_password_token]
@@ -17,16 +27,6 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
     end
   end
 
-  def create
-    @user = User.find_by(email: params[:email])
-    if @user
-      @user.send_reset_password_instructions
-      build_response(I18n.t('messages.reset_password_success'), 200)
-    else
-      build_response(I18n.t('messages.reset_password_failure'), 404)
-    end
-  end
-
   private
 
   def reset_password_and_confirmation(recoverable)
diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index 831c41ddc..ace47a8b5 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -1,4 +1,4 @@
-class DeviseOverrides::SessionsController < ::DeviseTokenAuth::SessionsController
+class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
   # Prevent session parameter from being passed
   # Unpermitted parameter: session
   wrap_parameters format: []
diff --git a/app/controllers/devise_overrides/token_validations_controller.rb b/app/controllers/devise_overrides/token_validations_controller.rb
index 64b7949ac..432aa7752 100644
--- a/app/controllers/devise_overrides/token_validations_controller.rb
+++ b/app/controllers/devise_overrides/token_validations_controller.rb
@@ -1,4 +1,4 @@
-class DeviseOverrides::TokenValidationsController < ::DeviseTokenAuth::TokenValidationsController
+class DeviseOverrides::TokenValidationsController < DeviseTokenAuth::TokenValidationsController
   def validate_token
     # @resource will have been set by set_user_by_token concern
     if @resource
diff --git a/app/controllers/platform/api/v1/accounts_controller.rb b/app/controllers/platform/api/v1/accounts_controller.rb
index 1ea7d4954..9e6d53fef 100644
--- a/app/controllers/platform/api/v1/accounts_controller.rb
+++ b/app/controllers/platform/api/v1/accounts_controller.rb
@@ -1,12 +1,12 @@
 class Platform::Api::V1::AccountsController < PlatformController
+  def show; end
+
   def create
     @resource = Account.create!(account_params)
     update_resource_features
     @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
   end
 
-  def show; end
-
   def update
     @resource.assign_attributes(account_params)
     update_resource_features
diff --git a/app/controllers/platform/api/v1/agent_bots_controller.rb b/app/controllers/platform/api/v1/agent_bots_controller.rb
index 0c79e118d..138052b77 100644
--- a/app/controllers/platform/api/v1/agent_bots_controller.rb
+++ b/app/controllers/platform/api/v1/agent_bots_controller.rb
@@ -6,14 +6,14 @@ class Platform::Api::V1::AgentBotsController < PlatformController
     @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').all
   end
 
+  def show; end
+
   def create
     @resource = AgentBot.new(agent_bot_params)
     @resource.save!
     @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
   end
 
-  def show; end
-
   def update
     @resource.update!(agent_bot_params)
   end
diff --git a/app/controllers/platform/api/v1/users_controller.rb b/app/controllers/platform/api/v1/users_controller.rb
index e0de74da1..03ed55754 100644
--- a/app/controllers/platform/api/v1/users_controller.rb
+++ b/app/controllers/platform/api/v1/users_controller.rb
@@ -5,6 +5,8 @@ class Platform::Api::V1::UsersController < PlatformController
   before_action(only: [:login]) { set_resource }
   before_action(only: [:login]) { validate_platform_app_permissible }
 
+  def show; end
+
   def create
     @resource = (User.find_by(email: user_params[:email]) || User.new(user_params))
     @resource.skip_confirmation!
@@ -16,8 +18,6 @@ class Platform::Api::V1::UsersController < PlatformController
     render json: { url: @resource.generate_sso_link }
   end
 
-  def show; end
-
   def update
     @resource.assign_attributes(user_update_params)
 
diff --git a/app/controllers/public/api/v1/inboxes/contacts_controller.rb b/app/controllers/public/api/v1/inboxes/contacts_controller.rb
index b3ebd4ade..835c2596b 100644
--- a/app/controllers/public/api/v1/inboxes/contacts_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/contacts_controller.rb
@@ -2,6 +2,8 @@ class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesCon
   before_action :contact_inbox, except: [:create]
   before_action :process_hmac
 
+  def show; end
+
   def create
     source_id = params[:source_id] || SecureRandom.uuid
     @contact_inbox = ::ContactInboxWithContactBuilder.new(
@@ -11,8 +13,6 @@ class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesCon
     ).perform
   end
 
-  def show; end
-
   def update
     contact_identify_action = ContactIdentifyAction.new(
       contact: @contact_inbox.contact,
diff --git a/app/controllers/super_admin/accounts_controller.rb b/app/controllers/super_admin/accounts_controller.rb
index 112357363..6a5fb0fdc 100644
--- a/app/controllers/super_admin/accounts_controller.rb
+++ b/app/controllers/super_admin/accounts_controller.rb
@@ -45,13 +45,17 @@ class SuperAdmin::AccountsController < SuperAdmin::ApplicationController
 
   def seed
     Internal::SeedAccountJob.perform_later(requested_resource)
+    # rubocop:disable Rails/I18nLocaleTexts
     redirect_back(fallback_location: [namespace, requested_resource], notice: 'Account seeding triggered')
+    # rubocop:enable Rails/I18nLocaleTexts
   end
 
   def destroy
     account = Account.find(params[:id])
 
     DeleteObjectJob.perform_later(account) if account.present?
+    # rubocop:disable Rails/I18nLocaleTexts
     redirect_back(fallback_location: [namespace, requested_resource], notice: 'Account deletion is in progress.')
+    # rubocop:enable Rails/I18nLocaleTexts
   end
 end
diff --git a/app/controllers/swagger_controller.rb b/app/controllers/swagger_controller.rb
index 697f04ed0..af5a4b039 100644
--- a/app/controllers/swagger_controller.rb
+++ b/app/controllers/swagger_controller.rb
@@ -1,7 +1,7 @@
 class SwaggerController < ApplicationController
   def respond
     if Rails.env.development? || Rails.env.test?
-      render inline: File.read(Rails.root.join('swagger', derived_path))
+      render inline: Rails.root.join('swagger', derived_path).read
     else
       head :not_found
     end
diff --git a/app/models/concerns/featurable.rb b/app/models/concerns/featurable.rb
index 5e6b8b8db..daa0b4bf6 100644
--- a/app/models/concerns/featurable.rb
+++ b/app/models/concerns/featurable.rb
@@ -6,7 +6,7 @@ module Featurable
     check_for_column: false
   }.freeze
 
-  FEATURE_LIST = YAML.safe_load(File.read(Rails.root.join('config/features.yml'))).freeze
+  FEATURE_LIST = YAML.safe_load(Rails.root.join('config/features.yml').read).freeze
 
   FEATURES = FEATURE_LIST.each_with_object({}) do |feature, result|
     result[result.keys.size + 1] = "feature_#{feature['name']}".to_sym
@@ -46,7 +46,7 @@ module Featurable
   end
 
   def all_features
-    FEATURE_LIST.map { |f| f['name'] }.index_with do |feature_name|
+    FEATURE_LIST.pluck('name').index_with do |feature_name|
       feature_enabled?(feature_name)
     end
   end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index becb0a639..668d96d52 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -233,8 +233,8 @@ class Conversation < ApplicationRecord
 
   def allowed_keys?
     (
-      (previous_changes.keys & %w[team_id assignee_id status snoozed_until custom_attributes label_list first_reply_created_at priority]).present? ||
-      (previous_changes['additional_attributes'].present? && (previous_changes['additional_attributes'][1].keys & %w[conversation_language]).present?)
+      previous_changes.keys.intersect?(%w[team_id assignee_id status snoozed_until custom_attributes label_list first_reply_created_at priority]) ||
+      (previous_changes['additional_attributes'].present? && previous_changes['additional_attributes'][1].keys.intersect?(%w[conversation_language]))
     )
   end
 
diff --git a/app/models/installation_config.rb b/app/models/installation_config.rb
index f0e2ca4f1..f1603e4ca 100644
--- a/app/models/installation_config.rb
+++ b/app/models/installation_config.rb
@@ -19,7 +19,7 @@ class InstallationConfig < ApplicationRecord
   # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
   # FIX ME : fixes breakage of installation config. we need to migrate.
   # Fix configuration in application.rb
-  serialize :serialized_value, HashWithIndifferentAccess
+  serialize :serialized_value, ActiveSupport::HashWithIndifferentAccess
 
   before_validation :set_lock
   validates :name, presence: true
diff --git a/config/initializers/actioncable.rb b/config/initializers/actioncable.rb
index 937ea83b8..3d1c90e75 100644
--- a/config/initializers/actioncable.rb
+++ b/config/initializers/actioncable.rb
@@ -11,5 +11,5 @@ ActionCable::SubscriptionAdapter::Redis.redis_connector = lambda do |config|
   # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75173
   # https://github.com/rails/rails/blob/4a23cb3415eac03d76623112576559a722d1f23d/actioncable/lib/action_cable/subscription_adapter/base.rb#L30
   config[:id] = nil if ENV['REDIS_DISABLE_CLIENT_COMMAND'].present?
-  ::Redis.new(config.except(:adapter, :channel_prefix))
+  Redis.new(config.except(:adapter, :channel_prefix))
 end
diff --git a/db/migrate/20230202132107_install_audited.rb b/db/migrate/20230202132107_install_audited.rb
index 7c9f1dd54..a59afc0b9 100644
--- a/db/migrate/20230202132107_install_audited.rb
+++ b/db/migrate/20230202132107_install_audited.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class InstallAudited < ActiveRecord::Migration[6.1]
-  # rubocop:disable RMetrics/MethodLength
+  # rubocop:disable Metrics/MethodLength
   def self.up
     create_table :audits, :force => true do |t|
       t.bigint :auditable_id
@@ -19,7 +19,7 @@ class InstallAudited < ActiveRecord::Migration[6.1]
       t.string :request_uuid
       t.datetime :created_at
     end
-    # rubocop:enable RMetrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
 
     add_index :audits, [:auditable_type, :auditable_id, :version], :name => 'auditable_index'
     add_index :audits, [:associated_type, :associated_id], :name => 'associated_index'
diff --git a/db/seeds.rb b/db/seeds.rb
index 1afe3d025..f260f32a7 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,7 +5,7 @@ ConfigLoader.new.process
 ## Seeds productions
 if Rails.env.production?
   # Setup Onboarding flow
-  ::Redis::Alfred.set(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING, true)
+  Redis::Alfred.set(Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING, true)
 end
 
 ## Seeds for Local Development
@@ -46,7 +46,7 @@ unless Rails.env.production?
   inbox = Inbox.create!(channel: web_widget, account: account, name: 'Acme Support')
   InboxMember.create!(user: user, inbox: inbox)
 
-  contact_inbox = ::ContactInboxWithContactBuilder.new(
+  contact_inbox = ContactInboxWithContactBuilder.new(
     source_id: user.id,
     inbox: inbox,
     hmac_verified: true,
diff --git a/lib/custom_exceptions/base.rb b/lib/custom_exceptions/base.rb
index 3076b8847..9032d4bab 100644
--- a/lib/custom_exceptions/base.rb
+++ b/lib/custom_exceptions/base.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CustomExceptions::Base < ::StandardError
+class CustomExceptions::Base < StandardError
   def to_hash
     {
       message: message
diff --git a/lib/seeders/account_seeder.rb b/lib/seeders/account_seeder.rb
index db8d31c37..49e611ab5 100644
--- a/lib/seeders/account_seeder.rb
+++ b/lib/seeders/account_seeder.rb
@@ -12,7 +12,7 @@ class Seeders::AccountSeeder
   def initialize(account:)
     raise 'Account Seeding is not allowed.' unless ENV.fetch('ENABLE_ACCOUNT_SEEDING', !Rails.env.production?)
 
-    @account_data = HashWithIndifferentAccess.new(YAML.safe_load(File.read(Rails.root.join('lib/seeders/seed_data.yml'))))
+    @account_data = ActiveSupport::HashWithIndifferentAccess.new(YAML.safe_load(Rails.root.join('lib/seeders/seed_data.yml').read))
     @account = account
   end
 
diff --git a/spec/actions/contact_identify_action_spec.rb b/spec/actions/contact_identify_action_spec.rb
index 64f81ef8f..baf935f61 100644
--- a/spec/actions/contact_identify_action_spec.rb
+++ b/spec/actions/contact_identify_action_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::ContactIdentifyAction do
+describe ContactIdentifyAction do
   subject(:contact_identify) { described_class.new(contact: contact, params: params).perform }
 
   let!(:account) { create(:account) }
diff --git a/spec/actions/contact_merge_action_spec.rb b/spec/actions/contact_merge_action_spec.rb
index 147dabe41..de207498a 100644
--- a/spec/actions/contact_merge_action_spec.rb
+++ b/spec/actions/contact_merge_action_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::ContactMergeAction do
+describe ContactMergeAction do
   subject(:contact_merge) { described_class.new(account: account, base_contact: base_contact, mergee_contact: mergee_contact).perform }
 
   let!(:account) { create(:account) }
diff --git a/spec/builders/campaigns/campaign_conversation_builder_spec.rb b/spec/builders/campaigns/campaign_conversation_builder_spec.rb
index 03a392912..8f08cf0c0 100644
--- a/spec/builders/campaigns/campaign_conversation_builder_spec.rb
+++ b/spec/builders/campaigns/campaign_conversation_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::Campaigns::CampaignConversationBuilder do
+describe Campaigns::CampaignConversationBuilder do
   let(:account) { create(:account) }
   let(:inbox) { create(:inbox, account: account) }
   let(:contact) { create(:contact, account: account, identifier: '123') }
diff --git a/spec/builders/contact_inbox_builder_spec.rb b/spec/builders/contact_inbox_builder_spec.rb
index 46b0d749c..1dda58063 100644
--- a/spec/builders/contact_inbox_builder_spec.rb
+++ b/spec/builders/contact_inbox_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::ContactInboxBuilder do
+describe ContactInboxBuilder do
   let(:account) { create(:account) }
   let(:contact) { create(:contact, email: 'xyc@example.com', phone_number: '+23423424123', account: account) }
 
diff --git a/spec/builders/contact_inbox_with_contact_builder_spec.rb b/spec/builders/contact_inbox_with_contact_builder_spec.rb
index e76d199d4..8efeae9a5 100644
--- a/spec/builders/contact_inbox_with_contact_builder_spec.rb
+++ b/spec/builders/contact_inbox_with_contact_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::ContactInboxWithContactBuilder do
+describe ContactInboxWithContactBuilder do
   let(:account) { create(:account) }
   let(:inbox) { create(:inbox, account: account) }
   let(:contact) { create(:contact, email: 'xyc@example.com', phone_number: '+23423424123', account: account, identifier: '123') }
diff --git a/spec/builders/conversation_builder_spec.rb b/spec/builders/conversation_builder_spec.rb
index f0e0ada06..956aec966 100644
--- a/spec/builders/conversation_builder_spec.rb
+++ b/spec/builders/conversation_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::ConversationBuilder do
+describe ConversationBuilder do
   let(:account) { create(:account) }
   let!(:sms_channel) { create(:channel_sms, account: account) }
   let!(:sms_inbox) { create(:inbox, channel: sms_channel, account: account) }
diff --git a/spec/builders/csat_surveys/response_builder_spec.rb b/spec/builders/csat_surveys/response_builder_spec.rb
index 9356e6369..8ec4e4a23 100644
--- a/spec/builders/csat_surveys/response_builder_spec.rb
+++ b/spec/builders/csat_surveys/response_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::CsatSurveys::ResponseBuilder do
+describe CsatSurveys::ResponseBuilder do
   let(:message) do
     create(
       :message, content_type: :input_csat,
diff --git a/spec/builders/messages/facebook/message_builder_spec.rb b/spec/builders/messages/facebook/message_builder_spec.rb
index 082510f7b..8219adaa7 100644
--- a/spec/builders/messages/facebook/message_builder_spec.rb
+++ b/spec/builders/messages/facebook/message_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe  ::Messages::Facebook::MessageBuilder do
+describe Messages::Facebook::MessageBuilder do
   subject(:message_builder) { described_class.new(incoming_fb_text_message, facebook_channel.inbox).perform }
 
   before do
diff --git a/spec/builders/messages/instagram/message_builder_spec.rb b/spec/builders/messages/instagram/message_builder_spec.rb
index 3eaa5c25b..b7dfddc8e 100644
--- a/spec/builders/messages/instagram/message_builder_spec.rb
+++ b/spec/builders/messages/instagram/message_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe  ::Messages::Instagram::MessageBuilder do
+describe Messages::Instagram::MessageBuilder do
   subject(:instagram_message_builder) { described_class }
 
   before do
diff --git a/spec/builders/messages/message_builder_spec.rb b/spec/builders/messages/message_builder_spec.rb
index be5d60834..728cb8cf1 100644
--- a/spec/builders/messages/message_builder_spec.rb
+++ b/spec/builders/messages/message_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::Messages::MessageBuilder do
+describe Messages::MessageBuilder do
   subject(:message_builder) { described_class.new(user, conversation, params).perform }
 
   let(:account) { create(:account) }
diff --git a/spec/builders/notification_builder_spec.rb b/spec/builders/notification_builder_spec.rb
index 4db4ea00d..8386dbf9a 100644
--- a/spec/builders/notification_builder_spec.rb
+++ b/spec/builders/notification_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::NotificationBuilder do
+describe NotificationBuilder do
   include ActiveJob::TestHelper
 
   describe '#perform' do
diff --git a/spec/builders/v2/report_builder_spec.rb b/spec/builders/v2/report_builder_spec.rb
index 7c6c78179..283f18a38 100644
--- a/spec/builders/v2/report_builder_spec.rb
+++ b/spec/builders/v2/report_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::V2::ReportBuilder do
+describe V2::ReportBuilder do
   include ActiveJob::TestHelper
   let_it_be(:account) { create(:account) }
   let_it_be(:label_1) { create(:label, title: 'Label_1', account: account) }
@@ -60,7 +60,7 @@ describe ::V2::ReportBuilder do
           until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today]).to be 10
@@ -75,7 +75,7 @@ describe ::V2::ReportBuilder do
           until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today]).to be 20
@@ -90,7 +90,7 @@ describe ::V2::ReportBuilder do
           until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today]).to be 50
@@ -107,7 +107,7 @@ describe ::V2::ReportBuilder do
 
         conversations = account.conversations.where('created_at < ?', 1.day.ago)
         conversations.each(&:resolved!)
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today]).to be 0
@@ -122,7 +122,7 @@ describe ::V2::ReportBuilder do
           until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today].to_f).to be 0.48e4
@@ -135,7 +135,7 @@ describe ::V2::ReportBuilder do
           until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.summary
 
         expect(metrics[:conversations_count]).to be 15
@@ -153,7 +153,7 @@ describe ::V2::ReportBuilder do
           group_by: 'test'.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         expect { builder.summary }.to raise_error(ArgumentError)
       end
     end
@@ -168,7 +168,7 @@ describe ::V2::ReportBuilder do
           until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today - 2.days]).to be 5
@@ -183,7 +183,7 @@ describe ::V2::ReportBuilder do
           until: (Time.zone.today + 1.day).to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today]).to be 20
@@ -199,7 +199,7 @@ describe ::V2::ReportBuilder do
           until: (Time.zone.today + 1.day).to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today]).to be 50
@@ -217,7 +217,7 @@ describe ::V2::ReportBuilder do
 
         conversations = account.conversations.where('created_at < ?', 1.day.ago)
         conversations.each(&:resolved!)
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
 
         expect(metrics[Time.zone.today - 2.days]).to be 5
@@ -234,7 +234,7 @@ describe ::V2::ReportBuilder do
           until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.timeseries
         expect(metrics[Time.zone.today].to_f).to be 0.15e1
       end
@@ -247,7 +247,7 @@ describe ::V2::ReportBuilder do
           until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.summary
 
         expect(metrics[:conversations_count]).to be 5
@@ -266,7 +266,7 @@ describe ::V2::ReportBuilder do
           group_by: 'week'.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         metrics = builder.summary
 
         expect(metrics[:conversations_count]).to be 5
@@ -285,7 +285,7 @@ describe ::V2::ReportBuilder do
           group_by: 'test'.to_s
         }
 
-        builder = V2::ReportBuilder.new(account, params)
+        builder = described_class.new(account, params)
         expect { builder.summary }.to raise_error(ArgumentError)
       end
     end
diff --git a/spec/channels/room_channel_spec.rb b/spec/channels/room_channel_spec.rb
index 8db8c0a7c..362a3d405 100644
--- a/spec/channels/room_channel_spec.rb
+++ b/spec/channels/room_channel_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe RoomChannel, type: :channel do
+RSpec.describe RoomChannel do
   let!(:contact_inbox) { create(:contact_inbox) }
 
   before do
diff --git a/spec/configs/schedule_spec.rb b/spec/configs/schedule_spec.rb
index 78d0c4e3e..29b4e9399 100644
--- a/spec/configs/schedule_spec.rb
+++ b/spec/configs/schedule_spec.rb
@@ -19,6 +19,6 @@ RSpec.context 'with valid schedule.yml' do
       end
     end
     # ensure that no duplicates exist
-    assert_equal schedule_keys.uniq.count, schedule_keys.count
+    expect(schedule_keys.count).to eq(schedule_keys.uniq.count)
   end
 end
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index c1dc781e9..f3cb98a92 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'API Base', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['id']).to eq(user.id)
         expect(json_response['email']).to eq(user.email)
       end
diff --git a/spec/controllers/api/v1/accounts/actions/contact_merges_controller_spec.rb b/spec/controllers/api/v1/accounts/actions/contact_merges_controller_spec.rb
index 6ec38969c..1390cdd4c 100644
--- a/spec/controllers/api/v1/accounts/actions/contact_merges_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/actions/contact_merges_controller_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe 'Contact Merge Action API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['id']).to eq(base_contact.id)
         expected_params = { account: account, base_contact: base_contact, mergee_contact: mergee_contact }
         expect(ContactMergeAction).to have_received(:new).with(expected_params)
diff --git a/spec/controllers/api/v1/accounts/agents_controller_spec.rb b/spec/controllers/api/v1/accounts/agents_controller_spec.rb
index b0ce320ff..2b06301d6 100644
--- a/spec/controllers/api/v1/accounts/agents_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/agents_controller_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe 'Agents API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body).size).to eq(account.users.count)
+        expect(response.parsed_body.size).to eq(account.users.count)
       end
 
       it 'returns custom fields on agents if present' do
@@ -36,7 +36,7 @@ RSpec.describe 'Agents API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data.first['custom_attributes']['test']).to eq('test')
       end
     end
@@ -131,7 +131,7 @@ RSpec.describe 'Agents API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data['role']).to eq('administrator')
         expect(response_data['availability_status']).to eq('busy')
         expect(response_data['auto_offline']).to be(false)
diff --git a/spec/controllers/api/v1/accounts/articles_controller_spec.rb b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
index 703542bb2..60a1da0c2 100644
--- a/spec/controllers/api/v1/accounts/articles_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
              params: article_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload']['title']).to eql('MyTitle')
         expect(json_response['payload']['status']).to eql('draft')
         expect(json_response['payload']['position']).to be(3)
@@ -58,7 +58,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
              params: article_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload']['title']).to eql('MyTitle')
         expect(json_response['payload']['status']).to eql('draft')
         expect(json_response['payload']['position']).to be(3)
@@ -86,7 +86,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
              params: article_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload']['title']).to eql('MyTitle')
 
         category = Article.find(json_response['payload']['id'])
@@ -112,7 +112,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
              params: article_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload']['title']).to eql('MyTitle')
 
         category = Article.find(json_response['payload']['id'])
@@ -146,7 +146,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
             params: article_params,
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload']['title']).to eql(article_params[:article][:title])
         expect(json_response['payload']['status']).to eql(article_params[:article][:status])
         expect(json_response['payload']['position']).to eql(article_params[:article][:position])
@@ -190,7 +190,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
             headers: agent.create_new_auth_token,
             params: {}
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload'].count).to be 2
       end
 
@@ -202,7 +202,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
             headers: agent.create_new_auth_token,
             params: { category_slug: category.slug }
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload'].count).to be 2
       end
 
@@ -219,7 +219,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
             headers: agent.create_new_auth_token,
             params: { query: 'funny' }
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload'].count).to be 1
         expect(json_response['meta']['all_articles_count']).to be 2
         expect(json_response['meta']['articles_count']).to be 1
@@ -235,7 +235,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
         get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/#{article2.id}",
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['payload']['title']).to eq(article2.title)
         expect(json_response['payload']['id']).to eq(article2.id)
@@ -251,11 +251,11 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
         get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/#{root_article.id}",
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['payload']['associated_articles'].length).to eq(2)
-        associated_articles_ids = json_response['payload']['associated_articles'].map { |article| article['id'] }
-        expect(associated_articles_ids).to match_array([child_article_1.id, child_article_2.id])
+        associated_articles_ids = json_response['payload']['associated_articles'].pluck('id')
+        expect(associated_articles_ids).to contain_exactly(child_article_1.id, child_article_2.id)
         expect(json_response['payload']['id']).to eq(root_article.id)
       end
     end
@@ -272,7 +272,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        blob = JSON.parse(response.body)
+        blob = response.parsed_body
 
         expect(blob['file_url']).to be_present
       end
diff --git a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
index 2c8041ab5..b0da23d0f 100644
--- a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
@@ -134,7 +134,7 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        blob = JSON.parse(response.body)
+        blob = response.parsed_body
 
         expect(blob['blob_key']).to be_present
         expect(blob['blob_id']).to be_present
@@ -167,13 +167,13 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
              headers: administrator.create_new_auth_token,
              params: { attachment: file_1 }
 
-        blob_1 = JSON.parse(response.body)
+        blob_1 = response.parsed_body
 
         post "/api/v1/accounts/#{account.id}/automation_rules/attach_file",
              headers: administrator.create_new_auth_token,
              params: { attachment: file_2 }
 
-        blob_2 = JSON.parse(response.body)
+        blob_2 = response.parsed_body
 
         params[:actions] = [
           {
diff --git a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
index ddf93c3f9..1d9908652 100644
--- a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
@@ -222,7 +222,7 @@ RSpec.describe 'Campaigns API', type: :request do
                as: :json
 
         expect(response).to have_http_status(:success)
-        expect(::Campaign.exists?(campaign.display_id)).to be false
+        expect(Campaign.exists?(campaign.display_id)).to be false
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb b/spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb
index 228da2d56..45c99f15e 100644
--- a/spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe 'Canned Responses API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)).to eq(account.canned_responses.as_json)
+        expect(response.parsed_body).to eq(account.canned_responses.as_json)
       end
 
       it 'returns all the canned responses the user searched for' do
@@ -42,7 +42,7 @@ RSpec.describe 'Canned Responses API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)).to eq(
+        expect(response.parsed_body).to eq(
           [cr3, cr2, cr1].as_json
         )
       end
diff --git a/spec/controllers/api/v1/accounts/categories_controller_spec.rb b/spec/controllers/api/v1/accounts/categories_controller_spec.rb
index 783e89d93..03e658aac 100644
--- a/spec/controllers/api/v1/accounts/categories_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/categories_controller_spec.rb
@@ -62,7 +62,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['payload']['related_categories'][0]['id']).to eql(related_category_1.id)
         expect(json_response['payload']['related_categories'][1]['id']).to eql(related_category_2.id)
@@ -107,7 +107,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
              params: category_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:unprocessable_entity)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['message']).to eql('Locale should be unique in the category and portal')
       end
 
@@ -125,7 +125,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
              params: category_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:unprocessable_entity)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['message']).to eql("Slug can't be blank")
       end
@@ -160,7 +160,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
             params: category_params,
             headers: agent.create_new_auth_token
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['payload']['name']).to eql(category_params[:category][:name])
         expect(json_response['payload']['related_categories'][0]['id']).to eql(related_category_1.id)
@@ -185,7 +185,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['payload']['name']).to eql(category.name)
         expect(json_response['payload']['related_categories'][0]['id']).to eql(related_category_1.id)
@@ -257,7 +257,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
         get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories",
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload'].count).to be(category_count + 1)
       end
     end
diff --git a/spec/controllers/api/v1/accounts/channels/twilio_channels_controller_spec.rb b/spec/controllers/api/v1/accounts/channels/twilio_channels_controller_spec.rb
index 7d8ca4c9c..8e3e45fed 100644
--- a/spec/controllers/api/v1/accounts/channels/twilio_channels_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/channels/twilio_channels_controller_spec.rb
@@ -4,13 +4,13 @@ RSpec.describe '/api/v1/accounts/{account.id}/channels/twilio_channel', type: :r
   let(:account) { create(:account) }
   let(:admin) { create(:user, account: account, role: :administrator) }
   let(:agent) { create(:user, account: account, role: :agent) }
-  let(:twilio_client) { instance_double(::Twilio::REST::Client) }
+  let(:twilio_client) { instance_double(Twilio::REST::Client) }
   let(:message_double) { double }
-  let(:twilio_webhook_setup_service) { instance_double(::Twilio::WebhookSetupService) }
+  let(:twilio_webhook_setup_service) { instance_double(Twilio::WebhookSetupService) }
 
   before do
-    allow(::Twilio::REST::Client).to receive(:new).and_return(twilio_client)
-    allow(::Twilio::WebhookSetupService).to receive(:new).and_return(twilio_webhook_setup_service)
+    allow(Twilio::REST::Client).to receive(:new).and_return(twilio_client)
+    allow(Twilio::WebhookSetupService).to receive(:new).and_return(twilio_webhook_setup_service)
     allow(twilio_webhook_setup_service).to receive(:perform)
   end
 
@@ -46,7 +46,7 @@ RSpec.describe '/api/v1/accounts/{account.id}/channels/twilio_channel', type: :r
                headers: admin.create_new_auth_token
 
           expect(response).to have_http_status(:success)
-          json_response = JSON.parse(response.body)
+          json_response = response.parsed_body
 
           expect(json_response['name']).to eq('SMS Channel')
           expect(json_response['messaging_service_sid']).to eq('MGec8130512b5dd462cfe03095ec1342ed')
@@ -71,7 +71,7 @@ RSpec.describe '/api/v1/accounts/{account.id}/channels/twilio_channel', type: :r
                headers: admin.create_new_auth_token
 
           expect(response).to have_http_status(:success)
-          json_response = JSON.parse(response.body)
+          json_response = response.parsed_body
 
           expect(json_response['messaging_service_sid']).to eq('MGec8130512b5dd462cfe03095ec1111ed')
         end
@@ -99,7 +99,7 @@ RSpec.describe '/api/v1/accounts/{account.id}/channels/twilio_channel', type: :r
                  headers: admin.create_new_auth_token
 
             expect(response).to have_http_status(:success)
-            json_response = JSON.parse(response.body)
+            json_response = response.parsed_body
 
             expect(json_response['name']).to eq('SMS Channel')
             expect(json_response['phone_number']).to eq('+1234567890')
@@ -124,7 +124,7 @@ RSpec.describe '/api/v1/accounts/{account.id}/channels/twilio_channel', type: :r
                  headers: admin.create_new_auth_token
 
             expect(response).to have_http_status(:success)
-            json_response = JSON.parse(response.body)
+            json_response = response.parsed_body
 
             expect(json_response['phone_number']).to eq('whatsapp:+1224466880')
           end
diff --git a/spec/controllers/api/v1/accounts/contacts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts/conversations_controller_spec.rb
index 489ac60a4..da7764d25 100644
--- a/spec/controllers/api/v1/accounts/contacts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts/conversations_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe '/api/v1/accounts/{account.id}/contacts/:id/conversations', type:
           get "/api/v1/accounts/#{account.id}/contacts/#{contact.id}/conversations", headers: admin.create_new_auth_token
 
           expect(response).to have_http_status(:success)
-          json_response = JSON.parse(response.body)
+          json_response = response.parsed_body
 
           expect(json_response['payload'].length).to eq 4
         end
@@ -44,7 +44,7 @@ RSpec.describe '/api/v1/accounts/{account.id}/contacts/:id/conversations', type:
           get "/api/v1/accounts/#{account.id}/contacts/#{contact.id}/conversations", headers: agent.create_new_auth_token
 
           expect(response).to have_http_status(:success)
-          json_response = JSON.parse(response.body)
+          json_response = response.parsed_body
 
           expect(json_response['payload'].length).to eq 2
         end
@@ -55,7 +55,7 @@ RSpec.describe '/api/v1/accounts/{account.id}/contacts/:id/conversations', type:
           get "/api/v1/accounts/#{account.id}/contacts/#{contact.id}/conversations", headers: unknown.create_new_auth_token
 
           expect(response).to have_http_status(:success)
-          json_response = JSON.parse(response.body)
+          json_response = response.parsed_body
 
           expect(json_response['payload'].length).to eq 0
         end
diff --git a/spec/controllers/api/v1/accounts/contacts/notes_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts/notes_controller_spec.rb
index 9bd26618d..c99e79284 100644
--- a/spec/controllers/api/v1/accounts/contacts/notes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts/notes_controller_spec.rb
@@ -114,7 +114,7 @@ RSpec.describe 'Notes API', type: :request do
                as: :json
 
         expect(response).to have_http_status(:success)
-        expect(::Note.exists?(note.id)).to be false
+        expect(Note.exists?(note.id)).to be false
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index b3390fe03..f6141000e 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe 'Contacts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_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)
@@ -47,7 +47,7 @@ RSpec.describe 'Contacts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['payload'].first['email']).to eq(contact.email)
         expect(response_body['payload'].first['contact_inboxes'].blank?).to be(true)
       end
@@ -58,7 +58,7 @@ RSpec.describe 'Contacts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['payload'].last['id']).to eq(contact_4.id)
         expect(response_body['payload'].last['email']).to eq(contact_4.email)
       end
@@ -69,7 +69,7 @@ RSpec.describe 'Contacts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['payload'].first['email']).to eq(contact_1.email)
         expect(response_body['payload'].first['id']).to eq(contact_1.id)
         expect(response_body['payload'].last['email']).to eq(contact_4.email)
@@ -81,7 +81,7 @@ RSpec.describe 'Contacts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['payload'].first['email']).to eq(contact.email)
         expect(response_body['payload'].first['id']).to eq(contact.id)
         expect(response_body['payload'].last['email']).to eq(contact_4.email)
@@ -94,7 +94,7 @@ RSpec.describe 'Contacts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['payload'].first['conversations_count']).to eq(contact.conversations.count)
         expect(response_body['payload'].first['last_seen_at']).present?
       end
@@ -110,7 +110,7 @@ RSpec.describe 'Contacts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['meta']['count']).to eq(2)
         expect(response_body['payload'].pluck('email')).to include(contact_with_label1.email, contact_with_label2.email)
       end
@@ -160,7 +160,7 @@ RSpec.describe 'Contacts API', type: :request do
         post "/api/v1/accounts/#{account.id}/contacts/import",
              headers: admin.create_new_auth_token
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(response).to have_http_status(:unprocessable_entity)
         expect(json_response['error']).to eq('File is blank')
@@ -191,7 +191,7 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'returns all contacts who are online' do
-        allow(::OnlineStatusTracker).to receive(:get_available_contact_ids).and_return([contact.id])
+        allow(OnlineStatusTracker).to receive(:get_available_contact_ids).and_return([contact.id])
 
         get "/api/v1/accounts/#{account.id}/contacts/active",
             headers: admin.create_new_auth_token,
@@ -353,7 +353,7 @@ RSpec.describe 'Contacts API', type: :request do
 
         expect(response).to have_http_status(:success)
         # only the inboxes which agent has access to are shown
-        expect(JSON.parse(response.body)['payload'].pluck('inbox').pluck('id')).to eq([twilio_whatsapp_inbox.id])
+        expect(response.parsed_body['payload'].pluck('inbox').pluck('id')).to eq([twilio_whatsapp_inbox.id])
       end
     end
   end
@@ -383,7 +383,7 @@ RSpec.describe 'Contacts API', type: :request do
         expect(response).to have_http_status(:success)
 
         # custom attributes are updated
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload']['contact']['custom_attributes']).to eq({ 'test' => 'test', 'test1' => 'test1' })
       end
 
@@ -395,7 +395,7 @@ RSpec.describe 'Contacts API', type: :request do
 
         expect(response).to have_http_status(:unprocessable_entity)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['message']).to eq('Name is too long (maximum is 255 characters)')
       end
 
@@ -460,7 +460,7 @@ RSpec.describe 'Contacts API', type: :request do
               as: :json
 
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(JSON.parse(response.body)['attributes']).to include('email')
+        expect(response.parsed_body['attributes']).to include('email')
       end
 
       it 'prevents updating with an existing phone number' do
@@ -472,7 +472,7 @@ RSpec.describe 'Contacts API', type: :request do
               as: :json
 
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(JSON.parse(response.body)['attributes']).to include('phone_number')
+        expect(response.parsed_body['attributes']).to include('phone_number')
       end
 
       it 'updates avatar' do
@@ -517,7 +517,7 @@ RSpec.describe 'Contacts API', type: :request do
       let(:agent) { create(:user, account: account, role: :agent) }
 
       it 'deletes the contact for administrator user' do
-        allow(::OnlineStatusTracker).to receive(:get_presence).and_return(false)
+        allow(OnlineStatusTracker).to receive(:get_presence).and_return(false)
         delete "/api/v1/accounts/#{account.id}/contacts/#{contact.id}",
                headers: admin.create_new_auth_token
 
@@ -530,7 +530,7 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'does not delete the contact if online' do
-        allow(::OnlineStatusTracker).to receive(:get_presence).and_return(true)
+        allow(OnlineStatusTracker).to receive(:get_presence).and_return(true)
 
         delete "/api/v1/accounts/#{account.id}/contacts/#{contact.id}",
                headers: admin.create_new_auth_token
@@ -591,7 +591,7 @@ RSpec.describe 'Contacts API', type: :request do
     context 'when it is an authenticated user' do
       before do
         create(:contact, account: account)
-        contact.avatar.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        contact.avatar.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       end
 
       it 'delete contact avatar' do
diff --git a/spec/controllers/api/v1/accounts/conversations/direct_uploads_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/direct_uploads_controller_spec.rb
index c2518c1bd..089b16b59 100644
--- a/spec/controllers/api/v1/accounts/conversations/direct_uploads_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/direct_uploads_controller_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe '/api/v1/accounts/:account_id/conversations/:conversation_id/dire
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['content_type']).to eq('image/png')
       end
     end
diff --git a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
index d0072af8a..dc9de8c35 100644
--- a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe 'Conversation Messages API', type: :request do
 
         expect(response).to have_http_status(:unprocessable_entity)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['error']).to eq('Validation failed: Content is too long (maximum is 150000 characters)')
       end
@@ -61,7 +61,7 @@ RSpec.describe 'Conversation Messages API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data['content_attributes']['external_created_at']).to eq time_stamp
         expect(conversation.messages.count).to eq(1)
         expect(conversation.messages.last.sender_id).to eq(agent_bot.id)
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index bf73cd0ce..496ce5cdb 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -765,7 +765,7 @@ RSpec.describe 'Conversations API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['payload'].first['file_type']).to eq('image')
       end
 
@@ -775,7 +775,7 @@ RSpec.describe 'Conversations API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['payload'].length).to eq(1)
       end
     end
diff --git a/spec/controllers/api/v1/accounts/csat_survey_responses_controller_spec.rb b/spec/controllers/api/v1/accounts/csat_survey_responses_controller_spec.rb
index a6c225ab4..10b81986d 100644
--- a/spec/controllers/api/v1/accounts/csat_survey_responses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/csat_survey_responses_controller_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe 'CSAT Survey Responses API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body).first['feedback_message']).to eq(csat_survey_response.feedback_message)
+        expect(response.parsed_body.first['feedback_message']).to eq(csat_survey_response.feedback_message)
       end
 
       it 'filters csat responses based on a date range' do
@@ -43,7 +43,7 @@ RSpec.describe 'CSAT Survey Responses API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data.pluck('id')).to include(csat_3_days_ago.id)
         expect(response_data.pluck('id')).not_to include(csat_10_days_ago.id)
       end
@@ -63,7 +63,7 @@ RSpec.describe 'CSAT Survey Responses API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data.size).to eq 2
       end
 
@@ -104,7 +104,7 @@ RSpec.describe 'CSAT Survey Responses API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data['total_count']).to eq 1
         expect(response_data['total_sent_messages_count']).to eq 0
         expect(response_data['ratings_count']).to eq({ '1' => 1 })
@@ -123,7 +123,7 @@ RSpec.describe 'CSAT Survey Responses API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data['total_count']).to eq 1
         expect(response_data['total_sent_messages_count']).to eq 0
         expect(response_data['ratings_count']).to eq({ '1' => 1 })
@@ -144,7 +144,7 @@ RSpec.describe 'CSAT Survey Responses API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data['total_count']).to eq 2
         expect(response_data['total_sent_messages_count']).to eq 0
         expect(response_data['ratings_count']).to eq({ '1' => 2 })
diff --git a/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb b/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
index f266aa617..d434381cd 100644
--- a/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
 
         expect(response_body.count).to eq(2)
         expect(response_body.first['attribute_key']).to eq(custom_attribute_definition.attribute_key)
@@ -86,7 +86,7 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
         end.to change(CustomAttributeDefinition, :count).by(1)
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['attribute_key']).to eq 'developer_id'
       end
     end
diff --git a/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb b/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
index c9a79bdd0..73ba61859 100644
--- a/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Custom Filters API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body.first['name']).to eq(custom_filter.name)
         expect(response_body.first['query']).to eq(custom_filter.query)
       end
@@ -74,7 +74,7 @@ RSpec.describe 'Custom Filters API', type: :request do
         end.to change(CustomFilter, :count).by(1)
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['name']).to eq 'vip-customers'
       end
     end
diff --git a/spec/controllers/api/v1/accounts/dashboard_apps_controller_spec.rb b/spec/controllers/api/v1/accounts/dashboard_apps_controller_spec.rb
index a557ad788..e545b0e35 100644
--- a/spec/controllers/api/v1/accounts/dashboard_apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/dashboard_apps_controller_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'DashboardAppsController', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body.first['title']).to eq(dashboard_app.title)
         expect(response_body.first['content']).to eq(dashboard_app.content)
       end
@@ -76,7 +76,7 @@ RSpec.describe 'DashboardAppsController', type: :request do
         end.to change(DashboardApp, :count).by(1)
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['title']).to eq 'CRM Dashboard'
         expect(json_response['content'][0]['link']).to eq payload[:dashboard_app][:content][0][:link]
         expect(json_response['content'][0]['type']).to eq payload[:dashboard_app][:content][0][:type]
@@ -89,7 +89,7 @@ RSpec.describe 'DashboardAppsController', type: :request do
         end.not_to change(DashboardApp, :count)
 
         expect(response).to have_http_status(:unprocessable_entity)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['message']).to eq 'Content : Invalid data'
       end
 
@@ -126,7 +126,7 @@ RSpec.describe 'DashboardAppsController', type: :request do
               as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(dashboard_app.reload.title).to eq('CRM Dashboard')
         expect(json_response['content'][0]['link']).to eq payload[:dashboard_app][:content][0][:link]
         expect(json_response['content'][0]['type']).to eq payload[:dashboard_app][:content][0][:type]
diff --git a/spec/controllers/api/v1/accounts/inbox_members_controller_spec.rb b/spec/controllers/api/v1/accounts/inbox_members_controller_spec.rb
index b19035e77..34633601e 100644
--- a/spec/controllers/api/v1/accounts/inbox_members_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inbox_members_controller_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe 'Inbox Member API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)['payload'].pluck('id')).to eq(inbox.inbox_members.pluck(:user_id))
+        expect(response.parsed_body['payload'].pluck('id')).to eq(inbox.inbox_members.pluck(:user_id))
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index f19094b0c..b4b6da6fe 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -248,7 +248,7 @@ RSpec.describe 'Inboxes API', type: :request do
     context 'when it is an authenticated user' do
       before do
         create(:inbox_member, user: agent, inbox: inbox)
-        inbox.avatar.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        inbox.avatar.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       end
 
       it 'delete inbox avatar for administrator user' do
@@ -293,7 +293,7 @@ RSpec.describe 'Inboxes API', type: :request do
                  as: :json
         end
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(response).to have_http_status(:success)
         expect(json_response['message']).to eq('Your inbox deletion request will be processed in some time.')
@@ -410,7 +410,7 @@ RSpec.describe 'Inboxes API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['allow_messages_after_resolved']).to be true
       end
     end
@@ -452,7 +452,7 @@ RSpec.describe 'Inboxes API', type: :request do
         expect(response).to have_http_status(:success)
         expect(inbox.reload.enable_auto_assignment).to be_falsey
         expect(inbox.reload.portal_id).to eq(portal.id)
-        expect(JSON.parse(response.body)['name']).to eq 'new test inbox'
+        expect(response.parsed_body['name']).to eq 'new test inbox'
       end
 
       it 'updates api inbox when administrator' do
diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index 4f120df9c..43735046e 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Integration Apps API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        apps = JSON.parse(response.body)['payload'].first
+        apps = response.parsed_body['payload'].first
         expect(apps['id']).to eql(first_app.id)
         expect(apps['name']).to eql(first_app.name)
         expect(apps['action']).to be_nil
@@ -36,7 +36,7 @@ RSpec.describe 'Integration Apps API', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        app = JSON.parse(response.body)['payload'].find { |int_app| int_app['id'] == openai.app.id }
+        app = response.parsed_body['payload'].find { |int_app| int_app['id'] == openai.app.id }
         expect(app['hooks'].first['settings']).to be_nil
       end
 
@@ -47,7 +47,7 @@ RSpec.describe 'Integration Apps API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        apps = JSON.parse(response.body)['payload'].first
+        apps = response.parsed_body['payload'].first
         expect(apps['id']).to eql(first_app.id)
         expect(apps['name']).to eql(first_app.name)
         expect(apps['action']).to eql(first_app.action)
@@ -60,7 +60,7 @@ RSpec.describe 'Integration Apps API', type: :request do
               as: :json
 
           expect(response).to have_http_status(:success)
-          apps = JSON.parse(response.body)['payload']
+          apps = response.parsed_body['payload']
           slack_app = apps.find { |app| app['id'] == 'slack' }
           expect(slack_app['action']).to include('client_id=client_id')
         end
@@ -74,7 +74,7 @@ RSpec.describe 'Integration Apps API', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        app = JSON.parse(response.body)['payload'].find { |int_app| int_app['id'] == openai.app.id }
+        app = response.parsed_body['payload'].find { |int_app| int_app['id'] == openai.app.id }
         expect(app['hooks'].first['settings']).not_to be_nil
       end
     end
@@ -98,7 +98,7 @@ RSpec.describe 'Integration Apps API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        app = JSON.parse(response.body)
+        app = response.parsed_body
         expect(app['id']).to eql('slack')
         expect(app['name']).to eql('Slack')
       end
@@ -111,7 +111,7 @@ RSpec.describe 'Integration Apps API', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        app = JSON.parse(response.body)
+        app = response.parsed_body
         expect(app['hooks'].first['settings']).to be_nil
       end
 
@@ -123,7 +123,7 @@ RSpec.describe 'Integration Apps API', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        app = JSON.parse(response.body)
+        app = response.parsed_body
         expect(app['hooks'].first['settings']).not_to be_nil
       end
     end
diff --git a/spec/controllers/api/v1/accounts/integrations/dyte_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/dyte_controller_spec.rb
index 092e467b8..c70ecc845 100644
--- a/spec/controllers/api/v1/accounts/integrations/dyte_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/dyte_controller_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe 'Dyte Integration API', type: :request do
              headers: agent.create_new_auth_token,
              as: :json
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         last_message = conversation.reload.messages.last
         expect(conversation.display_id).to eq(response_body['conversation_id'])
         expect(last_message.id).to eq(response_body['id'])
@@ -76,7 +76,7 @@ RSpec.describe 'Dyte Integration API', type: :request do
              headers: agent.create_new_auth_token,
              as: :json
         expect(response).to have_http_status(:unprocessable_entity)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['error']).to eq({ 'data' => { 'message' => 'Title is required' }, 'success' => false })
       end
     end
@@ -126,7 +126,7 @@ RSpec.describe 'Dyte Integration API', type: :request do
              headers: agent.create_new_auth_token,
              as: :json
         expect(response).to have_http_status(:success)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
         expect(response_body['authResponse']).to eq(
           {
             'userAdded' => true, 'id' => 'random_uuid', 'auth_token' => 'json-web-token'
diff --git a/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
index 37378b5a5..562272f14 100644
--- a/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe 'Integration Hooks API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['app_id']).to eq params[:app_id]
       end
     end
@@ -71,7 +71,7 @@ RSpec.describe 'Integration Hooks API', type: :request do
               as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['app_id']).to eq 'slack'
       end
     end
@@ -131,7 +131,7 @@ RSpec.describe 'Integration Hooks API', type: :request do
                as: :json
 
         expect(response).to have_http_status(:success)
-        expect(::Integrations::Hook.exists?(hook.id)).to be false
+        expect(Integrations::Hook.exists?(hook.id)).to be false
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/macros_controller_spec.rb b/spec/controllers/api/v1/accounts/macros_controller_spec.rb
index 7fbe6b54e..8a88caa1c 100644
--- a/spec/controllers/api/v1/accounts/macros_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/macros_controller_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
         visible_macros = account.macros.global.or(account.macros.personal.where(created_by_id: administrator.id)).order(:id)
 
         expect(response).to have_http_status(:success)
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         expect(body['payload'].length).to eq(visible_macros.count)
 
@@ -42,7 +42,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
         visible_macros = account.macros.global.or(account.macros.personal.where(created_by_id: agent.id)).order(:id)
 
         expect(body['payload'].length).to eq(visible_macros.count)
@@ -105,7 +105,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['payload']['name']).to eql(params['name'])
         expect(json_response['payload']['visibility']).to eql(params['visibility'])
@@ -119,7 +119,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['payload']['name']).to eql(params['name'])
         expect(json_response['payload']['visibility']).to eql('personal')
@@ -135,7 +135,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        blob = JSON.parse(response.body)
+        blob = response.parsed_body
 
         expect(blob['blob_key']).to be_present
         expect(blob['blob_id']).to be_present
@@ -186,7 +186,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
             headers: administrator.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['name']).to eql(params['name'])
       end
 
@@ -197,7 +197,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
             params: params,
             headers: agent_1.create_new_auth_token
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(response).to have_http_status(:unauthorized)
         expect(json_response['error']).to eq('You are not authorized to do this action')
@@ -223,7 +223,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['payload']['name']).to eql(macro.name)
         expect(json_response['payload']['created_by']['id']).to eql(administrator.id)
@@ -242,7 +242,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
         get "/api/v1/accounts/#{account.id}/macros/#{macro.id}",
             headers: agent_1.create_new_auth_token
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(response).to have_http_status(:unauthorized)
         expect(json_response['error']).to eq('You are not authorized to do this action')
@@ -452,7 +452,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
         delete "/api/v1/accounts/#{account.id}/macros/#{macro.id}",
                headers: agent_1.create_new_auth_token
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(response).to have_http_status(:unauthorized)
         expect(json_response['error']).to eq('You are not authorized to do this action')
@@ -464,7 +464,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
         delete "/api/v1/accounts/#{account.id}/macros/#{macro.id}",
                headers: agent_1.create_new_auth_token
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(response).to have_http_status(:unauthorized)
         expect(json_response['error']).to eq('You are not authorized to do this action')
diff --git a/spec/controllers/api/v1/accounts/microsoft/authorization_controller_spec.rb b/spec/controllers/api/v1/accounts/microsoft/authorization_controller_spec.rb
index 60948bce1..853cf2850 100644
--- a/spec/controllers/api/v1/accounts/microsoft/authorization_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/microsoft/authorization_controller_spec.rb
@@ -40,8 +40,8 @@ RSpec.describe 'Microsoft Authorization API', type: :request do
             prompt: 'consent'
           }
         )
-        expect(JSON.parse(response.body)['url']).to eq response_url
-        expect(::Redis::Alfred.get(administrator.email)).to eq(account.id.to_s)
+        expect(response.parsed_body['url']).to eq response_url
+        expect(Redis::Alfred.get(administrator.email)).to eq(account.id.to_s)
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/notification_settings_controller_spec.rb b/spec/controllers/api/v1/accounts/notification_settings_controller_spec.rb
index 26ea66972..221c5f976 100644
--- a/spec/controllers/api/v1/accounts/notification_settings_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notification_settings_controller_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe 'Notification Settings API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['user_id']).to eq(agent.id)
         expect(json_response['account_id']).to eq(account.id)
       end
@@ -47,7 +47,7 @@ RSpec.describe 'Notification Settings API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         agent.reload
         expect(json_response['user_id']).to eq(agent.id)
         expect(json_response['account_id']).to eq(account.id)
diff --git a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
index 4429e39e7..99baf1b25 100644
--- a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Notifications API', type: :request do
             headers: admin.create_new_auth_token,
             as: :json
 
-        response_json = JSON.parse(response.body)
+        response_json = response.parsed_body
         expect(response).to have_http_status(:success)
         expect(response.body).to include(notification1.notification_type)
         expect(response_json['data']['meta']['unread_count']).to eq 2
@@ -121,7 +121,7 @@ RSpec.describe 'Notifications API', type: :request do
             headers: admin.create_new_auth_token,
             as: :json
 
-        response_json = JSON.parse(response.body)
+        response_json = response.parsed_body
         expect(response).to have_http_status(:success)
         expect(response_json).to eq 2
       end
diff --git a/spec/controllers/api/v1/accounts/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
index 2875f1a29..2210a5cd5 100644
--- a/spec/controllers/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
             headers: agent.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload'].length).to be 2
         expect(json_response['payload'][0]['id']).to be portal.id
       end
@@ -48,7 +48,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
             headers: agent.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['name']).to eq portal.name
         expect(json_response['meta']['all_articles_count']).to eq 0
       end
@@ -65,7 +65,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
             headers: agent.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['name']).to eq portal.name
         expect(json_response['meta']['all_articles_count']).to eq 2
         expect(json_response['meta']['mine_articles_count']).to eq 1
@@ -98,7 +98,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
              headers: admin.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['name']).to eql('test_portal')
         expect(json_response['custom_domain']).to eql('support.chatwoot.dev')
       end
@@ -130,7 +130,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
             headers: admin.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['name']).to eql(portal_params[:portal][:name])
         expect(json_response['config']).to eql({ 'allowed_locales' => [{ 'articles_count' => 0, 'categories_count' => 0, 'code' => 'en' },
                                                                        { 'articles_count' => 0, 'categories_count' => 0, 'code' => 'es' }] })
@@ -150,7 +150,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
             headers: admin.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['archived']).to eql(portal_params[:portal][:archived])
 
         portal.reload
@@ -204,7 +204,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
             headers: admin.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(portal.reload.member_ids).to include(agent_1.id)
         expect(json_response['portal_members'].length).to be(3)
       end
@@ -221,7 +221,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
 
       expect(response).to have_http_status(:success)
 
-      blob = JSON.parse(response.body)
+      blob = response.parsed_body
 
       expect(blob['blob_key']).to be_present
       expect(blob['blob_id']).to be_present
diff --git a/spec/controllers/api/v1/accounts/search_controller_spec.rb b/spec/controllers/api/v1/accounts/search_controller_spec.rb
index 9081c0d4c..b5644cebf 100644
--- a/spec/controllers/api/v1/accounts/search_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/search_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Search', type: :request do
         response_data = JSON.parse(response.body, symbolize_names: true)
 
         expect(response_data[:payload][:messages].first[:content]).to eq 'test2'
-        expect(response_data[:payload].keys).to match_array [:contacts, :conversations, :messages]
+        expect(response_data[:payload].keys).to contain_exactly(:contacts, :conversations, :messages)
         expect(response_data[:payload][:messages].length).to eq 2
         expect(response_data[:payload][:conversations].length).to eq 1
         expect(response_data[:payload][:contacts].length).to eq 1
@@ -60,7 +60,7 @@ RSpec.describe 'Search', type: :request do
         expect(response).to have_http_status(:success)
         response_data = JSON.parse(response.body, symbolize_names: true)
 
-        expect(response_data[:payload].keys).to match_array [:contacts]
+        expect(response_data[:payload].keys).to contain_exactly(:contacts)
         expect(response_data[:payload][:contacts].length).to eq 1
       end
     end
@@ -85,7 +85,7 @@ RSpec.describe 'Search', type: :request do
         expect(response).to have_http_status(:success)
         response_data = JSON.parse(response.body, symbolize_names: true)
 
-        expect(response_data[:payload].keys).to match_array [:conversations]
+        expect(response_data[:payload].keys).to contain_exactly(:conversations)
         expect(response_data[:payload][:conversations].length).to eq 1
       end
     end
@@ -110,7 +110,7 @@ RSpec.describe 'Search', type: :request do
         expect(response).to have_http_status(:success)
         response_data = JSON.parse(response.body, symbolize_names: true)
 
-        expect(response_data[:payload].keys).to match_array [:messages]
+        expect(response_data[:payload].keys).to contain_exactly(:messages)
         expect(response_data[:payload][:messages].length).to eq 2
       end
     end
diff --git a/spec/controllers/api/v1/accounts/team_members_controller_spec.rb b/spec/controllers/api/v1/accounts/team_members_controller_spec.rb
index 6643244c2..ea2ee19c5 100644
--- a/spec/controllers/api/v1/accounts/team_members_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/team_members_controller_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe 'Team Members API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body).first['id']).to eq(agent.id)
+        expect(response.parsed_body.first['id']).to eq(agent.id)
       end
     end
   end
@@ -65,7 +65,7 @@ RSpec.describe 'Team Members API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response.count).to eq(user_ids.count - 1)
       end
     end
@@ -144,7 +144,7 @@ RSpec.describe 'Team Members API', type: :request do
               as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response.count).to eq(user_ids.count)
       end
 
@@ -157,7 +157,7 @@ RSpec.describe 'Team Members API', type: :request do
               as: :json
 
         expect(response).to have_http_status(:unauthorized)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['error']).to eq('Invalid User IDs')
       end
     end
diff --git a/spec/controllers/api/v1/accounts/teams_controller_spec.rb b/spec/controllers/api/v1/accounts/teams_controller_spec.rb
index 5c8588867..347510db6 100644
--- a/spec/controllers/api/v1/accounts/teams_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/teams_controller_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Teams API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body).first['id']).to eq(account.teams.first.id)
+        expect(response.parsed_body.first['id']).to eq(account.teams.first.id)
       end
     end
   end
@@ -45,7 +45,7 @@ RSpec.describe 'Teams API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)['id']).to eq(team.id)
+        expect(response.parsed_body['id']).to eq(team.id)
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/twitter/authorizations_controller_spec.rb b/spec/controllers/api/v1/accounts/twitter/authorizations_controller_spec.rb
index 1a0772243..c6cb41f67 100644
--- a/spec/controllers/api/v1/accounts/twitter/authorizations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/twitter/authorizations_controller_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe 'Twitter Authorization API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)['url']).to include('test_token')
+        expect(response.parsed_body['url']).to include('test_token')
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
index ae1adfa77..3a68d8921 100644
--- a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'Webhooks API', type: :request do
             headers: administrator.create_new_auth_token,
             as: :json
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)['payload']['webhooks'].count).to eql account.webhooks.count
+        expect(response.parsed_body['payload']['webhooks'].count).to eql account.webhooks.count
       end
     end
   end
@@ -46,7 +46,7 @@ RSpec.describe 'Webhooks API', type: :request do
              as: :json
         expect(response).to have_http_status(:success)
 
-        expect(JSON.parse(response.body)['payload']['webhook']['url']).to eql 'https://hello.com'
+        expect(response.parsed_body['payload']['webhook']['url']).to eql 'https://hello.com'
       end
 
       it 'throws error when invalid url provided' do
@@ -55,7 +55,7 @@ RSpec.describe 'Webhooks API', type: :request do
              headers: administrator.create_new_auth_token,
              as: :json
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(JSON.parse(response.body)['message']).to eql 'Url is invalid'
+        expect(response.parsed_body['message']).to eql 'Url is invalid'
       end
 
       it 'throws error if subscription events are invalid' do
@@ -64,7 +64,7 @@ RSpec.describe 'Webhooks API', type: :request do
              headers: administrator.create_new_auth_token,
              as: :json
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(JSON.parse(response.body)['message']).to eql 'Subscriptions Invalid events'
+        expect(response.parsed_body['message']).to eql 'Subscriptions Invalid events'
       end
 
       it 'throws error if subscription events are empty' do
@@ -73,7 +73,7 @@ RSpec.describe 'Webhooks API', type: :request do
              headers: administrator.create_new_auth_token,
              as: :json
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(JSON.parse(response.body)['message']).to eql 'Subscriptions Invalid events'
+        expect(response.parsed_body['message']).to eql 'Subscriptions Invalid events'
       end
 
       it 'use default if subscription events are nil' do
@@ -83,7 +83,7 @@ RSpec.describe 'Webhooks API', type: :request do
              as: :json
         expect(response).to have_http_status(:ok)
         expect(
-          JSON.parse(response.body)['payload']['webhook']['subscriptions']
+          response.parsed_body['payload']['webhook']['subscriptions']
         ).to eql %w[conversation_status_changed conversation_updated conversation_created contact_created contact_updated
                     message_created message_updated webwidget_triggered]
       end
@@ -107,7 +107,7 @@ RSpec.describe 'Webhooks API', type: :request do
             headers: administrator.create_new_auth_token,
             as: :json
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)['payload']['webhook']['url']).to eql 'https://hello.com'
+        expect(response.parsed_body['payload']['webhook']['url']).to eql 'https://hello.com'
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 2e402e54e..6b21cfbb2 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -149,7 +149,7 @@ RSpec.describe 'Accounts API', type: :request do
           as: :json
 
       expect(response).to have_http_status(:success)
-      expect(JSON.parse(response.body)['cache_keys'].keys).to match_array(%w[label inbox team])
+      expect(response.parsed_body['cache_keys'].keys).to match_array(%w[label inbox team])
     end
   end
 
@@ -206,7 +206,7 @@ RSpec.describe 'Accounts API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:unprocessable_entity)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['message']).to eq('Name is too long (maximum is 255 characters)')
       end
     end
diff --git a/spec/controllers/api/v1/notification_subscriptions_controller_spec.rb b/spec/controllers/api/v1/notification_subscriptions_controller_spec.rb
index 942153dfd..cb4366019 100644
--- a/spec/controllers/api/v1/notification_subscriptions_controller_spec.rb
+++ b/spec/controllers/api/v1/notification_subscriptions_controller_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe 'Notifications Subscriptions API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['subscription_type']).to eq('browser_push')
         expect(json_response['subscription_attributes']['auth']).to eq('test')
       end
@@ -53,7 +53,7 @@ RSpec.describe 'Notifications Subscriptions API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['id']).to eq(subscription.id)
       end
 
@@ -74,7 +74,7 @@ RSpec.describe 'Notifications Subscriptions API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['id']).to eq(subscription.id)
         expect(json_response['user_id']).to eq(agent.id)
       end
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 789e995b8..4feb359c6 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe 'Profile API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['id']).to eq(agent.id)
         expect(json_response['email']).to eq(agent.email)
         expect(json_response['access_token']).to eq(agent.access_token.token)
@@ -50,7 +50,7 @@ RSpec.describe 'Profile API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         agent.reload
         expect(json_response['id']).to eq(agent.id)
         expect(json_response['name']).to eq(agent.name)
@@ -64,7 +64,7 @@ RSpec.describe 'Profile API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         agent.reload
         expect(json_response['id']).to eq(agent.id)
         expect(json_response['name']).to eq(agent.name)
@@ -99,7 +99,7 @@ RSpec.describe 'Profile API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:unprocessable_entity)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['message']).to eq('Name is too long (maximum is 255 characters)')
       end
 
@@ -123,7 +123,7 @@ RSpec.describe 'Profile API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['ui_settings']['is_contact_sidebar_open']).to be(false)
       end
     end
@@ -159,7 +159,7 @@ RSpec.describe 'Profile API', type: :request do
 
     context 'when it is an authenticated user' do
       before do
-        agent.avatar.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        agent.avatar.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       end
 
       it 'deletes the agent avatar' do
@@ -191,7 +191,7 @@ RSpec.describe 'Profile API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        expect(::OnlineStatusTracker.get_status(account.id, agent.id)).to eq('busy')
+        expect(OnlineStatusTracker.get_status(account.id, agent.id)).to eq('busy')
       end
     end
   end
@@ -214,7 +214,7 @@ RSpec.describe 'Profile API', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['accounts'].first['auto_offline']).to be(false)
       end
     end
diff --git a/spec/controllers/api/v1/widget/campaigns_controller_spec.rb b/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
index 11248769f..602fa96b7 100644
--- a/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe '/api/v1/widget/campaigns', type: :request do
         get '/api/v1/widget/campaigns', params: params
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response.length).to eq 1
         expect(json_response.pluck('id')).to include(campaign_1.display_id)
         expect(json_response.pluck('id')).not_to include(campaign_2.display_id)
diff --git a/spec/controllers/api/v1/widget/configs_controller_spec.rb b/spec/controllers/api/v1/widget/configs_controller_spec.rb
index 4c4cef2c9..6946af3f1 100644
--- a/spec/controllers/api/v1/widget/configs_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/configs_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe '/api/v1/widget/config', type: :request do
   let!(:contact) { create(:contact, account: account) }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
 
   describe 'POST /api/v1/widget/config' do
     let(:params) { { website_token: web_widget.website_token } }
@@ -28,7 +28,7 @@ RSpec.describe '/api/v1/widget/config', type: :request do
         end.to change(Contact, :count).by(1)
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data.keys).to include(*response_keys)
       end
     end
@@ -43,7 +43,7 @@ RSpec.describe '/api/v1/widget/config', type: :request do
         end.not_to change(Contact, :count)
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data.keys).to include(*response_keys)
         expect(response_data['contact']['pubsub_token']).to eq(contact_inbox.pubsub_token)
       end
@@ -70,7 +70,7 @@ RSpec.describe '/api/v1/widget/config', type: :request do
         end.to change(Contact, :count).by(1)
 
         expect(response).to have_http_status(:success)
-        response_data = JSON.parse(response.body)
+        response_data = response.parsed_body
         expect(response_data.keys).to include(*response_keys)
       end
     end
diff --git a/spec/controllers/api/v1/widget/contacts_controller_spec.rb b/spec/controllers/api/v1/widget/contacts_controller_spec.rb
index bdac8fb24..336d9d9ca 100644
--- a/spec/controllers/api/v1/widget/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/contacts_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe '/api/v1/widget/contacts', type: :request do
   let(:contact) { create(:contact, account: account, email: 'test@test.com', phone_number: '+745623239') }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
 
   describe 'PATCH /api/v1/widget/contact' do
     let(:params) { { website_token: web_widget.website_token, identifier: 'test' } }
@@ -47,7 +47,7 @@ RSpec.describe '/api/v1/widget/contacts', type: :request do
               params: params.merge({ phone_number: '45623239' }),
               headers: { 'X-Auth-Token' => token },
               as: :json
-        body = JSON.parse(response.body)
+        body = response.parsed_body
         expect(body['phone_number']).to eq('+745623239')
         expect(response).to have_http_status(:success)
       end
@@ -57,7 +57,7 @@ RSpec.describe '/api/v1/widget/contacts', type: :request do
               params: params.merge({ phone_number: '+245623239' }),
               headers: { 'X-Auth-Token' => token },
               as: :json
-        body = JSON.parse(response.body)
+        body = response.parsed_body
         expect(body['phone_number']).to eq('+245623239')
         expect(response).to have_http_status(:success)
       end
@@ -67,7 +67,7 @@ RSpec.describe '/api/v1/widget/contacts', type: :request do
               params: params.merge({ email: 'test@' }),
               headers: { 'X-Auth-Token' => token },
               as: :json
-        body = JSON.parse(response.body)
+        body = response.parsed_body
         expect(body['email']).to eq('test@test.com')
         expect(response).to have_http_status(:success)
       end
@@ -77,7 +77,7 @@ RSpec.describe '/api/v1/widget/contacts', type: :request do
               params: params.merge({ email: 'test-1@test.com' }),
               headers: { 'X-Auth-Token' => token },
               as: :json
-        body = JSON.parse(response.body)
+        body = response.parsed_body
         expect(body['email']).to eq('test-1@test.com')
         expect(response).to have_http_status(:success)
       end
@@ -101,7 +101,7 @@ RSpec.describe '/api/v1/widget/contacts', type: :request do
               headers: { 'X-Auth-Token' => token },
               as: :json
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
         expect(body['id']).not_to eq(contact.id)
         expect(body['widget_auth_token']).not_to be_nil
         expect(Contact.find(body['id']).contact_inboxes.first.hmac_verified?).to be(true)
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index d76707bbc..40aed4616 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -8,9 +8,9 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
   let(:second_session) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let!(:conversation) { create(:conversation, contact: contact, account: account, inbox: web_widget.inbox, contact_inbox: contact_inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
   let(:token_without_conversation) do
-    ::Widget::TokenService.new(payload: { source_id: second_session.source_id, inbox_id: web_widget.inbox.id }).generate_token
+    Widget::TokenService.new(payload: { source_id: second_session.source_id, inbox_id: web_widget.inbox.id }).generate_token
   end
 
   describe 'GET /api/v1/widget/conversations' do
@@ -23,7 +23,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['id']).to eq(conversation.display_id)
         expect(json_response['status']).to eq(conversation.status)
@@ -35,7 +35,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
         allow(Rails.configuration.dispatcher).to receive(:dispatch)
 
         payload = { source_id: 'invalid source id', inbox_id: web_widget.inbox.id }
-        token = ::Widget::TokenService.new(payload: payload).generate_token
+        token = Widget::TokenService.new(payload: payload).generate_token
         get '/api/v1/widget/conversations',
             headers: { 'X-Auth-Token' => token },
             params: { website_token: web_widget.website_token },
@@ -65,7 +65,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
            as: :json
 
       expect(response).to have_http_status(:success)
-      json_response = JSON.parse(response.body)
+      json_response = response.parsed_body
       expect(json_response['id']).not_to be_nil
       expect(json_response['contact']['email']).to eq 'contact-email@chatwoot.com'
       expect(json_response['contact']['phone_number']).to eq '+919745313456'
@@ -89,7 +89,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
            as: :json
 
       expect(response).to have_http_status(:success)
-      json_response = JSON.parse(response.body)
+      json_response = response.parsed_body
       expect(json_response['id']).not_to be_nil
       expect(json_response['contact']['email']).to be_nil
       expect(json_response['contact']['name']).to eq 'alphy'
@@ -116,7 +116,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
            as: :json
 
       expect(response).to have_http_status(:success)
-      json_response = JSON.parse(response.body)
+      json_response = response.parsed_body
       expect(json_response['id']).not_to be_nil
       expect(json_response['contact']['email']).to eq existing_contact.email
       expect(json_response['contact']['name']).not_to eq 'contact-name'
@@ -144,7 +144,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
            as: :json
 
       expect(response).to have_http_status(:success)
-      json_response = JSON.parse(response.body)
+      json_response = response.parsed_body
       expect(json_response['contact']['phone_number']).to be_nil
     end
   end
diff --git a/spec/controllers/api/v1/widget/direct_uploads_controller_spec.rb b/spec/controllers/api/v1/widget/direct_uploads_controller_spec.rb
index 0db922370..bf1da7d37 100644
--- a/spec/controllers/api/v1/widget/direct_uploads_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/direct_uploads_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe '/api/v1/widget/direct_uploads', type: :request do
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:conversation) { create(:conversation, contact: contact, account: account, inbox: web_widget.inbox, contact_inbox: contact_inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
 
   describe 'POST /api/v1/widget/direct_uploads' do
     context 'when post request is made' do
@@ -31,7 +31,7 @@ RSpec.describe '/api/v1/widget/direct_uploads', type: :request do
              headers: { 'X-Auth-Token' => token }
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['content_type']).to eq('image/png')
       end
     end
diff --git a/spec/controllers/api/v1/widget/events_controller_spec.rb b/spec/controllers/api/v1/widget/events_controller_spec.rb
index da4136680..fdc8cb4fa 100644
--- a/spec/controllers/api/v1/widget/events_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/events_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe '/api/v1/widget/events', type: :request do
   let(:contact) { create(:contact, account: account) }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
 
   describe 'POST /api/v1/widget/events' do
     let(:params) { { website_token: web_widget.website_token, name: 'webwidget.triggered', event_info: { test_id: 'test' } } }
diff --git a/spec/controllers/api/v1/widget/inbox_members_controller_spec.rb b/spec/controllers/api/v1/widget/inbox_members_controller_spec.rb
index dc7bd2ce9..8e2a3897a 100644
--- a/spec/controllers/api/v1/widget/inbox_members_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/inbox_members_controller_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe '/api/v1/widget/inbox_members', type: :request do
         get '/api/v1/widget/inbox_members', params: params
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload'].length).to eq 2
       end
     end
diff --git a/spec/controllers/api/v1/widget/integrations/dyte_controller_spec.rb b/spec/controllers/api/v1/widget/integrations/dyte_controller_spec.rb
index 5d5ace90b..8479fcda5 100644
--- a/spec/controllers/api/v1/widget/integrations/dyte_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/integrations/dyte_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe '/api/v1/widget/integrations/dyte', type: :request do
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:conversation) { create(:conversation, contact: contact, account: account, inbox: web_widget.inbox, contact_inbox: contact_inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
   let(:message) { create(:message, conversation: conversation, account: account, inbox: conversation.inbox) }
   let!(:integration_message) do
     create(:message, content_type: 'integrations',
@@ -39,7 +39,7 @@ RSpec.describe '/api/v1/widget/integrations/dyte', type: :request do
                as: :json
 
           expect(response).to have_http_status(:unprocessable_entity)
-          response_body = JSON.parse(response.body)
+          response_body = response.parsed_body
           expect(response_body['error']).to eq('Invalid message type. Action not permitted')
         end
       end
@@ -61,7 +61,7 @@ RSpec.describe '/api/v1/widget/integrations/dyte', type: :request do
                as: :json
 
           expect(response).to have_http_status(:success)
-          response_body = JSON.parse(response.body)
+          response_body = response.parsed_body
           expect(response_body['authResponse']).to eq(
             {
               'userAdded' => true, 'id' => 'random_uuid', 'auth_token' => 'json-web-token'
diff --git a/spec/controllers/api/v1/widget/labels_controller_spec.rb b/spec/controllers/api/v1/widget/labels_controller_spec.rb
index fe242c29b..42572f256 100644
--- a/spec/controllers/api/v1/widget/labels_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/labels_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe '/api/v1/widget/labels', type: :request do
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let!(:conversation) { create(:conversation, contact: contact, account: account, inbox: web_widget.inbox, contact_inbox: contact_inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
 
   describe 'POST /api/v1/widget/labels' do
     let(:params) { { website_token: web_widget.website_token, label: 'customer-support' } }
diff --git a/spec/controllers/api/v1/widget/messages_controller_spec.rb b/spec/controllers/api/v1/widget/messages_controller_spec.rb
index 06c0b46a9..2525d79dd 100644
--- a/spec/controllers/api/v1/widget/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/messages_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:conversation) { create(:conversation, contact: contact, account: account, inbox: web_widget.inbox, contact_inbox: contact_inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
 
   before do |example|
     2.times.each { create(:message, account: account, inbox: web_widget.inbox, conversation: conversation) } unless example.metadata[:skip_before]
@@ -22,7 +22,7 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         # 2 messages created + 2 messages by the email hook
         expect(json_response['payload'].length).to eq(4)
         expect(json_response['meta']).not_to be_empty
@@ -35,7 +35,7 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['payload'].length).to eq(0)
       end
     end
@@ -52,7 +52,7 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['content']).to eq(message_params[:content])
       end
 
@@ -66,7 +66,7 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
 
         expect(response).to have_http_status(:unprocessable_entity)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['message']).to eq('Content is too long (maximum is 150000 characters)')
       end
@@ -79,7 +79,7 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
              headers: { 'X-Auth-Token' => token }
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['content']).to eq(message_params[:content])
 
         expect(conversation.messages.last.attachments.first.file.present?).to be(true)
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index 8b2c51450..574330df3 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe 'Reports API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         current_day_metric = json_response.select { |x| x['timestamp'] == start_of_today }
         expect(current_day_metric.length).to eq(1)
@@ -77,7 +77,7 @@ RSpec.describe 'Reports API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['open']).to eq(11)
         expect(json_response['unattended']).to eq(11)
@@ -99,7 +99,7 @@ RSpec.describe 'Reports API', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response.blank?).to be false
         user_metrics = json_response.find { |item| item['name'] == admin[:name] }
         expect(user_metrics.present?).to be true
@@ -140,7 +140,7 @@ RSpec.describe 'Reports API', type: :request do
             headers: admin.create_new_auth_token,
             as: :json
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         user_metrics = json_response.find { |item| item['name'] == agent[:name] }
         expect(user_metrics.present?).to be true
 
@@ -184,7 +184,7 @@ RSpec.describe 'Reports API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
 
         expect(json_response['conversations_count']).to eq(10)
       end
@@ -254,7 +254,7 @@ RSpec.describe 'Reports API', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['conversations_count']).to eq(1)
       end
     end
diff --git a/spec/controllers/installation/onboarding_controller_spec.rb b/spec/controllers/installation/onboarding_controller_spec.rb
index 3ab22db18..37a2d8822 100644
--- a/spec/controllers/installation/onboarding_controller_spec.rb
+++ b/spec/controllers/installation/onboarding_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Installation::Onboarding API', type: :request do
   describe 'GET /installation/onboarding' do
     context 'when CHATWOOT_INSTALLATION_ONBOARDING redis key is not set' do
       it 'redirects back' do
-        expect(::Redis::Alfred.get(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)).to be_nil
+        expect(Redis::Alfred.get(Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)).to be_nil
         get '/installation/onboarding'
         expect(response).to have_http_status(:redirect)
       end
@@ -14,10 +14,10 @@ RSpec.describe 'Installation::Onboarding API', type: :request do
 
     context 'when CHATWOOT_INSTALLATION_ONBOARDING redis key is set' do
       it 'returns onboarding page' do
-        ::Redis::Alfred.set(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING, true)
+        Redis::Alfred.set(Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING, true)
         get '/installation/onboarding'
         expect(response).to have_http_status(:success)
-        ::Redis::Alfred.delete(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)
+        Redis::Alfred.delete(Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)
       end
     end
   end
@@ -29,17 +29,17 @@ RSpec.describe 'Installation::Onboarding API', type: :request do
       allow(AccountBuilder).to receive(:new).and_return(account_builder)
       allow(account_builder).to receive(:perform).and_return(true)
       allow(ChatwootHub).to receive(:register_instance).and_return(true)
-      ::Redis::Alfred.set(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING, true)
+      Redis::Alfred.set(Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING, true)
     end
 
     after do
-      ::Redis::Alfred.delete(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)
+      Redis::Alfred.delete(Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)
     end
 
     context 'when onboarding successfull' do
       it 'deletes the redis key' do
         post '/installation/onboarding', params: { user: {} }
-        expect(::Redis::Alfred.get(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)).to be_nil
+        expect(Redis::Alfred.get(Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)).to be_nil
       end
 
       it 'will not call register instance when checkboxes are unchecked' do
@@ -57,7 +57,7 @@ RSpec.describe 'Installation::Onboarding API', type: :request do
       it 'does not deletes the redis key' do
         allow(AccountBuilder).to receive(:new).and_raise('error')
         post '/installation/onboarding', params: { user: {} }
-        expect(::Redis::Alfred.get(::Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)).not_to be_nil
+        expect(Redis::Alfred.get(Redis::Alfred::CHATWOOT_INSTALLATION_ONBOARDING)).not_to be_nil
       end
     end
   end
diff --git a/spec/controllers/platform/api/v1/account_users_controller_spec.rb b/spec/controllers/platform/api/v1/account_users_controller_spec.rb
index 9ab36b5b2..72563d8fb 100644
--- a/spec/controllers/platform/api/v1/account_users_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/account_users_controller_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe 'Platform Account Users API', type: :request do
              headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['user_id']).to eq(user.id)
       end
 
@@ -60,7 +60,7 @@ RSpec.describe 'Platform Account Users API', type: :request do
              headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['role']).to eq('administrator')
       end
     end
diff --git a/spec/controllers/platform/api/v1/accounts_controller_spec.rb b/spec/controllers/platform/api/v1/accounts_controller_spec.rb
index c41464f1f..db1713bb6 100644
--- a/spec/controllers/platform/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/accounts_controller_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe 'Platform Accounts API', type: :request do
 
         expect(response).to have_http_status(:success)
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['name']).to eq('Test Account')
         expect(json_response['locale']).to eq('es')
         expect(json_response['features']['agent_management']).to be(true)
@@ -59,7 +59,7 @@ RSpec.describe 'Platform Accounts API', type: :request do
           disable_branding: false
         } }, headers: { api_access_token: platform_app.access_token.token }, as: :json
 
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['name']).to include('Test Account')
         expect(json_response['features']['inbox_management']).to be(true)
         expect(json_response['features']['ip_lookup']).to be(true)
diff --git a/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb b/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb
index d56e1dfb9..030d694ff 100644
--- a/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe 'Platform Agent Bot API', type: :request do
       it 'returns unauthorized when its not a permissible object' do
         get '/platform/api/v1/agent_bots', headers: { api_access_token: platform_app.access_token.token }, as: :json
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data.length).to eq(0)
       end
 
@@ -35,7 +35,7 @@ RSpec.describe 'Platform Agent Bot API', type: :request do
             headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data.length).to eq(1)
       end
     end
@@ -71,7 +71,7 @@ RSpec.describe 'Platform Agent Bot API', type: :request do
             headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['name']).to eq(agent_bot.name)
       end
     end
@@ -100,7 +100,7 @@ RSpec.describe 'Platform Agent Bot API', type: :request do
                                              headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['name']).to eq('test')
         expect(platform_app.platform_app_permissibles.first.permissible_id).to eq data['id']
       end
@@ -137,7 +137,7 @@ RSpec.describe 'Platform Agent Bot API', type: :request do
                                                              headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['name']).to eq('test123')
       end
     end
diff --git a/spec/controllers/platform/api/v1/users_controller_spec.rb b/spec/controllers/platform/api/v1/users_controller_spec.rb
index edd91f36b..2ebb0d1a4 100644
--- a/spec/controllers/platform/api/v1/users_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/users_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Platform Users API', type: :request do
             headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['email']).to eq(user.email)
         expect(data['custom_attributes']['test']).to eq('test')
       end
@@ -70,7 +70,7 @@ RSpec.describe 'Platform Users API', type: :request do
             headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['url']).to include('email=dev%2Btesting%40chatwoot.com&sso_auth_token=')
       end
     end
@@ -103,7 +103,7 @@ RSpec.describe 'Platform Users API', type: :request do
         end.not_to enqueue_mail
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data).to match(
           hash_including(
             'name' => 'test',
@@ -118,7 +118,7 @@ RSpec.describe 'Platform Users API', type: :request do
 
         post '/platform/api/v1/users/', params: { name: 'test', email: 'TesT@test.com', password: 'Password1!' },
                                         headers: { api_access_token: platform_app.access_token.token }, as: :json
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['message']).to eq('Email has already been taken')
       end
 
@@ -128,7 +128,7 @@ RSpec.describe 'Platform Users API', type: :request do
                                         headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['name']).to eq('old test')
         expect(platform_app.platform_app_permissibles.first.permissible_id).to eq data['id']
       end
@@ -167,7 +167,7 @@ RSpec.describe 'Platform Users API', type: :request do
                                                    headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data['name']).to eq('test123')
         expect(data['email']).to eq('newtestemail@test.com')
         expect(data['custom_attributes']['test']).to eq('test_update')
diff --git a/spec/controllers/public/api/v1/csat_survey_controller_spec.rb b/spec/controllers/public/api/v1/csat_survey_controller_spec.rb
index 1cc411118..ea2a26e4b 100644
--- a/spec/controllers/public/api/v1/csat_survey_controller_spec.rb
+++ b/spec/controllers/public/api/v1/csat_survey_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Public Survey Responses API', type: :request do
       conversation = create(:conversation)
       create(:message, conversation: conversation, content_type: 'input_csat')
       get "/public/api/v1/csat_survey/#{conversation.uuid}"
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(response).to have_http_status(:success)
       expect(data['conversation_id']).to eq conversation.id
     end
@@ -30,7 +30,7 @@ RSpec.describe 'Public Survey Responses API', type: :request do
             params: params,
             as: :json
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data['conversation_id']).to eq conversation.id
       expect(data['csat_survey_response']['conversation_id']).to eq conversation.id
       expect(data['csat_survey_response']['feedback_message']).to eq 'amazing experience'
diff --git a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
index c5b7402fc..0911bdfca 100644
--- a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
       get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations"
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data.length).to eq 1
     end
 
@@ -40,7 +40,7 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
       post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations"
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data['id']).not_to be_nil
     end
   end
diff --git a/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb b/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
index 5916b7fb7..a7e055b19 100644
--- a/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
       get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{conversation.display_id}/messages"
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data.length).to eq 2
     end
   end
@@ -24,7 +24,7 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
            params: { content: 'hello' }
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data['content']).to eq('hello')
     end
 
@@ -35,7 +35,7 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
 
       expect(response).to have_http_status(:unprocessable_entity)
 
-      json_response = JSON.parse(response.body)
+      json_response = response.parsed_body
 
       expect(json_response['message']).to eq('Content is too long (maximum is 150000 characters)')
     end
@@ -46,7 +46,7 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
            params: { content: 'hello', attachments: [file] }
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data['content']).to eq('hello')
 
       expect(conversation.messages.last.attachments.first.file.present?).to be(true)
@@ -62,7 +62,7 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
             params: { submitted_values: [{ title: 'test' }] }
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data['content_attributes']['submitted_values'].first['title']).to eq 'test'
     end
 
@@ -77,7 +77,7 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
             as: :json
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data['content_attributes']['submitted_values']['csat_survey_response']['feedback_message']).to eq 'amazing experience'
       expect(data['content_attributes']['submitted_values']['csat_survey_response']['rating']).to eq 4
     end
diff --git a/spec/controllers/public/api/v1/portals_controller_spec.rb b/spec/controllers/public/api/v1/portals_controller_spec.rb
index 7234c62b5..2541906f1 100644
--- a/spec/controllers/public/api/v1/portals_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals_controller_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Public Portals API', type: :request do
       get "/hc/#{portal.slug}/en"
 
       expect(response).to have_http_status(:unauthorized)
-      json_response = JSON.parse(response.body)
+      json_response = response.parsed_body
 
       expect(json_response['error']).to eql "Domain: www.example.com is not registered with us. \
       Please send us an email at support@chatwoot.com with the custom domain name and account API key"
diff --git a/spec/controllers/twilio/callbacks_controller_spec.rb b/spec/controllers/twilio/callbacks_controller_spec.rb
index 847e9b12a..bf975be6b 100644
--- a/spec/controllers/twilio/callbacks_controller_spec.rb
+++ b/spec/controllers/twilio/callbacks_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'Twilio::CallbacksController', type: :request do
   let(:twilio_service) { instance_double(Twilio::IncomingMessageService) }
 
   before do
-    allow(::Twilio::IncomingMessageService).to receive(:new).and_return(twilio_service)
+    allow(Twilio::IncomingMessageService).to receive(:new).and_return(twilio_service)
     allow(twilio_service).to receive(:perform)
   end
 
diff --git a/spec/controllers/twitter/callbacks_controller_spec.rb b/spec/controllers/twitter/callbacks_controller_spec.rb
index 983b5c681..c2c8791a1 100644
--- a/spec/controllers/twitter/callbacks_controller_spec.rb
+++ b/spec/controllers/twitter/callbacks_controller_spec.rb
@@ -1,8 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe 'Twitter::CallbacksController', type: :request do
-  let(:twitter_client) { instance_double(::Twitty::Facade) }
-  let(:twitter_response) { instance_double(::Twitty::Response, status: '200', body: { message: 'Valid' }) }
+  let(:twitter_client) { instance_double(Twitty::Facade) }
+  let(:twitter_response) { instance_double(Twitty::Response, status: '200', body: { message: 'Valid' }) }
   let(:raw_response) { double }
   let(:user_object_rsponse) do
     OpenStruct.new(
@@ -15,15 +15,15 @@ RSpec.describe 'Twitter::CallbacksController', type: :request do
   let(:webhook_service) { double }
 
   before do
-    allow(::Twitty::Facade).to receive(:new).and_return(twitter_client)
-    allow(::Redis::Alfred).to receive(:get).and_return(account.id)
-    allow(::Redis::Alfred).to receive(:delete).and_return('OK')
+    allow(Twitty::Facade).to receive(:new).and_return(twitter_client)
+    allow(Redis::Alfred).to receive(:get).and_return(account.id)
+    allow(Redis::Alfred).to receive(:delete).and_return('OK')
     allow(twitter_client).to receive(:access_token).and_return(twitter_response)
     allow(twitter_response).to receive(:raw_response).and_return(raw_response)
     allow(raw_response).to receive(:body).and_return('oauth_token=1&oauth_token_secret=1&user_id=100&screen_name=chatwoot')
     allow(twitter_client).to receive(:user_show).and_return(user_object_rsponse)
     allow(JSON).to receive(:parse).and_return(user_object_rsponse)
-    allow(::Twitter::WebhookSubscribeService).to receive(:new).and_return(webhook_service)
+    allow(Twitter::WebhookSubscribeService).to receive(:new).and_return(webhook_service)
   end
 
   describe 'GET /twitter/callback' do
diff --git a/spec/controllers/webhooks/instagram_controller_spec.rb b/spec/controllers/webhooks/instagram_controller_spec.rb
index 4011489a4..df5a6596d 100644
--- a/spec/controllers/webhooks/instagram_controller_spec.rb
+++ b/spec/controllers/webhooks/instagram_controller_spec.rb
@@ -26,8 +26,8 @@ RSpec.describe 'Webhooks::InstagramController', type: :request do
     let!(:dm_params) { build(:instagram_message_create_event).with_indifferent_access }
 
     it 'call the instagram events job with the params' do
-      allow(::Webhooks::InstagramEventsJob).to receive(:perform_later)
-      expect(::Webhooks::InstagramEventsJob).to receive(:perform_later)
+      allow(Webhooks::InstagramEventsJob).to receive(:perform_later)
+      expect(Webhooks::InstagramEventsJob).to receive(:perform_later)
 
       instagram_params = dm_params.merge(object: 'instagram')
       post '/webhooks/instagram', params: instagram_params
diff --git a/spec/controllers/widgets_controller_spec.rb b/spec/controllers/widgets_controller_spec.rb
index 71aaa084c..7789bb478 100644
--- a/spec/controllers/widgets_controller_spec.rb
+++ b/spec/controllers/widgets_controller_spec.rb
@@ -6,7 +6,7 @@ describe '/widget', type: :request do
   let(:contact) { create(:contact, account: account) }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
-  let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token) { Widget::TokenService.new(payload: payload).generate_token }
 
   describe 'GET /widget' do
     it 'renders the page correctly when called with website_token' do
diff --git a/spec/cypress/app_commands/activerecord_fixtures.rb b/spec/cypress/app_commands/activerecord_fixtures.rb
index a891e182b..b81b7db63 100644
--- a/spec/cypress/app_commands/activerecord_fixtures.rb
+++ b/spec/cypress/app_commands/activerecord_fixtures.rb
@@ -7,7 +7,7 @@ if defined?(ActiveRecord)
   require 'active_record/fixtures'
 
   fixtures_dir ||= ActiveRecord::Tasks::DatabaseTasks.fixtures_path
-  fixture_files ||= Dir["#{fixtures_dir}/**/*.yml"].map { |f| f[(fixtures_dir.size + 1)..-5] }
+  fixture_files ||= Dir["#{fixtures_dir}/**/*.yml"].pluck((fixtures_dir.size + 1)..-5)
 
   logger.debug "loading fixtures: { dir: #{fixtures_dir}, files: #{fixture_files} }"
   ActiveRecord::FixtureSet.reset_cache
diff --git a/spec/cypress/app_commands/log_fail.rb b/spec/cypress/app_commands/log_fail.rb
index 264d9ea66..2f5ee4b1d 100644
--- a/spec/cypress/app_commands/log_fail.rb
+++ b/spec/cypress/app_commands/log_fail.rb
@@ -18,6 +18,6 @@ if defined?(ActiveRecord::Base)
 end
 
 filename = command_options.fetch('runnable_full_title', 'no title').gsub(/[^[:print:]]/, '')
-File.open(Rails.root.join("log/#{filename}.json"), 'w+') do |file|
+Rails.root.join("log/#{filename}.json").open('w+') do |file|
   file << JSON.pretty_generate(json_result)
 end
diff --git a/spec/drops/contact_drop_spec.rb b/spec/drops/contact_drop_spec.rb
index 644d7e3bc..e83ebb377 100644
--- a/spec/drops/contact_drop_spec.rb
+++ b/spec/drops/contact_drop_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::ContactDrop do
+describe ContactDrop do
   subject(:contact_drop) { described_class.new(contact) }
 
   let!(:contact) { create(:contact) }
diff --git a/spec/drops/user_drop_spec.rb b/spec/drops/user_drop_spec.rb
index 7c0465de5..1093ec4a0 100644
--- a/spec/drops/user_drop_spec.rb
+++ b/spec/drops/user_drop_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::UserDrop do
+describe UserDrop do
   subject(:user_drop) { described_class.new(user) }
 
   let!(:user) { create(:user) }
diff --git a/spec/factories/channel/channel_telegram.rb b/spec/factories/channel/channel_telegram.rb
index 99f332c4d..755b5c679 100644
--- a/spec/factories/channel/channel_telegram.rb
+++ b/spec/factories/channel/channel_telegram.rb
@@ -5,8 +5,8 @@ FactoryBot.define do
 
     before(:create) do |channel_telegram|
       # we are skipping some of the validation methods
-      channel_telegram.define_singleton_method(:ensure_valid_bot_token) { return }
-      channel_telegram.define_singleton_method(:setup_telegram_webhook) { return }
+      channel_telegram.define_singleton_method(:ensure_valid_bot_token) { nil }
+      channel_telegram.define_singleton_method(:setup_telegram_webhook) { nil }
     end
 
     after(:create) do |channel_telegram|
diff --git a/spec/factories/channel/channel_whatsapp.rb b/spec/factories/channel/channel_whatsapp.rb
index b2d482e1d..ccbbf7172 100644
--- a/spec/factories/channel/channel_whatsapp.rb
+++ b/spec/factories/channel/channel_whatsapp.rb
@@ -41,8 +41,8 @@ FactoryBot.define do
 
     before(:create) do |channel_whatsapp, options|
       # since factory already has the required message templates, we just need to bypass it getting updated
-      channel_whatsapp.define_singleton_method(:sync_templates) { return } unless options.sync_templates
-      channel_whatsapp.define_singleton_method(:validate_provider_config) { return } unless options.validate_provider_config
+      channel_whatsapp.define_singleton_method(:sync_templates) { nil } unless options.sync_templates
+      channel_whatsapp.define_singleton_method(:validate_provider_config) { nil } unless options.validate_provider_config
       if channel_whatsapp.provider == 'whatsapp_cloud'
         channel_whatsapp.provider_config = channel_whatsapp.provider_config.merge({ 'api_key' => 'test_key', 'phone_number_id' => '123456789',
                                                                                     'business_account_id' => '123456789' })
diff --git a/spec/factories/messages.rb b/spec/factories/messages.rb
index 3e51f2b35..b2ae41c5e 100644
--- a/spec/factories/messages.rb
+++ b/spec/factories/messages.rb
@@ -16,14 +16,14 @@ FactoryBot.define do
                                          channel: create(:channel_instagram_fb_page, account: message.account, instagram_id: 'instagram-123'))
         end
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image, external_url: 'https://www.example.com/test.jpeg')
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       end
     end
 
     trait :with_attachment do
       after(:build) do |message|
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       end
     end
 
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 91a257e13..134ab6d7c 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::ConversationFinder do
+describe ConversationFinder do
   subject(:conversation_finder) { described_class.new(user_1, params) }
 
   let!(:account) { create(:account) }
diff --git a/spec/finders/email_channel_finder_spec.rb b/spec/finders/email_channel_finder_spec.rb
index 17e7c0115..fe57dec0b 100644
--- a/spec/finders/email_channel_finder_spec.rb
+++ b/spec/finders/email_channel_finder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::EmailChannelFinder do
+describe EmailChannelFinder do
   include ActionMailbox::TestHelper
   let!(:channel_email) { create(:channel_email) }
 
diff --git a/spec/finders/message_finder_spec.rb b/spec/finders/message_finder_spec.rb
index d61a0785b..04d6e2df9 100644
--- a/spec/finders/message_finder_spec.rb
+++ b/spec/finders/message_finder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::MessageFinder do
+describe MessageFinder do
   subject(:message_finder) { described_class.new(conversation, params) }
 
   let!(:account) { create(:account) }
diff --git a/spec/helpers/cache_keys_helper_spec.rb b/spec/helpers/cache_keys_helper_spec.rb
index fa13f50ef..de4b71755 100644
--- a/spec/helpers/cache_keys_helper_spec.rb
+++ b/spec/helpers/cache_keys_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe CacheKeysHelper, type: :helper do
+RSpec.describe CacheKeysHelper do
   let(:account_id) { 1 }
   let(:key) { 'example_key' }
 
diff --git a/spec/helpers/email_helper_spec.rb b/spec/helpers/email_helper_spec.rb
index 1bc651e91..504154af8 100644
--- a/spec/helpers/email_helper_spec.rb
+++ b/spec/helpers/email_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe EmailHelper, type: :helper do
+describe EmailHelper do
   describe '#normalize_email_with_plus_addressing' do
     context 'when email is passed' do
       it 'normalise if plus addressing is present' do
diff --git a/spec/helpers/frontend_urls_helper_spec.rb b/spec/helpers/frontend_urls_helper_spec.rb
index 4f3903f73..c522d0ee9 100644
--- a/spec/helpers/frontend_urls_helper_spec.rb
+++ b/spec/helpers/frontend_urls_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe FrontendUrlsHelper, type: :helper do
+describe FrontendUrlsHelper do
   describe '#frontend_url' do
     context 'without query params' do
       it 'creates path correctly' do
diff --git a/spec/helpers/message_format_helper_spec.rb b/spec/helpers/message_format_helper_spec.rb
index a2e0c5f45..c5bafe67d 100644
--- a/spec/helpers/message_format_helper_spec.rb
+++ b/spec/helpers/message_format_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe MessageFormatHelper, type: :helper do
+describe MessageFormatHelper do
   describe '#transform_user_mention_content' do
     context 'when transform_user_mention_content called' do
       it 'return transormed text correctly' do
diff --git a/spec/helpers/url_helper_spec.rb b/spec/helpers/url_helper_spec.rb
index 0a845e31a..bb530fcad 100644
--- a/spec/helpers/url_helper_spec.rb
+++ b/spec/helpers/url_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe UrlHelper, type: :helper do
+describe UrlHelper do
   describe '#url_valid' do
     context 'when url valid called' do
       it 'return if valid url passed' do
diff --git a/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb b/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
index 78baae779..0e4ef3d45 100644
--- a/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
+++ b/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Account::ConversationsResolutionSchedulerJob, type: :job do
+RSpec.describe Account::ConversationsResolutionSchedulerJob do
   subject(:job) { described_class.perform_later }
 
   let!(:account) { create(:account) }
diff --git a/spec/jobs/agent_bots/csml_job_spec.rb b/spec/jobs/agent_bots/csml_job_spec.rb
index bd974a71a..46fa23fba 100644
--- a/spec/jobs/agent_bots/csml_job_spec.rb
+++ b/spec/jobs/agent_bots/csml_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe AgentBots::CsmlJob, type: :job do
+RSpec.describe AgentBots::CsmlJob do
   it 'runs csml processor service' do
     event = 'message.created'
     message = create(:message)
diff --git a/spec/jobs/agent_bots/webhook_job_spec.rb b/spec/jobs/agent_bots/webhook_job_spec.rb
index c642d88fc..f4c78c953 100644
--- a/spec/jobs/agent_bots/webhook_job_spec.rb
+++ b/spec/jobs/agent_bots/webhook_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe AgentBots::WebhookJob, type: :job do
+RSpec.describe AgentBots::WebhookJob do
   include ActiveJob::TestHelper
 
   subject(:job) { described_class.perform_later(url, payload) }
diff --git a/spec/jobs/agents/destroy_job_spec.rb b/spec/jobs/agents/destroy_job_spec.rb
index 7d7f6c036..cf6bb2ffa 100644
--- a/spec/jobs/agents/destroy_job_spec.rb
+++ b/spec/jobs/agents/destroy_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Agents::DestroyJob, type: :job do
+RSpec.describe Agents::DestroyJob do
   subject(:job) { described_class.perform_later(account, user) }
 
   let!(:account) { create(:account) }
diff --git a/spec/jobs/avatar/avatar_from_gravatar_job_spec.rb b/spec/jobs/avatar/avatar_from_gravatar_job_spec.rb
index c190bf17b..4f73fd4b2 100644
--- a/spec/jobs/avatar/avatar_from_gravatar_job_spec.rb
+++ b/spec/jobs/avatar/avatar_from_gravatar_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Avatar::AvatarFromGravatarJob, type: :job do
+RSpec.describe Avatar::AvatarFromGravatarJob do
   let(:avatarable) { create(:contact) }
   let(:email) { 'test@test.com' }
   let(:gravatar_url) { "https://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email)}?d=404" }
diff --git a/spec/jobs/avatar/avatar_from_url_job_spec.rb b/spec/jobs/avatar/avatar_from_url_job_spec.rb
index 11e43de64..b9886316a 100644
--- a/spec/jobs/avatar/avatar_from_url_job_spec.rb
+++ b/spec/jobs/avatar/avatar_from_url_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Avatar::AvatarFromUrlJob, type: :job do
+RSpec.describe Avatar::AvatarFromUrlJob do
   let(:avatarable) { create(:contact) }
   let(:avatar_url) { 'https://example.com/avatar.png' }
 
diff --git a/spec/jobs/bulk_actions_job_spec.rb b/spec/jobs/bulk_actions_job_spec.rb
index 5e8ee8f9e..f227a7f3c 100644
--- a/spec/jobs/bulk_actions_job_spec.rb
+++ b/spec/jobs/bulk_actions_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe BulkActionsJob, type: :job do
+RSpec.describe BulkActionsJob do
   params = {
     type: 'Conversation',
     fields: { status: 'snoozed' },
diff --git a/spec/jobs/campaigns/trigger_oneoff_campaign_job_spec.rb b/spec/jobs/campaigns/trigger_oneoff_campaign_job_spec.rb
index 6c56896ac..dc8823efc 100644
--- a/spec/jobs/campaigns/trigger_oneoff_campaign_job_spec.rb
+++ b/spec/jobs/campaigns/trigger_oneoff_campaign_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Campaigns::TriggerOneoffCampaignJob, type: :job do
+RSpec.describe Campaigns::TriggerOneoffCampaignJob do
   let(:account) { create(:account) }
   let!(:twilio_sms) { create(:channel_twilio_sms) }
   let!(:twilio_inbox) { create(:inbox, channel: twilio_sms) }
diff --git a/spec/jobs/channels/whatsapp/templates_sync_job_spec.rb b/spec/jobs/channels/whatsapp/templates_sync_job_spec.rb
index 335e4d6f7..caa3b9894 100644
--- a/spec/jobs/channels/whatsapp/templates_sync_job_spec.rb
+++ b/spec/jobs/channels/whatsapp/templates_sync_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Channels::Whatsapp::TemplatesSyncJob, type: :job do
+RSpec.describe Channels::Whatsapp::TemplatesSyncJob do
   let(:channel_whatsapp) { create(:channel_whatsapp, sync_templates: false) }
 
   it 'enqueues the job' do
diff --git a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
index 6d345584d..1b1050b5d 100644
--- a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
+++ b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Channels::Whatsapp::TemplatesSyncSchedulerJob, type: :job do
+RSpec.describe Channels::Whatsapp::TemplatesSyncSchedulerJob do
   it 'enqueues the job' do
     expect { described_class.perform_later }.to have_enqueued_job(described_class)
       .on_queue('low')
diff --git a/spec/jobs/conversations/reopen_snoozed_conversations_job_spec.rb b/spec/jobs/conversations/reopen_snoozed_conversations_job_spec.rb
index d58b13d52..802bc2194 100644
--- a/spec/jobs/conversations/reopen_snoozed_conversations_job_spec.rb
+++ b/spec/jobs/conversations/reopen_snoozed_conversations_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Conversations::ReopenSnoozedConversationsJob, type: :job do
+RSpec.describe Conversations::ReopenSnoozedConversationsJob do
   let!(:snoozed_till_5_minutes_ago) { create(:conversation, status: :snoozed, snoozed_until: 5.minutes.ago) }
   let!(:snoozed_till_tomorrow) { create(:conversation, status: :snoozed, snoozed_until: 1.day.from_now) }
   let!(:snoozed_indefinitely) { create(:conversation, status: :snoozed) }
diff --git a/spec/jobs/conversations/resolution_job_spec.rb b/spec/jobs/conversations/resolution_job_spec.rb
index 4ed26c1d0..ad2dee92b 100644
--- a/spec/jobs/conversations/resolution_job_spec.rb
+++ b/spec/jobs/conversations/resolution_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Conversations::ResolutionJob, type: :job do
+RSpec.describe Conversations::ResolutionJob do
   subject(:job) { described_class.perform_later(account) }
 
   let!(:account) { create(:account) }
diff --git a/spec/jobs/data_import_job_spec.rb b/spec/jobs/data_import_job_spec.rb
index d48f2ca3c..2f2783eb8 100644
--- a/spec/jobs/data_import_job_spec.rb
+++ b/spec/jobs/data_import_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe DataImportJob, type: :job do
+RSpec.describe DataImportJob do
   subject(:job) { described_class.perform_later(data_import) }
 
   let!(:data_import) { create(:data_import) }
diff --git a/spec/jobs/delete_object_job_spec.rb b/spec/jobs/delete_object_job_spec.rb
index 15f19bdb0..854ff1da2 100644
--- a/spec/jobs/delete_object_job_spec.rb
+++ b/spec/jobs/delete_object_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe DeleteObjectJob, type: :job do
+RSpec.describe DeleteObjectJob do
   subject(:job) { described_class.perform_later(account) }
 
   let(:account) { create(:account) }
diff --git a/spec/jobs/event_dispatcher_job_spec.rb b/spec/jobs/event_dispatcher_job_spec.rb
index a0297785a..c5a99889e 100644
--- a/spec/jobs/event_dispatcher_job_spec.rb
+++ b/spec/jobs/event_dispatcher_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe EventDispatcherJob, type: :job do
+RSpec.describe EventDispatcherJob do
   subject(:job) { described_class.perform_later(event_name, timestamp, event_data) }
 
   let!(:conversation) { create(:conversation) }
diff --git a/spec/jobs/hook_job_spec.rb b/spec/jobs/hook_job_spec.rb
index 8275bfa31..67dfcaf5f 100644
--- a/spec/jobs/hook_job_spec.rb
+++ b/spec/jobs/hook_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe HookJob, type: :job do
+RSpec.describe HookJob do
   subject(:job) { described_class.perform_later(hook, event_name, event_data) }
 
   let(:account) { create(:account) }
diff --git a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
index 33f516e42..ae4f540d4 100644
--- a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Inboxes::FetchImapEmailInboxesJob, type: :job do
+RSpec.describe Inboxes::FetchImapEmailInboxesJob do
   let(:account) { create(:account) }
   let(:imap_email_channel) do
     create(:channel_email, imap_enabled: true, imap_address: 'imap.gmail.com', imap_port: 993, imap_login: 'imap@gmail.com',
diff --git a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
index 20c3880e8..30a77c5ec 100644
--- a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Inboxes::FetchImapEmailsJob, type: :job do
+RSpec.describe Inboxes::FetchImapEmailsJob do
   include ActionMailbox::TestHelper
 
   let(:account) { create(:account) }
diff --git a/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb b/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb
index 9348754d1..d9258e88a 100644
--- a/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb
+++ b/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Inboxes::SyncWidgetPreChatCustomFieldsJob, type: :job do
+RSpec.describe Inboxes::SyncWidgetPreChatCustomFieldsJob do
   pre_chat_fields = [{
     'label' => 'Developer Id',
     'name' => 'developer_id'
diff --git a/spec/jobs/inboxes/update_widget_pre_chat_custom_fields_job_spec.rb b/spec/jobs/inboxes/update_widget_pre_chat_custom_fields_job_spec.rb
index 80a32be34..284a0de70 100644
--- a/spec/jobs/inboxes/update_widget_pre_chat_custom_fields_job_spec.rb
+++ b/spec/jobs/inboxes/update_widget_pre_chat_custom_fields_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Inboxes::UpdateWidgetPreChatCustomFieldsJob, type: :job do
+RSpec.describe Inboxes::UpdateWidgetPreChatCustomFieldsJob do
   pre_chat_fields = [{
     'label' => 'Developer Id',
     'name' => 'developer_id'
diff --git a/spec/jobs/internal/check_new_versions_job_spec.rb b/spec/jobs/internal/check_new_versions_job_spec.rb
index 853241835..3253ce319 100644
--- a/spec/jobs/internal/check_new_versions_job_spec.rb
+++ b/spec/jobs/internal/check_new_versions_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Internal::CheckNewVersionsJob, type: :job do
+RSpec.describe Internal::CheckNewVersionsJob do
   subject(:job) { described_class.perform_now }
 
   it 'updates the latest chatwoot version in redis' do
@@ -9,6 +9,6 @@ RSpec.describe Internal::CheckNewVersionsJob, type: :job do
     allow(ChatwootHub).to receive(:latest_version).and_return(version)
     job
     expect(ChatwootHub).to have_received(:latest_version)
-    expect(::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)).to eq version
+    expect(Redis::Alfred.get(Redis::Alfred::LATEST_CHATWOOT_VERSION)).to eq version
   end
 end
diff --git a/spec/jobs/labels/update_job_spec.rb b/spec/jobs/labels/update_job_spec.rb
index 16692b2c3..9d9263da6 100644
--- a/spec/jobs/labels/update_job_spec.rb
+++ b/spec/jobs/labels/update_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Labels::UpdateJob, type: :job do
+RSpec.describe Labels::UpdateJob do
   subject(:job) { described_class.perform_later(new_label_title, old_label_title, account_id) }
 
   let(:new_label_title) { 'new-title' }
diff --git a/spec/jobs/migration/conversations_first_reply_scheduler_job_spec.rb b/spec/jobs/migration/conversations_first_reply_scheduler_job_spec.rb
index f16b51a3a..52ef7b574 100644
--- a/spec/jobs/migration/conversations_first_reply_scheduler_job_spec.rb
+++ b/spec/jobs/migration/conversations_first_reply_scheduler_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Migration::ConversationsFirstReplySchedulerJob, type: :job do
+RSpec.describe Migration::ConversationsFirstReplySchedulerJob do
   subject(:job) { described_class.perform_later }
 
   let!(:account) { create(:account) }
diff --git a/spec/jobs/send_reply_job_spec.rb b/spec/jobs/send_reply_job_spec.rb
index 304653b41..e0e6a121a 100644
--- a/spec/jobs/send_reply_job_spec.rb
+++ b/spec/jobs/send_reply_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe SendReplyJob, type: :job do
+RSpec.describe SendReplyJob do
   subject(:job) { described_class.perform_later(message) }
 
   let(:message) { create(:message) }
@@ -33,8 +33,8 @@ RSpec.describe SendReplyJob, type: :job do
       twitter_channel = create(:channel_twitter_profile)
       twitter_inbox = create(:inbox, channel: twitter_channel)
       message = create(:message, conversation: create(:conversation, inbox: twitter_inbox))
-      allow(::Twitter::SendOnTwitterService).to receive(:new).with(message: message).and_return(process_service)
-      expect(::Twitter::SendOnTwitterService).to receive(:new).with(message: message)
+      allow(Twitter::SendOnTwitterService).to receive(:new).with(message: message).and_return(process_service)
+      expect(Twitter::SendOnTwitterService).to receive(:new).with(message: message)
       expect(process_service).to receive(:perform)
       described_class.perform_now(message.id)
     end
@@ -42,8 +42,8 @@ RSpec.describe SendReplyJob, type: :job do
     it 'calls ::Twilio::SendOnTwilioService when its twilio message' do
       twilio_channel = create(:channel_twilio_sms)
       message = create(:message, conversation: create(:conversation, inbox: twilio_channel.inbox))
-      allow(::Twilio::SendOnTwilioService).to receive(:new).with(message: message).and_return(process_service)
-      expect(::Twilio::SendOnTwilioService).to receive(:new).with(message: message)
+      allow(Twilio::SendOnTwilioService).to receive(:new).with(message: message).and_return(process_service)
+      expect(Twilio::SendOnTwilioService).to receive(:new).with(message: message)
       expect(process_service).to receive(:perform)
       described_class.perform_now(message.id)
     end
@@ -51,8 +51,8 @@ RSpec.describe SendReplyJob, type: :job do
     it 'calls ::Telegram::SendOnTelegramService when its telegram message' do
       telegram_channel = create(:channel_telegram)
       message = create(:message, conversation: create(:conversation, inbox: telegram_channel.inbox))
-      allow(::Telegram::SendOnTelegramService).to receive(:new).with(message: message).and_return(process_service)
-      expect(::Telegram::SendOnTelegramService).to receive(:new).with(message: message)
+      allow(Telegram::SendOnTelegramService).to receive(:new).with(message: message).and_return(process_service)
+      expect(Telegram::SendOnTelegramService).to receive(:new).with(message: message)
       expect(process_service).to receive(:perform)
       described_class.perform_now(message.id)
     end
@@ -60,8 +60,8 @@ RSpec.describe SendReplyJob, type: :job do
     it 'calls ::Line:SendOnLineService when its line message' do
       line_channel = create(:channel_line)
       message = create(:message, conversation: create(:conversation, inbox: line_channel.inbox))
-      allow(::Line::SendOnLineService).to receive(:new).with(message: message).and_return(process_service)
-      expect(::Line::SendOnLineService).to receive(:new).with(message: message)
+      allow(Line::SendOnLineService).to receive(:new).with(message: message).and_return(process_service)
+      expect(Line::SendOnLineService).to receive(:new).with(message: message)
       expect(process_service).to receive(:perform)
       described_class.perform_now(message.id)
     end
@@ -70,8 +70,8 @@ RSpec.describe SendReplyJob, type: :job do
       stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
       whatsapp_channel = create(:channel_whatsapp, sync_templates: false)
       message = create(:message, conversation: create(:conversation, inbox: whatsapp_channel.inbox))
-      allow(::Whatsapp::SendOnWhatsappService).to receive(:new).with(message: message).and_return(process_service)
-      expect(::Whatsapp::SendOnWhatsappService).to receive(:new).with(message: message)
+      allow(Whatsapp::SendOnWhatsappService).to receive(:new).with(message: message).and_return(process_service)
+      expect(Whatsapp::SendOnWhatsappService).to receive(:new).with(message: message)
       expect(process_service).to receive(:perform)
       described_class.perform_now(message.id)
     end
@@ -79,8 +79,8 @@ RSpec.describe SendReplyJob, type: :job do
     it 'calls ::Sms::SendOnSmsService when its sms message' do
       sms_channel = create(:channel_sms)
       message = create(:message, conversation: create(:conversation, inbox: sms_channel.inbox))
-      allow(::Sms::SendOnSmsService).to receive(:new).with(message: message).and_return(process_service)
-      expect(::Sms::SendOnSmsService).to receive(:new).with(message: message)
+      allow(Sms::SendOnSmsService).to receive(:new).with(message: message).and_return(process_service)
+      expect(Sms::SendOnSmsService).to receive(:new).with(message: message)
       expect(process_service).to receive(:perform)
       described_class.perform_now(message.id)
     end
diff --git a/spec/jobs/trigger_scheduled_items_job_spec.rb b/spec/jobs/trigger_scheduled_items_job_spec.rb
index e7b5fe597..270bd9076 100644
--- a/spec/jobs/trigger_scheduled_items_job_spec.rb
+++ b/spec/jobs/trigger_scheduled_items_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe TriggerScheduledItemsJob, type: :job do
+RSpec.describe TriggerScheduledItemsJob do
   subject(:job) { described_class.perform_later }
 
   let(:account) { create(:account) }
diff --git a/spec/jobs/webhook_job_spec.rb b/spec/jobs/webhook_job_spec.rb
index f5b8d9dd8..23ddb6cf1 100644
--- a/spec/jobs/webhook_job_spec.rb
+++ b/spec/jobs/webhook_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe WebhookJob, type: :job do
+RSpec.describe WebhookJob do
   include ActiveJob::TestHelper
 
   subject(:job) { described_class.perform_later(url, payload) }
diff --git a/spec/jobs/webhooks/facebook_events_job_spec.rb b/spec/jobs/webhooks/facebook_events_job_spec.rb
index 8223953ba..14868dc4f 100644
--- a/spec/jobs/webhooks/facebook_events_job_spec.rb
+++ b/spec/jobs/webhooks/facebook_events_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Webhooks::FacebookEventsJob, type: :job do
+RSpec.describe Webhooks::FacebookEventsJob do
   subject(:job) { described_class.perform_later(params) }
 
   let!(:params) { { test: 'test' } }
@@ -15,11 +15,11 @@ RSpec.describe Webhooks::FacebookEventsJob, type: :job do
     it 'calls MessagePArsed and do message create' do
       parser = double
       creator = double
-      allow(::Integrations::Facebook::MessageParser).to receive(:new).and_return(parser)
-      allow(::Integrations::Facebook::MessageCreator).to receive(:new).and_return(creator)
+      allow(Integrations::Facebook::MessageParser).to receive(:new).and_return(parser)
+      allow(Integrations::Facebook::MessageCreator).to receive(:new).and_return(creator)
       allow(creator).to receive(:perform).and_return(true)
-      expect(::Integrations::Facebook::MessageParser).to receive(:new).with(params)
-      expect(::Integrations::Facebook::MessageCreator).to receive(:new).with(parser)
+      expect(Integrations::Facebook::MessageParser).to receive(:new).with(params)
+      expect(Integrations::Facebook::MessageCreator).to receive(:new).with(parser)
       expect(creator).to receive(:perform)
       described_class.perform_now(params)
     end
diff --git a/spec/jobs/webhooks/line_events_job_spec.rb b/spec/jobs/webhooks/line_events_job_spec.rb
index e8d69939e..ba0068ba0 100644
--- a/spec/jobs/webhooks/line_events_job_spec.rb
+++ b/spec/jobs/webhooks/line_events_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Webhooks::LineEventsJob, type: :job do
+RSpec.describe Webhooks::LineEventsJob do
   subject(:job) { described_class.perform_later(params: params) }
 
   let!(:line_channel) { create(:channel_line) }
diff --git a/spec/jobs/webhooks/sms_events_job_spec.rb b/spec/jobs/webhooks/sms_events_job_spec.rb
index 927e8adaa..3874ba24d 100644
--- a/spec/jobs/webhooks/sms_events_job_spec.rb
+++ b/spec/jobs/webhooks/sms_events_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Webhooks::SmsEventsJob, type: :job do
+RSpec.describe Webhooks::SmsEventsJob do
   subject(:job) { described_class.perform_later(params) }
 
   let!(:sms_channel) { create(:channel_sms) }
diff --git a/spec/jobs/webhooks/telegram_events_job_spec.rb b/spec/jobs/webhooks/telegram_events_job_spec.rb
index 80153fc0f..992a50b1b 100644
--- a/spec/jobs/webhooks/telegram_events_job_spec.rb
+++ b/spec/jobs/webhooks/telegram_events_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Webhooks::TelegramEventsJob, type: :job do
+RSpec.describe Webhooks::TelegramEventsJob do
   subject(:job) { described_class.perform_later(params) }
 
   let!(:telegram_channel) { create(:channel_telegram) }
diff --git a/spec/jobs/webhooks/whatsapp_events_job_spec.rb b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
index 187d4c62c..8a7e783ad 100644
--- a/spec/jobs/webhooks/whatsapp_events_job_spec.rb
+++ b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Webhooks::WhatsappEventsJob, type: :job do
+RSpec.describe Webhooks::WhatsappEventsJob do
   subject(:job) { described_class }
 
   let(:channel) { create(:channel_whatsapp, provider: 'whatsapp_cloud', sync_templates: false, validate_provider_config: false) }
diff --git a/spec/lib/email_templates/db_resolver_service_spec.rb b/spec/lib/email_templates/db_resolver_service_spec.rb
index f581c0c29..56c8a648b 100644
--- a/spec/lib/email_templates/db_resolver_service_spec.rb
+++ b/spec/lib/email_templates/db_resolver_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::EmailTemplates::DbResolverService do
+describe EmailTemplates::DbResolverService do
   subject(:resolver) { described_class.using(EmailTemplate, {}) }
 
   describe '#find_templates' do
diff --git a/spec/lib/integrations/dialogflow/processor_service_spec.rb b/spec/lib/integrations/dialogflow/processor_service_spec.rb
index 379339f32..9f7535f5f 100644
--- a/spec/lib/integrations/dialogflow/processor_service_spec.rb
+++ b/spec/lib/integrations/dialogflow/processor_service_spec.rb
@@ -150,7 +150,7 @@ describe Integrations::Dialogflow::ProcessorService do
   end
 
   describe '#get_response' do
-    let(:google_dialogflow) { ::Google::Cloud::Dialogflow::V2::Sessions::Client }
+    let(:google_dialogflow) { Google::Cloud::Dialogflow::V2::Sessions::Client }
     let(:session_client) { double }
     let(:session) { double }
     let(:query_input) { { text: { text: message, language_code: 'en-US' } } }
diff --git a/spec/lib/integrations/google_translate/detect_language_service_spec.rb b/spec/lib/integrations/google_translate/detect_language_service_spec.rb
index c71ec074f..9a3530707 100644
--- a/spec/lib/integrations/google_translate/detect_language_service_spec.rb
+++ b/spec/lib/integrations/google_translate/detect_language_service_spec.rb
@@ -8,8 +8,8 @@ describe Integrations::GoogleTranslate::DetectLanguageService do
   let(:translate_client) { double }
 
   before do
-    allow(::Google::Cloud::Translate::V3::TranslationService::Client).to receive(:new).and_return(translate_client)
-    allow(translate_client).to receive(:detect_language).and_return(::Google::Cloud::Translate::V3::DetectLanguageResponse
+    allow(Google::Cloud::Translate::V3::TranslationService::Client).to receive(:new).and_return(translate_client)
+    allow(translate_client).to receive(:detect_language).and_return(Google::Cloud::Translate::V3::DetectLanguageResponse
       .new({ languages: [{ language_code: 'es', confidence: 0.71875 }] }))
   end
 
diff --git a/spec/lib/integrations/slack/send_on_slack_service_spec.rb b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
index 46065a074..7fc75b2db 100644
--- a/spec/lib/integrations/slack/send_on_slack_service_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -108,7 +108,7 @@ describe Integrations::Slack::SendOnSlackService do
         ).and_return(slack_message)
 
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
 
         expect(slack_client).to receive(:files_upload).with(hash_including(
                                                               channels: hook.reference_id,
diff --git a/spec/lib/online_status_tracker_spec.rb b/spec/lib/online_status_tracker_spec.rb
index d4890a6f3..c2f69ffac 100644
--- a/spec/lib/online_status_tracker_spec.rb
+++ b/spec/lib/online_status_tracker_spec.rb
@@ -29,8 +29,8 @@ describe OnlineStatusTracker do
     before do
       described_class.update_presence(account.id, 'Contact', online_contact.id)
       # creating a stale record for offline contact presence
-      ::Redis::Alfred.zadd(format(::Redis::Alfred::ONLINE_PRESENCE_CONTACTS, account_id: account.id),
-                           (Time.zone.now - (OnlineStatusTracker::PRESENCE_DURATION + 20)).to_i, offline_contact.id)
+      Redis::Alfred.zadd(format(Redis::Alfred::ONLINE_PRESENCE_CONTACTS, account_id: account.id),
+                         (Time.zone.now - (OnlineStatusTracker::PRESENCE_DURATION + 20)).to_i, offline_contact.id)
     end
 
     it 'returns only the online contact ids with presence' do
@@ -39,7 +39,7 @@ describe OnlineStatusTracker do
 
     it 'flushes the stale records from sorted set after the duration' do
       described_class.get_available_contacts(account.id)
-      expect(::Redis::Alfred.zscore(format(::Redis::Alfred::ONLINE_PRESENCE_CONTACTS, account_id: account.id), offline_contact.id)).to be_nil
+      expect(Redis::Alfred.zscore(format(Redis::Alfred::ONLINE_PRESENCE_CONTACTS, account_id: account.id), offline_contact.id)).to be_nil
     end
   end
 end
diff --git a/spec/lib/redis/config_spec.rb b/spec/lib/redis/config_spec.rb
index cd6d444a6..79dc8b03d 100644
--- a/spec/lib/redis/config_spec.rb
+++ b/spec/lib/redis/config_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::Redis::Config do
+describe Redis::Config do
   context 'when single redis instance is used' do
     let(:redis_url) { 'redis://my-redis-instance:6379' }
     let(:redis_pasword) { 'some-strong-password' }
@@ -14,7 +14,7 @@ describe ::Redis::Config do
 
     it 'checks for app redis config' do
       app_config = described_class.app
-      expect(app_config.keys).to match_array([:url, :password, :timeout, :reconnect_attempts, :ssl_params])
+      expect(app_config.keys).to contain_exactly(:url, :password, :timeout, :reconnect_attempts, :ssl_params)
       expect(app_config[:url]).to eq(redis_url)
       expect(app_config[:password]).to eq(redis_pasword)
     end
@@ -43,7 +43,7 @@ describe ::Redis::Config do
     end
 
     it 'checks for app redis config' do
-      expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params])
+      expect(described_class.app.keys).to contain_exactly(:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params)
       expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
       expect(described_class.app[:sentinels]).to match_array(expected_sentinels)
     end
@@ -60,7 +60,7 @@ describe ::Redis::Config do
       end
 
       it 'checks for app redis config and sentinel passwords will be empty' do
-        expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params])
+        expect(described_class.app.keys).to contain_exactly(:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params)
         expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
         expect(described_class.app[:sentinels]).to match_array(expected_sentinels.map { |s| s.except(:password) })
       end
@@ -78,7 +78,7 @@ describe ::Redis::Config do
       end
 
       it 'checks for app redis config and redis password is replaced in sentinel config' do
-        expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params])
+        expect(described_class.app.keys).to contain_exactly(:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params)
         expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
         expect(described_class.app[:sentinels]).to match_array(expected_sentinels.map { |s| s.merge(password: redis_sentinel_password) })
       end
diff --git a/spec/mailboxes/application_mailbox_spec.rb b/spec/mailboxes/application_mailbox_spec.rb
index 3f3e8b97f..d5e15dc46 100644
--- a/spec/mailboxes/application_mailbox_spec.rb
+++ b/spec/mailboxes/application_mailbox_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe ApplicationMailbox, type: :mailbox do
+RSpec.describe ApplicationMailbox do
   include ActionMailbox::TestHelper
 
   describe 'route the inbound mail to appropriate mailbox' do
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index a78c4fcf1..49b51b45f 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Imap::ImapMailbox, type: :mailbox do
+RSpec.describe Imap::ImapMailbox do
   include ActionMailbox::TestHelper
 
   describe 'add mail as a new conversation in the email inbox' do
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index a383e3e5c..72fbd317d 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe ReplyMailbox, type: :mailbox do
+RSpec.describe ReplyMailbox do
   include ActionMailbox::TestHelper
 
   describe 'add mail as reply in a conversation' do
diff --git a/spec/mailboxes/support_mailbox_spec.rb b/spec/mailboxes/support_mailbox_spec.rb
index c0501cff4..d2e2c7946 100644
--- a/spec/mailboxes/support_mailbox_spec.rb
+++ b/spec/mailboxes/support_mailbox_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe SupportMailbox, type: :mailbox do
+RSpec.describe SupportMailbox do
   include ActionMailbox::TestHelper
 
   describe 'when a chatwoot notification email is received' do
diff --git a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
index fa90b7970..7190678cc 100644
--- a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
+++ b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AdministratorNotifications::ChannelNotificationsMailer, type: :mailer do
+RSpec.describe AdministratorNotifications::ChannelNotificationsMailer do
   let(:class_instance) { described_class.new }
   let!(:account) { create(:account) }
   let!(:administrator) { create(:user, :administrator, email: 'agent1@example.com', account: account) }
diff --git a/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb b/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
index 6b102d566..9faabc3af 100644
--- a/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
+++ b/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AgentNotifications::ConversationNotificationsMailer, type: :mailer do
+RSpec.describe AgentNotifications::ConversationNotificationsMailer do
   let(:class_instance) { described_class.new }
   let!(:account) { create(:account) }
   let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
@@ -83,7 +83,7 @@ RSpec.describe AgentNotifications::ConversationNotificationsMailer, type: :maile
     end
 
     it 'will not send email if agent is online' do
-      ::OnlineStatusTracker.update_presence(conversation.account.id, 'User', agent.id)
+      OnlineStatusTracker.update_presence(conversation.account.id, 'User', agent.id)
       expect(mail).to be_nil
     end
   end
@@ -101,7 +101,7 @@ RSpec.describe AgentNotifications::ConversationNotificationsMailer, type: :maile
     end
 
     it 'will not send email if agent is online' do
-      ::OnlineStatusTracker.update_presence(conversation.account.id, 'User', agent.id)
+      OnlineStatusTracker.update_presence(conversation.account.id, 'User', agent.id)
       expect(mail).to be_nil
     end
   end
diff --git a/spec/mailers/confirmation_instructions_spec.rb b/spec/mailers/confirmation_instructions_spec.rb
index 9eeed85d2..8c66c4fea 100644
--- a/spec/mailers/confirmation_instructions_spec.rb
+++ b/spec/mailers/confirmation_instructions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Confirmation Instructions', type: :mailer do
+RSpec.describe 'Confirmation Instructions' do
   describe :notify do
     let(:account) { create(:account) }
     let!(:confirmable_user) { create(:user, inviter: inviter_val, account: account) }
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index 61900fc7e..c10dfe2d5 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ConversationReplyMailer, type: :mailer do
+RSpec.describe ConversationReplyMailer do
   describe 'reply' do
     let!(:account) { create(:account) }
     let!(:agent) { create(:user, email: 'agent1@example.com', account: account) }
diff --git a/spec/models/agent_bot_inbox_spec.rb b/spec/models/agent_bot_inbox_spec.rb
index 2c0ef84e7..ef8f1d723 100644
--- a/spec/models/agent_bot_inbox_spec.rb
+++ b/spec/models/agent_bot_inbox_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe AgentBotInbox, type: :model do
+RSpec.describe AgentBotInbox do
   describe 'validations' do
     it { is_expected.to validate_presence_of(:inbox_id) }
     it { is_expected.to validate_presence_of(:agent_bot_id) }
diff --git a/spec/models/agent_bot_spec.rb b/spec/models/agent_bot_spec.rb
index 87a3291b3..6e35bd79b 100644
--- a/spec/models/agent_bot_spec.rb
+++ b/spec/models/agent_bot_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 require Rails.root.join 'spec/models/concerns/access_tokenable_shared.rb'
 require Rails.root.join 'spec/models/concerns/avatarable_shared.rb'
 
-RSpec.describe AgentBot, type: :model do
+RSpec.describe AgentBot do
   describe 'associations' do
     it { is_expected.to have_many(:agent_bot_inboxes) }
     it { is_expected.to have_many(:inboxes) }
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index 11837a1d8..ff2734640 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Article, type: :model do
+RSpec.describe Article do
   let!(:account) { create(:account) }
   let(:user) { create(:user, account_ids: [account.id], role: :agent) }
   let!(:portal_1) { create(:portal, account_id: account.id, config: { allowed_locales: %w[en es] }) }
diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb
index 2f73d1abe..c03bca062 100644
--- a/spec/models/attachment_spec.rb
+++ b/spec/models/attachment_spec.rb
@@ -1,12 +1,12 @@
 require 'rails_helper'
 
-RSpec.describe Attachment, type: :model do
+RSpec.describe Attachment do
   describe 'external url validations' do
     let(:message) { create(:message) }
     let(:attachment) { message.attachments.new(account_id: message.account_id, file_type: :image) }
 
     before do
-      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
     end
 
     context 'when it validates external url length' do
@@ -27,7 +27,7 @@ RSpec.describe Attachment, type: :model do
     it 'returns valid download url' do
       message = create(:message)
       attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       expect(attachment.download_url).not_to be_nil
     end
   end
diff --git a/spec/models/automation_rule_spec.rb b/spec/models/automation_rule_spec.rb
index efcae76fd..a20d3d71d 100644
--- a/spec/models/automation_rule_spec.rb
+++ b/spec/models/automation_rule_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe AutomationRule, type: :model do
+RSpec.describe AutomationRule do
   describe 'associations' do
     let(:account) { create(:account) }
     let(:params) do
diff --git a/spec/models/campaign_spec.rb b/spec/models/campaign_spec.rb
index f99f18390..f3154c50a 100644
--- a/spec/models/campaign_spec.rb
+++ b/spec/models/campaign_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Campaign, type: :model do
+RSpec.describe Campaign do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
     it { is_expected.to belong_to(:inbox) }
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index df4392398..efe7fe036 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Category, type: :model do
+RSpec.describe Category do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:name) }
diff --git a/spec/models/channel/telegram_spec.rb b/spec/models/channel/telegram_spec.rb
index 8186a1149..4fe49f844 100644
--- a/spec/models/channel/telegram_spec.rb
+++ b/spec/models/channel/telegram_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe Channel::Telegram do
     it 'send image' do
       telegram_attachment_response = double
       attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
 
       allow(telegram_attachment_response).to receive(:success?).and_return(true)
       allow(telegram_attachment_response).to receive(:parsed_response).and_return({ 'result' => [{ 'message_id' => 'telegram_456' }] })
@@ -64,7 +64,7 @@ RSpec.describe Channel::Telegram do
     it 'send document' do
       telegram_attachment_response = double
       attachment = message.attachments.new(account_id: message.account_id, file_type: :file)
-      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/attachment.pdf')), filename: 'attachment.pdf',
+      attachment.file.attach(io: Rails.root.join('spec/assets/attachment.pdf').open, filename: 'attachment.pdf',
                              content_type: 'application/pdf')
 
       allow(telegram_attachment_response).to receive(:success?).and_return(true)
@@ -82,7 +82,7 @@ RSpec.describe Channel::Telegram do
       telegram_message_response = double
       telegram_attachment_response = double
       attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
 
       allow(telegram_message_response).to receive(:success?).and_return(true)
       allow(telegram_message_response).to receive(:parsed_response).and_return({ 'result' => { 'message_id' => 'telegram_456' } })
diff --git a/spec/models/channel/twilio_sms_spec.rb b/spec/models/channel/twilio_sms_spec.rb
index ddaec7025..7ccb26c7a 100644
--- a/spec/models/channel/twilio_sms_spec.rb
+++ b/spec/models/channel/twilio_sms_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe Channel::TwilioSms do
     let(:twilio_messages) { double }
 
     before do
-      allow(::Twilio::REST::Client).to receive(:new).and_return(twilio_client)
+      allow(Twilio::REST::Client).to receive(:new).and_return(twilio_client)
       allow(twilio_client).to receive(:messages).and_return(twilio_messages)
     end
 
diff --git a/spec/models/conversation_participants_spec.rb b/spec/models/conversation_participants_spec.rb
index 6e0fe7504..c078f69f6 100644
--- a/spec/models/conversation_participants_spec.rb
+++ b/spec/models/conversation_participants_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe ConversationParticipant, type: :model do
+RSpec.describe ConversationParticipant do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:conversation_id) }
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 514fb80c5..3bbe3c833 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 require Rails.root.join 'spec/models/concerns/assignment_handler_shared.rb'
 require Rails.root.join 'spec/models/concerns/auto_assignment_handler_shared.rb'
 
-RSpec.describe Conversation, type: :model do
+RSpec.describe Conversation do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
     it { is_expected.to belong_to(:inbox) }
diff --git a/spec/models/csat_survey_response_spec.rb b/spec/models/csat_survey_response_spec.rb
index 9bab7e64a..09659f080 100644
--- a/spec/models/csat_survey_response_spec.rb
+++ b/spec/models/csat_survey_response_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe CsatSurveyResponse, type: :model do
+RSpec.describe CsatSurveyResponse do
   describe 'validations' do
     it { is_expected.to validate_presence_of(:rating) }
     it { is_expected.to validate_presence_of(:account_id) }
diff --git a/spec/models/data_import_spec.rb b/spec/models/data_import_spec.rb
index 0bfbc3dbf..84805f86d 100644
--- a/spec/models/data_import_spec.rb
+++ b/spec/models/data_import_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe DataImport, type: :model do
+RSpec.describe DataImport do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
   end
diff --git a/spec/models/folder_spec.rb b/spec/models/folder_spec.rb
index 47c9adf06..19cfe6a55 100644
--- a/spec/models/folder_spec.rb
+++ b/spec/models/folder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Folder, type: :model do
+RSpec.describe Folder do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:category_id) }
diff --git a/spec/models/inbox_member_spec.rb b/spec/models/inbox_member_spec.rb
index 389fe75cb..b081c546c 100644
--- a/spec/models/inbox_member_spec.rb
+++ b/spec/models/inbox_member_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe InboxMember do
         perform_enqueued_jobs do
           inbox_member.inbox.destroy!
         end
+        expect { inbox_member.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
diff --git a/spec/models/integrations/hook_spec.rb b/spec/models/integrations/hook_spec.rb
index 874fc4346..e8b1b8156 100644
--- a/spec/models/integrations/hook_spec.rb
+++ b/spec/models/integrations/hook_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Integrations::Hook, type: :model do
+RSpec.describe Integrations::Hook do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:app_id) }
     it { is_expected.to validate_presence_of(:account_id) }
diff --git a/spec/models/label_spec.rb b/spec/models/label_spec.rb
index 69f1ce771..ee5e7b108 100644
--- a/spec/models/label_spec.rb
+++ b/spec/models/label_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Label, type: :model do
+RSpec.describe Label do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
   end
diff --git a/spec/models/macro_spec.rb b/spec/models/macro_spec.rb
index ee91b2b93..4df74b7fa 100644
--- a/spec/models/macro_spec.rb
+++ b/spec/models/macro_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Macro, type: :model do
+RSpec.describe Macro do
   let(:account) { create(:account) }
   let(:admin) { create(:user, account: account, role: :administrator) }
 
diff --git a/spec/models/mention_spec.rb b/spec/models/mention_spec.rb
index fe732ea03..773785c59 100644
--- a/spec/models/mention_spec.rb
+++ b/spec/models/mention_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Mention, type: :model do
+RSpec.describe Mention do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
     it { is_expected.to belong_to(:user) }
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index e6dddbe4b..e44627666 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 require Rails.root.join 'spec/models/concerns/liquidable_shared.rb'
 
-RSpec.describe Message, type: :model do
+RSpec.describe Message do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:inbox_id) }
     it { is_expected.to validate_presence_of(:conversation_id) }
@@ -123,7 +123,7 @@ RSpec.describe Message, type: :model do
     it 'contains the message attachment when attachment is present' do
       message = create(:message)
       attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       attachment.save!
       expect(message.webhook_data.key?(:attachments)).to be true
     end
@@ -148,12 +148,12 @@ RSpec.describe Message, type: :model do
 
     it 'triggers ::MessageTemplates::HookExecutionService' do
       hook_execution_service = double
-      allow(::MessageTemplates::HookExecutionService).to receive(:new).and_return(hook_execution_service)
+      allow(MessageTemplates::HookExecutionService).to receive(:new).and_return(hook_execution_service)
       allow(hook_execution_service).to receive(:perform).and_return(true)
 
       message.save!
 
-      expect(::MessageTemplates::HookExecutionService).to have_received(:new).with(message: message)
+      expect(MessageTemplates::HookExecutionService).to have_received(:new).with(message: message)
       expect(hook_execution_service).to have_received(:perform)
     end
 
@@ -213,7 +213,7 @@ RSpec.describe Message, type: :model do
     it 'add errors to message for attachment size is more than allowed limit' do
       16.times.each do
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       end
 
       expect(message.errors.messages).to eq({ attachments: ['exceeded maximum allowed'] })
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 3d36c56ae..203d5ee45 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Note, type: :model do
+RSpec.describe Note do
   describe 'validations' do
     it { is_expected.to validate_presence_of(:content) }
     it { is_expected.to validate_presence_of(:account_id) }
diff --git a/spec/models/portal_member_spec.rb b/spec/models/portal_member_spec.rb
index 67215a3d6..646ff9c27 100644
--- a/spec/models/portal_member_spec.rb
+++ b/spec/models/portal_member_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe PortalMember, type: :model do
+RSpec.describe PortalMember do
   describe 'associations' do
     it { is_expected.to belong_to(:portal) }
     it { is_expected.to belong_to(:user) }
diff --git a/spec/models/portal_spec.rb b/spec/models/portal_spec.rb
index 070c2ca6c..1b33c8d90 100644
--- a/spec/models/portal_spec.rb
+++ b/spec/models/portal_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Portal, type: :model do
+RSpec.describe Portal do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:slug) }
diff --git a/spec/models/related_category_spec.rb b/spec/models/related_category_spec.rb
index 5a500d53b..45418095b 100644
--- a/spec/models/related_category_spec.rb
+++ b/spec/models/related_category_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe RelatedCategory, type: :model do
+RSpec.describe RelatedCategory do
   describe 'associations' do
     it { is_expected.to belong_to(:category) }
     it { is_expected.to belong_to(:related_category) }
diff --git a/spec/models/reporting_event_spec.rb b/spec/models/reporting_event_spec.rb
index 553a4e360..e9c904a63 100644
--- a/spec/models/reporting_event_spec.rb
+++ b/spec/models/reporting_event_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe ReportingEvent, type: :model do
+RSpec.describe ReportingEvent do
   describe 'validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:name) }
diff --git a/spec/models/team_member_spec.rb b/spec/models/team_member_spec.rb
index 97171856d..f37f70425 100644
--- a/spec/models/team_member_spec.rb
+++ b/spec/models/team_member_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe TeamMember, type: :model do
+RSpec.describe TeamMember do
   describe 'associations' do
     it { is_expected.to belong_to(:team) }
     it { is_expected.to belong_to(:user) }
diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
index c2327ecd6..e9019e211 100644
--- a/spec/models/team_spec.rb
+++ b/spec/models/team_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Team, type: :model do
+RSpec.describe Team do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
     it { is_expected.to have_many(:conversations) }
diff --git a/spec/models/webhook_spec.rb b/spec/models/webhook_spec.rb
index ca3ef213f..81e6d9551 100644
--- a/spec/models/webhook_spec.rb
+++ b/spec/models/webhook_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Webhook, type: :model do
+RSpec.describe Webhook do
   describe 'validations' do
     it { is_expected.to validate_presence_of(:account_id) }
   end
diff --git a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
index 2bc0d813c..1b640aaa3 100644
--- a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
+++ b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe 'Api::V1::Accounts::Integrations::Slacks', type: :request do
+RSpec.describe 'Api::V1::Accounts::Integrations::Slacks' do
   let(:account) { create(:account) }
   let(:agent) { create(:user, account: account, role: :administrator) }
   let!(:hook) { create(:integrations_hook, account: account) }
@@ -28,7 +28,7 @@ RSpec.describe 'Api::V1::Accounts::Integrations::Slacks', type: :request do
              headers: agent.create_new_auth_token
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
+        json_response = response.parsed_body
         expect(json_response['id']).to eql('slack')
       end
     end
@@ -53,7 +53,7 @@ RSpec.describe 'Api::V1::Accounts::Integrations::Slacks', type: :request do
               headers: agent.create_new_auth_token
 
           expect(response).to have_http_status(:success)
-          json_response = JSON.parse(response.body)
+          json_response = response.parsed_body
           expect(json_response['app_id']).to eql('slack')
         end
       end
diff --git a/spec/requests/api/v1/integrations/webhooks_request_spec.rb b/spec/requests/api/v1/integrations/webhooks_request_spec.rb
index ea870d45c..28922df6a 100644
--- a/spec/requests/api/v1/integrations/webhooks_request_spec.rb
+++ b/spec/requests/api/v1/integrations/webhooks_request_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe 'Api::V1::Integrations::Webhooks', type: :request do
+RSpec.describe 'Api::V1::Integrations::Webhooks' do
   describe 'POST /api/v1/integrations/webhooks' do
     it 'consumes webhook' do
       builder = Integrations::Slack::IncomingMessageBuilder.new({})
diff --git a/spec/services/action_service_spec.rb b/spec/services/action_service_spec.rb
index 8cade58a6..3efcb6555 100644
--- a/spec/services/action_service_spec.rb
+++ b/spec/services/action_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::ActionService do
+describe ActionService do
   describe '#resolve_conversation' do
     let(:conversation) { create(:conversation) }
     let(:action_service) { described_class.new(conversation) }
diff --git a/spec/services/auto_assignment/agent_assignment_service_spec.rb b/spec/services/auto_assignment/agent_assignment_service_spec.rb
index 83790dc28..16337dc04 100644
--- a/spec/services/auto_assignment/agent_assignment_service_spec.rb
+++ b/spec/services/auto_assignment/agent_assignment_service_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe AutoAssignment::AgentAssignmentService do
 
   before do
     inbox_members.each { |inbox_member| create(:account_user, account: account, user: inbox_member.user) }
-    allow(::OnlineStatusTracker).to receive(:get_available_users).and_return(online_users)
+    allow(OnlineStatusTracker).to receive(:get_available_users).and_return(online_users)
   end
 
   describe '#perform' do
diff --git a/spec/services/automation_rules/action_service_spec.rb b/spec/services/automation_rules/action_service_spec.rb
index 0f0d09943..bdfa7af0c 100644
--- a/spec/services/automation_rules/action_service_spec.rb
+++ b/spec/services/automation_rules/action_service_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe AutomationRules::ActionService do
       before do
         allow(Messages::MessageBuilder).to receive(:new).and_return(message_builder)
         rule.actions.delete_if { |a| a['action_name'] == 'send_message' }
-        rule.files.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        rule.files.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
         rule.save!
         rule.actions << { action_name: 'send_attachment', action_params: [rule.files.first.blob_id] }
       end
@@ -47,7 +47,7 @@ RSpec.describe AutomationRules::ActionService do
 
     describe '#perform with send_webhook_event action' do
       it 'will send webhook event' do
-        expect(rule.actions.map { |r| r['action_name'] }).to include('send_webhook_event')
+        expect(rule.actions.pluck('action_name')).to include('send_webhook_event')
         expect(WebhookJob).to receive(:perform_later)
         described_class.new(rule, account, conversation).perform
       end
@@ -61,13 +61,13 @@ RSpec.describe AutomationRules::ActionService do
       end
 
       it 'will send message' do
-        expect(rule.actions.map { |r| r['action_name'] }).to include('send_message')
+        expect(rule.actions.pluck('action_name')).to include('send_message')
         expect(message_builder).to receive(:perform)
         described_class.new(rule, account, conversation).perform
       end
 
       it 'will not send message if conversation is a tweet' do
-        expect(rule.actions.map { |r| r['action_name'] }).to include('send_message')
+        expect(rule.actions.pluck('action_name')).to include('send_message')
         twitter_inbox = create(:inbox, channel: create(:channel_twitter_profile, account: account))
         conversation = create(:conversation, inbox: twitter_inbox, additional_attributes: { type: 'tweet' })
         expect(message_builder).not_to receive(:perform)
@@ -102,6 +102,7 @@ RSpec.describe AutomationRules::ActionService do
         allow(mailer).to receive(:conversation_transcript).with(conversation, 'agent1@example.com')
 
         described_class.new(rule, account, conversation).perform
+        expect(mailer).to have_received(:conversation_transcript).exactly(3).times
       end
 
       it 'will send email to transcript to contacts' do
@@ -113,6 +114,7 @@ RSpec.describe AutomationRules::ActionService do
         allow(mailer).to receive(:conversation_transcript).with(conversation, conversation.contact.email)
 
         described_class.new(rule.reload, account, conversation).perform
+        expect(mailer).to have_received(:conversation_transcript).exactly(1).times
       end
     end
   end
diff --git a/spec/services/contacts/filter_service_spec.rb b/spec/services/contacts/filter_service_spec.rb
index 7e6661aed..d1b34b4a3 100644
--- a/spec/services/contacts/filter_service_spec.rb
+++ b/spec/services/contacts/filter_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::Contacts::FilterService do
+describe Contacts::FilterService do
   subject(:filter_service) { described_class }
 
   let!(:account) { create(:account) }
diff --git a/spec/services/conversations/filter_service_spec.rb b/spec/services/conversations/filter_service_spec.rb
index a3e6edc27..22defad0e 100644
--- a/spec/services/conversations/filter_service_spec.rb
+++ b/spec/services/conversations/filter_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::Conversations::FilterService do
+describe Conversations::FilterService do
   subject(:filter_service) { described_class }
 
   let!(:account) { create(:account) }
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index dc938550b..39a194ca4 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -22,25 +22,25 @@ describe Facebook::SendOnFacebookService do
     context 'without reply' do
       it 'if message is private' do
         message = create(:message, message_type: 'outgoing', private: true, inbox: facebook_inbox, account: account)
-        ::Facebook::SendOnFacebookService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(bot).not_to have_received(:deliver)
       end
 
       it 'if inbox channel is not facebook page' do
         message = create(:message, message_type: 'outgoing', inbox: widget_inbox, account: account)
-        expect { ::Facebook::SendOnFacebookService.new(message: message).perform }.to raise_error 'Invalid channel service was called'
+        expect { described_class.new(message: message).perform }.to raise_error 'Invalid channel service was called'
         expect(bot).not_to have_received(:deliver)
       end
 
       it 'if message is not outgoing' do
         message = create(:message, message_type: 'incoming', inbox: facebook_inbox, account: account)
-        ::Facebook::SendOnFacebookService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(bot).not_to have_received(:deliver)
       end
 
       it 'if message has an FB ID' do
         message = create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, source_id: SecureRandom.uuid)
-        ::Facebook::SendOnFacebookService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(bot).not_to have_received(:deliver)
       end
     end
@@ -48,14 +48,14 @@ describe Facebook::SendOnFacebookService do
     context 'with reply' do
       it 'if message is sent from chatwoot and is outgoing' do
         message = create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
-        ::Facebook::SendOnFacebookService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(bot).to have_received(:deliver)
       end
 
       it 'raise and exception to validate access token' do
         message = create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
         allow(bot).to receive(:deliver).and_raise(Facebook::Messenger::FacebookError.new('message' => 'Error validating access token'))
-        ::Facebook::SendOnFacebookService.new(message: message).perform
+        described_class.new(message: message).perform
 
         expect(facebook_channel.authorization_error_count).to eq(1)
       end
@@ -63,10 +63,10 @@ describe Facebook::SendOnFacebookService do
       it 'if message with attachment is sent from chatwoot and is outgoing' do
         message = build(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
         message.save!
         allow(attachment).to receive(:download_url).and_return('url1')
-        ::Facebook::SendOnFacebookService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(bot).to have_received(:deliver).with({
                                                       recipient: { id: contact_inbox.source_id },
                                                       message: { text: message.content },
diff --git a/spec/services/instagram/send_on_instagram_service_spec.rb b/spec/services/instagram/send_on_instagram_service_spec.rb
index f42efa1df..ee553a7d8 100644
--- a/spec/services/instagram/send_on_instagram_service_spec.rb
+++ b/spec/services/instagram/send_on_instagram_service_spec.rb
@@ -48,7 +48,7 @@ describe Instagram::SendOnInstagramService do
             }
           )
 
-          response = ::Instagram::SendOnInstagramService.new(message: message).perform
+          response = described_class.new(message: message).perform
 
           expect(response).to eq({  message_id: 'anyrandommessageid1234567890' })
         end
@@ -56,9 +56,9 @@ describe Instagram::SendOnInstagramService do
         it 'if message with attachment is sent from chatwoot and is outgoing' do
           message = build(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
           attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-          attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+          attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
           message.save!
-          response = ::Instagram::SendOnInstagramService.new(message: message).perform
+          response = described_class.new(message: message).perform
 
           expect(response).to eq({ message_id: 'anyrandommessageid1234567890' })
         end
@@ -87,7 +87,8 @@ describe Instagram::SendOnInstagramService do
             }
           )
 
-          ::Instagram::SendOnInstagramService.new(message: message).perform
+          described_class.new(message: message).perform
+          expect(HTTParty).to have_received(:post)
         end
       end
     end
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index b8255d903..6c9820564 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::MessageTemplates::HookExecutionService do
+describe MessageTemplates::HookExecutionService do
   context 'when Greeting Message' do
     it 'doesnot calls ::MessageTemplates::Template::Greeting if greeting_message is empty' do
       contact = create(:contact, email: nil)
@@ -10,15 +10,15 @@ describe ::MessageTemplates::HookExecutionService do
 
       email_collect_service = double
 
-      allow(::MessageTemplates::Template::EmailCollect).to receive(:new).and_return(email_collect_service)
+      allow(MessageTemplates::Template::EmailCollect).to receive(:new).and_return(email_collect_service)
       allow(email_collect_service).to receive(:perform).and_return(true)
-      allow(::MessageTemplates::Template::Greeting).to receive(:new)
+      allow(MessageTemplates::Template::Greeting).to receive(:new)
 
       # described class gets called in message after commit
       message = create(:message, conversation: conversation)
 
-      expect(::MessageTemplates::Template::Greeting).not_to have_received(:new)
-      expect(::MessageTemplates::Template::EmailCollect).to have_received(:new).with(conversation: message.conversation)
+      expect(MessageTemplates::Template::Greeting).not_to have_received(:new)
+      expect(MessageTemplates::Template::EmailCollect).to have_received(:new).with(conversation: message.conversation)
       expect(email_collect_service).to have_received(:perform)
     end
 
@@ -30,11 +30,11 @@ describe ::MessageTemplates::HookExecutionService do
 
       conversation = create(:conversation, inbox: twitter_inbox, additional_attributes: { type: 'tweet' })
       greeting_service = double
-      allow(::MessageTemplates::Template::Greeting).to receive(:new).and_return(greeting_service)
+      allow(MessageTemplates::Template::Greeting).to receive(:new).and_return(greeting_service)
       allow(greeting_service).to receive(:perform).and_return(true)
 
       message = create(:message, conversation: conversation)
-      expect(::MessageTemplates::Template::Greeting).not_to have_received(:new).with(conversation: message.conversation)
+      expect(MessageTemplates::Template::Greeting).not_to have_received(:new).with(conversation: message.conversation)
     end
   end
 
@@ -48,17 +48,17 @@ describe ::MessageTemplates::HookExecutionService do
 
       email_collect_service = double
       greeting_service = double
-      allow(::MessageTemplates::Template::EmailCollect).to receive(:new).and_return(email_collect_service)
+      allow(MessageTemplates::Template::EmailCollect).to receive(:new).and_return(email_collect_service)
       allow(email_collect_service).to receive(:perform).and_return(true)
-      allow(::MessageTemplates::Template::Greeting).to receive(:new).and_return(greeting_service)
+      allow(MessageTemplates::Template::Greeting).to receive(:new).and_return(greeting_service)
       allow(greeting_service).to receive(:perform).and_return(true)
 
       # described class gets called in message after commit
       message = create(:message, conversation: conversation)
 
-      expect(::MessageTemplates::Template::Greeting).to have_received(:new).with(conversation: message.conversation)
+      expect(MessageTemplates::Template::Greeting).to have_received(:new).with(conversation: message.conversation)
       expect(greeting_service).to have_received(:perform)
-      expect(::MessageTemplates::Template::EmailCollect).to have_received(:new).with(conversation: message.conversation)
+      expect(MessageTemplates::Template::EmailCollect).to have_received(:new).with(conversation: message.conversation)
       expect(email_collect_service).to have_received(:perform)
     end
 
@@ -66,12 +66,12 @@ describe ::MessageTemplates::HookExecutionService do
       contact = create(:contact, email: nil)
       conversation = create(:conversation, contact: contact, campaign: create(:campaign))
 
-      allow(::MessageTemplates::Template::EmailCollect).to receive(:new).and_return(true)
+      allow(MessageTemplates::Template::EmailCollect).to receive(:new).and_return(true)
 
       # described class gets called in message after commit
       message = create(:message, conversation: conversation)
 
-      expect(::MessageTemplates::Template::EmailCollect).not_to have_received(:new).with(conversation: message.conversation)
+      expect(MessageTemplates::Template::EmailCollect).not_to have_received(:new).with(conversation: message.conversation)
     end
 
     it 'doesnot calls ::MessageTemplates::Template::EmailCollect when enable_email_collect form is disabled' do
@@ -81,12 +81,12 @@ describe ::MessageTemplates::HookExecutionService do
       conversation.inbox.update(enable_email_collect: false)
       # ensure prechat form is enabled
       conversation.inbox.channel.update(pre_chat_form_enabled: true)
-      allow(::MessageTemplates::Template::EmailCollect).to receive(:new).and_return(true)
+      allow(MessageTemplates::Template::EmailCollect).to receive(:new).and_return(true)
 
       # described class gets called in message after commit
       message = create(:message, conversation: conversation)
 
-      expect(::MessageTemplates::Template::EmailCollect).not_to have_received(:new).with(conversation: message.conversation)
+      expect(MessageTemplates::Template::EmailCollect).not_to have_received(:new).with(conversation: message.conversation)
     end
   end
 
@@ -95,7 +95,7 @@ describe ::MessageTemplates::HookExecutionService do
     let(:conversation) { create(:conversation) }
 
     before do
-      allow(::MessageTemplates::Template::CsatSurvey).to receive(:new).and_return(csat_survey)
+      allow(MessageTemplates::Template::CsatSurvey).to receive(:new).and_return(csat_survey)
       allow(csat_survey).to receive(:perform).and_return(true)
     end
 
@@ -107,7 +107,7 @@ describe ::MessageTemplates::HookExecutionService do
                                                     { account_id: conversation.account_id, inbox_id: conversation.inbox_id, message_type: :activity,
                                                       content: 'Conversation marked resolved!!' })
 
-      expect(::MessageTemplates::Template::CsatSurvey).to have_received(:new).with(conversation: conversation)
+      expect(MessageTemplates::Template::CsatSurvey).to have_received(:new).with(conversation: conversation)
       expect(csat_survey).to have_received(:perform)
     end
 
@@ -119,7 +119,7 @@ describe ::MessageTemplates::HookExecutionService do
                                                     { account_id: conversation.account_id, inbox_id: conversation.inbox_id, message_type: :activity,
                                                       content: 'Conversation marked resolved!!' })
 
-      expect(::MessageTemplates::Template::CsatSurvey).not_to have_received(:new).with(conversation: conversation)
+      expect(MessageTemplates::Template::CsatSurvey).not_to have_received(:new).with(conversation: conversation)
       expect(csat_survey).not_to have_received(:perform)
     end
 
@@ -134,7 +134,7 @@ describe ::MessageTemplates::HookExecutionService do
                                                     { account_id: conversation.account_id, inbox_id: conversation.inbox_id, message_type: :activity,
                                                       content: 'Conversation marked resolved!!' })
 
-      expect(::MessageTemplates::Template::CsatSurvey).not_to have_received(:new).with(conversation: conversation)
+      expect(MessageTemplates::Template::CsatSurvey).not_to have_received(:new).with(conversation: conversation)
       expect(csat_survey).not_to have_received(:perform)
     end
 
@@ -147,47 +147,47 @@ describe ::MessageTemplates::HookExecutionService do
                                                     { account_id: conversation.account_id, inbox_id: conversation.inbox_id, message_type: :activity,
                                                       content: 'Conversation marked resolved!!' })
 
-      expect(::MessageTemplates::Template::CsatSurvey).not_to have_received(:new).with(conversation: conversation)
+      expect(MessageTemplates::Template::CsatSurvey).not_to have_received(:new).with(conversation: conversation)
       expect(csat_survey).not_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
+      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(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(MessageTemplates::Template::OutOfOffice).to have_received(:new).with(conversation: message.conversation)
       expect(out_of_office_service).to have_received(:perform)
     end
 
     it 'will not calls ::MessageTemplates::Template::OutOfOffice when outgoing message' do
-      contact = create :contact
-      conversation = create :conversation, contact: contact
+      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(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, message_type: 'outgoing')
 
-      expect(::MessageTemplates::Template::OutOfOffice).not_to have_received(:new).with(conversation: message.conversation)
+      expect(MessageTemplates::Template::OutOfOffice).not_to have_received(:new).with(conversation: message.conversation)
       expect(out_of_office_service).not_to have_received(:perform)
     end
 
@@ -200,11 +200,11 @@ describe ::MessageTemplates::HookExecutionService do
 
       out_of_office_service = double
 
-      allow(::MessageTemplates::Template::OutOfOffice).to receive(:new).and_return(out_of_office_service)
+      allow(MessageTemplates::Template::OutOfOffice).to receive(:new).and_return(out_of_office_service)
       allow(out_of_office_service).to receive(:perform).and_return(false)
 
       message = create(:message, conversation: conversation)
-      expect(::MessageTemplates::Template::OutOfOffice).not_to have_received(:new).with(conversation: message.conversation)
+      expect(MessageTemplates::Template::OutOfOffice).not_to have_received(:new).with(conversation: message.conversation)
       expect(out_of_office_service).not_to receive(:perform)
     end
   end
diff --git a/spec/services/message_templates/template/csat_survey_spec.rb b/spec/services/message_templates/template/csat_survey_spec.rb
index e02c93520..dae44ca3e 100644
--- a/spec/services/message_templates/template/csat_survey_spec.rb
+++ b/spec/services/message_templates/template/csat_survey_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::MessageTemplates::Template::CsatSurvey do
+describe MessageTemplates::Template::CsatSurvey do
   context 'when this hook is called' do
     let(:conversation) { create(:conversation) }
 
diff --git a/spec/services/message_templates/template/email_collect_spec.rb b/spec/services/message_templates/template/email_collect_spec.rb
index 4fe5256c7..402ca8278 100644
--- a/spec/services/message_templates/template/email_collect_spec.rb
+++ b/spec/services/message_templates/template/email_collect_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::MessageTemplates::Template::EmailCollect do
+describe MessageTemplates::Template::EmailCollect do
   context 'when this hook is called' do
     let(:conversation) { create(:conversation) }
 
diff --git a/spec/services/message_templates/template/greeting_spec.rb b/spec/services/message_templates/template/greeting_spec.rb
index 3d7645e3a..d7fc7690f 100644
--- a/spec/services/message_templates/template/greeting_spec.rb
+++ b/spec/services/message_templates/template/greeting_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::MessageTemplates::Template::Greeting do
+describe MessageTemplates::Template::Greeting do
   context 'when this hook is called' do
     let(:conversation) { create(:conversation) }
 
diff --git a/spec/services/message_templates/template/out_of_office_spec.rb b/spec/services/message_templates/template/out_of_office_spec.rb
index 5fb0dbf79..e9e987192 100644
--- a/spec/services/message_templates/template/out_of_office_spec.rb
+++ b/spec/services/message_templates/template/out_of_office_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::MessageTemplates::Template::OutOfOffice do
+describe MessageTemplates::Template::OutOfOffice do
   context 'when this hook is called' do
     let(:conversation) { create(:conversation) }
 
diff --git a/spec/services/messages/mention_service_spec.rb b/spec/services/messages/mention_service_spec.rb
index 21484ab13..6090a013c 100644
--- a/spec/services/messages/mention_service_spec.rb
+++ b/spec/services/messages/mention_service_spec.rb
@@ -64,7 +64,7 @@ describe Messages::MentionService do
 
     it 'add the users to the participants list' do
       described_class.new(message: message).perform
-      expect(conversation.conversation_participants.map(&:user_id)).to match_array([first_agent.id, second_agent.id])
+      expect(conversation.conversation_participants.map(&:user_id)).to contain_exactly(first_agent.id, second_agent.id)
     end
   end
 end
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 3bc45e9ae..5242d893e 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ::SearchService do
+describe SearchService do
   subject(:search) { described_class.new(current_user: user, current_account: account, params: params, search_type: search_type) }
 
   let(:search_type) { 'all' }
diff --git a/spec/services/sms/send_on_sms_service_spec.rb b/spec/services/sms/send_on_sms_service_spec.rb
index 422861e06..d2dc1f24a 100644
--- a/spec/services/sms/send_on_sms_service_spec.rb
+++ b/spec/services/sms/send_on_sms_service_spec.rb
@@ -28,9 +28,9 @@ describe Sms::SendOnSmsService do
         message = build(:message, message_type: :outgoing, content: 'test',
                                   conversation: conversation)
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
         attachment2 = message.attachments.new(account_id: message.account_id, file_type: :image)
-        attachment2.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        attachment2.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
         message.save!
 
         allow(HTTParty).to receive(:post).and_return(sms_request)
diff --git a/spec/services/twilio/oneoff_sms_campaign_service_spec.rb b/spec/services/twilio/oneoff_sms_campaign_service_spec.rb
index 37338f889..da5d871d9 100644
--- a/spec/services/twilio/oneoff_sms_campaign_service_spec.rb
+++ b/spec/services/twilio/oneoff_sms_campaign_service_spec.rb
@@ -17,7 +17,7 @@ describe Twilio::OneoffSmsCampaignService do
 
   describe 'perform' do
     before do
-      allow(::Twilio::REST::Client).to receive(:new).and_return(twilio_client)
+      allow(Twilio::REST::Client).to receive(:new).and_return(twilio_client)
       allow(twilio_client).to receive(:messages).and_return(twilio_messages)
     end
 
diff --git a/spec/services/twilio/send_on_twilio_service_spec.rb b/spec/services/twilio/send_on_twilio_service_spec.rb
index cc0ead00e..9579dd840 100644
--- a/spec/services/twilio/send_on_twilio_service_spec.rb
+++ b/spec/services/twilio/send_on_twilio_service_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Twilio::SendOnTwilioService do
   subject(:outgoing_message_service) { described_class.new(message: message) }
 
-  let(:twilio_client) { instance_double(::Twilio::REST::Client) }
+  let(:twilio_client) { instance_double(Twilio::REST::Client) }
   let(:messages_double) { double }
   let(:message_record_double) { double }
 
@@ -18,7 +18,7 @@ describe Twilio::SendOnTwilioService do
   let(:conversation) { create(:conversation, contact: contact, inbox: twilio_inbox, contact_inbox: contact_inbox) }
 
   before do
-    allow(::Twilio::REST::Client).to receive(:new).and_return(twilio_client)
+    allow(Twilio::REST::Client).to receive(:new).and_return(twilio_client)
     allow(twilio_client).to receive(:messages).and_return(messages_double)
   end
 
@@ -26,27 +26,27 @@ describe Twilio::SendOnTwilioService do
     context 'without reply' do
       it 'if message is private' do
         message = create(:message, message_type: 'outgoing', private: true, inbox: twilio_inbox, account: account)
-        ::Twilio::SendOnTwilioService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(twilio_client).not_to have_received(:messages)
         expect(message.reload.source_id).to be_nil
       end
 
       it 'if inbox channel is not twilio' do
         message = create(:message, message_type: 'outgoing', inbox: widget_inbox, account: account)
-        expect { ::Twilio::SendOnTwilioService.new(message: message).perform }.to raise_error 'Invalid channel service was called'
+        expect { described_class.new(message: message).perform }.to raise_error 'Invalid channel service was called'
         expect(twilio_client).not_to have_received(:messages)
       end
 
       it 'if message is not outgoing' do
         message = create(:message, message_type: 'incoming', inbox: twilio_inbox, account: account)
-        ::Twilio::SendOnTwilioService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(twilio_client).not_to have_received(:messages)
         expect(message.reload.source_id).to be_nil
       end
 
       it 'if message has an source id' do
         message = create(:message, message_type: 'outgoing', inbox: twilio_inbox, account: account, source_id: SecureRandom.uuid)
-        ::Twilio::SendOnTwilioService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(twilio_client).not_to have_received(:messages)
       end
     end
@@ -59,7 +59,7 @@ describe Twilio::SendOnTwilioService do
         outgoing_message = create(
           :message, message_type: 'outgoing', inbox: twilio_inbox, account: account, conversation: conversation
         )
-        ::Twilio::SendOnTwilioService.new(message: outgoing_message).perform
+        described_class.new(message: outgoing_message).perform
 
         expect(outgoing_message.reload.source_id).to eq('1234')
       end
@@ -74,10 +74,11 @@ describe Twilio::SendOnTwilioService do
         :message, message_type: 'outgoing', inbox: twilio_whatsapp_inbox, account: account, conversation: conversation
       )
       attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       message.save!
 
-      ::Twilio::SendOnTwilioService.new(message: message).perform
+      described_class.new(message: message).perform
+      expect(messages_double).to have_received(:create).with(hash_including(media_url: [anything]))
     end
 
     it 'if outgoing message has attachment and is for sms' do
@@ -89,10 +90,11 @@ describe Twilio::SendOnTwilioService do
         :message, message_type: 'outgoing', inbox: twilio_inbox, account: account, conversation: conversation
       )
       attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
       message.save!
 
-      ::Twilio::SendOnTwilioService.new(message: message).perform
+      described_class.new(message: message).perform
+      expect(messages_double).to have_received(:create).with(hash_including(media_url: [anything]))
     end
   end
 end
diff --git a/spec/services/twilio/webhook_setup_service_spec.rb b/spec/services/twilio/webhook_setup_service_spec.rb
index 1fb64b4a1..b45a8a895 100644
--- a/spec/services/twilio/webhook_setup_service_spec.rb
+++ b/spec/services/twilio/webhook_setup_service_spec.rb
@@ -3,10 +3,10 @@ require 'rails_helper'
 describe Twilio::WebhookSetupService do
   include Rails.application.routes.url_helpers
 
-  let(:twilio_client) { instance_double(::Twilio::REST::Client) }
+  let(:twilio_client) { instance_double(Twilio::REST::Client) }
 
   before do
-    allow(::Twilio::REST::Client).to receive(:new).and_return(twilio_client)
+    allow(Twilio::REST::Client).to receive(:new).and_return(twilio_client)
   end
 
   describe '#perform' do
diff --git a/spec/services/twitter/send_on_twitter_service_spec.rb b/spec/services/twitter/send_on_twitter_service_spec.rb
index 19b21fc49..93b58253b 100644
--- a/spec/services/twitter/send_on_twitter_service_spec.rb
+++ b/spec/services/twitter/send_on_twitter_service_spec.rb
@@ -3,8 +3,8 @@ require 'rails_helper'
 describe Twitter::SendOnTwitterService do
   subject(:send_reply_service) { described_class.new(message: message) }
 
-  let(:twitter_client) { instance_double(::Twitty::Facade) }
-  let(:twitter_response) { instance_double(::Twitty::Response) }
+  let(:twitter_client) { instance_double(Twitty::Facade) }
+  let(:twitter_response) { instance_double(Twitty::Response) }
   let(:account) { create(:account) }
   let(:widget_inbox) { create(:inbox, account: account) }
   let(:twitter_channel) { create(:channel_twitter_profile, account: account) }
@@ -31,7 +31,7 @@ describe Twitter::SendOnTwitterService do
   end
 
   before do
-    allow(::Twitty::Facade).to receive(:new).and_return(twitter_client)
+    allow(Twitty::Facade).to receive(:new).and_return(twitter_client)
     allow(twitter_client).to receive(:send_direct_message).and_return(true)
     allow(twitter_client).to receive(:send_tweet_reply).and_return(twitter_response)
     allow(twitter_response).to receive(:status).and_return('200')
@@ -42,25 +42,25 @@ describe Twitter::SendOnTwitterService do
     context 'without reply' do
       it 'if inbox channel is not twitter profile' do
         message = create(:message, message_type: 'outgoing', inbox: widget_inbox, account: account)
-        expect { ::Twitter::SendOnTwitterService.new(message: message).perform }.to raise_error 'Invalid channel service was called'
+        expect { described_class.new(message: message).perform }.to raise_error 'Invalid channel service was called'
         expect(twitter_client).not_to have_received(:send_direct_message)
       end
 
       it 'if message is private' do
         message = create(:message, message_type: 'outgoing', private: true, inbox: twitter_inbox, account: account)
-        ::Twitter::SendOnTwitterService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(twitter_client).not_to have_received(:send_direct_message)
       end
 
       it 'if message has source_id' do
         message = create(:message, message_type: 'outgoing', source_id: '123', inbox: twitter_inbox, account: account)
-        ::Twitter::SendOnTwitterService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(twitter_client).not_to have_received(:send_direct_message)
       end
 
       it 'if message is not outgoing' do
         message = create(:message, message_type: 'incoming', inbox: twitter_inbox, account: account)
-        ::Twitter::SendOnTwitterService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(twitter_client).not_to have_received(:send_direct_message)
       end
     end
@@ -69,7 +69,7 @@ describe Twitter::SendOnTwitterService do
       it 'if conversation is a direct message' do
         create(:message, message_type: :incoming, inbox: twitter_inbox, account: account, conversation: dm_conversation)
         message = create(:message, message_type: :outgoing, inbox: twitter_inbox, account: account, conversation: dm_conversation)
-        ::Twitter::SendOnTwitterService.new(message: message).perform
+        described_class.new(message: message).perform
         expect(twitter_client).to have_received(:send_direct_message)
       end
 
@@ -85,7 +85,7 @@ describe Twitter::SendOnTwitterService do
             conversation: tweet_conversation
           )
           message = create(:message, message_type: :outgoing, inbox: twitter_inbox, account: account, conversation: tweet_conversation)
-          ::Twitter::SendOnTwitterService.new(message: message).perform
+          described_class.new(message: message).perform
           expect(twitter_client).to have_received(:send_tweet_reply).with(
             reply_to_tweet_id: 'test-source-id-1',
             tweet: "@test_user #{message.content}"
@@ -110,7 +110,7 @@ describe Twitter::SendOnTwitterService do
             conversation: tweet_conversation,
             in_reply_to: outgoing_message.id
           )
-          ::Twitter::SendOnTwitterService.new(message: reply_message).perform
+          described_class.new(message: reply_message).perform
           expect(twitter_client).to have_received(:send_tweet_reply).with(
             reply_to_tweet_id: 'test-source-id-1',
             tweet: "@#{twitter_inbox.name} #{reply_message.content}"
diff --git a/spec/services/twitter/webhook_subscribe_service_spec.rb b/spec/services/twitter/webhook_subscribe_service_spec.rb
index c94314836..67cc3b372 100644
--- a/spec/services/twitter/webhook_subscribe_service_spec.rb
+++ b/spec/services/twitter/webhook_subscribe_service_spec.rb
@@ -1,28 +1,28 @@
 require 'rails_helper'
 
-describe ::Twitter::WebhookSubscribeService do
+describe Twitter::WebhookSubscribeService do
   subject(:webhook_subscribe_service) { described_class.new(inbox_id: twitter_inbox.id) }
 
-  let(:twitter_client) { instance_double(::Twitty::Facade) }
-  let(:twitter_success_response) { instance_double(::Twitty::Response, status: '200', body: { message: 'Valid' }) }
-  let(:twitter_error_response) { instance_double(::Twitty::Response, status: '422', body: { message: 'Invalid request' }) }
+  let(:twitter_client) { instance_double(Twitty::Facade) }
+  let(:twitter_success_response) { instance_double(Twitty::Response, status: '200', body: { message: 'Valid' }) }
+  let(:twitter_error_response) { instance_double(Twitty::Response, status: '422', body: { message: 'Invalid request' }) }
   let(:account) { create(:account) }
   let(:twitter_channel) { create(:channel_twitter_profile, account: account) }
   let(:twitter_inbox) { create(:inbox, channel: twitter_channel, account: account) }
 
   before do
-    allow(::Twitty::Facade).to receive(:new).and_return(twitter_client)
+    allow(Twitty::Facade).to receive(:new).and_return(twitter_client)
     allow(twitter_client).to receive(:register_webhook).and_return(twitter_success_response)
     allow(twitter_client).to receive(:unregister_webhook).and_return(twitter_success_response)
-    allow(twitter_client).to receive(:fetch_subscriptions).and_return(instance_double(::Twitty::Response, status: '204', body: { message: 'Valid' }))
-    allow(twitter_client).to receive(:create_subscription).and_return(instance_double(::Twitty::Response, status: '204', body: { message: 'Valid' }))
+    allow(twitter_client).to receive(:fetch_subscriptions).and_return(instance_double(Twitty::Response, status: '204', body: { message: 'Valid' }))
+    allow(twitter_client).to receive(:create_subscription).and_return(instance_double(Twitty::Response, status: '204', body: { message: 'Valid' }))
   end
 
   describe '#perform' do
     context 'when webhook is not registered' do
       it 'calls register_webhook' do
         allow(twitter_client).to receive(:fetch_webhooks).and_return(
-          instance_double(::Twitty::Response, status: '200', body: {})
+          instance_double(Twitty::Response, status: '200', body: {})
         )
         webhook_subscribe_service.perform
         expect(twitter_client).not_to have_received(:unregister_webhook)
@@ -33,8 +33,8 @@ describe ::Twitter::WebhookSubscribeService do
     context 'when valid webhook is registered' do
       it 'calls unregister_webhook and then register webhook' do
         allow(twitter_client).to receive(:fetch_webhooks).and_return(
-          instance_double(::Twitty::Response, status: '200',
-                                              body: [{ 'url' => webhook_subscribe_service.send(:twitter_url) }])
+          instance_double(Twitty::Response, status: '200',
+                                            body: [{ 'url' => webhook_subscribe_service.send(:twitter_url) }])
         )
         webhook_subscribe_service.perform
         expect(twitter_client).not_to have_received(:unregister_webhook)
@@ -45,8 +45,8 @@ describe ::Twitter::WebhookSubscribeService do
     context 'when invalid webhook is registered' do
       it 'calls unregister_webhook and then register webhook' do
         allow(twitter_client).to receive(:fetch_webhooks).and_return(
-          instance_double(::Twitty::Response, status: '200',
-                                              body: [{ 'url' => 'invalid_url' }])
+          instance_double(Twitty::Response, status: '200',
+                                            body: [{ 'url' => 'invalid_url' }])
         )
         webhook_subscribe_service.perform
         expect(twitter_client).to have_received(:unregister_webhook)
@@ -57,18 +57,18 @@ describe ::Twitter::WebhookSubscribeService do
     context 'when correct webhook is present' do
       it 'calls create subscription if subscription is not present' do
         allow(twitter_client).to receive(:fetch_webhooks).and_return(
-          instance_double(::Twitty::Response, status: '200',
-                                              body: [{ 'url' => webhook_subscribe_service.send(:twitter_url) }])
+          instance_double(Twitty::Response, status: '200',
+                                            body: [{ 'url' => webhook_subscribe_service.send(:twitter_url) }])
         )
-        allow(twitter_client).to receive(:fetch_subscriptions).and_return(instance_double(::Twitty::Response, status: '500'))
+        allow(twitter_client).to receive(:fetch_subscriptions).and_return(instance_double(Twitty::Response, status: '500'))
         webhook_subscribe_service.perform
         expect(twitter_client).to have_received(:create_subscription)
       end
 
       it 'does not call create subscription if subscription is already present' do
         allow(twitter_client).to receive(:fetch_webhooks).and_return(
-          instance_double(::Twitty::Response, status: '200',
-                                              body: [{ 'url' => webhook_subscribe_service.send(:twitter_url) }])
+          instance_double(Twitty::Response, status: '200',
+                                            body: [{ 'url' => webhook_subscribe_service.send(:twitter_url) }])
         )
         webhook_subscribe_service.perform
         expect(twitter_client).not_to have_received(:create_subscription)
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index c141f869e..07f503162 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -328,15 +328,15 @@ describe Whatsapp::IncomingMessageService do
         expect(Message.find_by(source_id: 'wamid.SDFADSf23sfasdafasdfa')).not_to be_present
         key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: 'wamid.SDFADSf23sfasdafasdfa')
 
-        ::Redis::Alfred.setex(key, true)
-        expect(::Redis::Alfred.get(key)).to be_truthy
+        Redis::Alfred.setex(key, true)
+        expect(Redis::Alfred.get(key)).to be_truthy
 
         described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
         expect(whatsapp_channel.inbox.messages.count).to eq(0)
         expect(Message.find_by(source_id: 'wamid.SDFADSf23sfasdafasdfa')).not_to be_present
 
-        expect(::Redis::Alfred.get(key)).to be_truthy
-        ::Redis::Alfred.delete(key)
+        expect(Redis::Alfred.get(key)).to be_truthy
+        Redis::Alfred.delete(key)
       end
     end
   end
diff --git a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
index 8946dfc9f..3fbea97e9 100644
--- a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
@@ -30,7 +30,7 @@ describe Whatsapp::Providers::WhatsappCloudService do
 
       it 'calls message endpoints for image attachment message messages' do
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+        attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
 
         stub_request(:post, 'https://graph.facebook.com/v13.0/123456789/messages')
           .with(
@@ -47,7 +47,7 @@ describe Whatsapp::Providers::WhatsappCloudService do
 
       it 'calls message endpoints for document attachment message messages' do
         attachment = message.attachments.new(account_id: message.account_id, file_type: :file)
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/sample.pdf')), filename: 'sample.pdf', content_type: 'application/pdf')
+        attachment.file.attach(io: Rails.root.join('spec/assets/sample.pdf').open, filename: 'sample.pdf', content_type: 'application/pdf')
 
         # ref: https://github.com/bblimke/webmock/issues/900
         # reason for Webmock::API.hash_including
diff --git a/spec/workers/conversation_reply_email_worker_spec.rb b/spec/workers/conversation_reply_email_worker_spec.rb
index 3483c04a5..7b28eedde 100644
--- a/spec/workers/conversation_reply_email_worker_spec.rb
+++ b/spec/workers/conversation_reply_email_worker_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe ConversationReplyEmailWorker, type: :worker do
 
     it 'worker jobs are enqueued in the mailers queue' do
       described_class.perform_async
-      assert_equal :mailers, described_class.queue
+      expect(described_class.queue).to eq(:mailers)
     end
 
     it 'goes into the jobs array for testing environment' do

From 7b9a9831c13fae7619253d4b760eb766968c89ce Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 19 May 2023 15:32:25 +0530
Subject: [PATCH 11/93] chore: Fix rubococop failures (#7130)

- fixes rubocop failures on develop
---
 .../public/api/v1/inbox/conversations_controller_spec.rb    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
index 0911bdfca..72b0bfc81 100644
--- a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
@@ -27,11 +27,11 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
       get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations"
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data.length).to eq 1
       expect(data.first['messages'].length).to eq 2
-      expect(data.first['messages'].map { |m| m['content'] }).not_to include('private-message-1')
-      expect(data.first['messages'].map { |m| m['message_type'] }).not_to include('activity')
+      expect(data.first['messages'].pluck('content')).not_to include('private-message-1')
+      expect(data.first['messages'].pluck('message_type')).not_to include('activity')
     end
   end
 

From e3f4be97c06a774694819241d923ed035467f42a Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 19 May 2023 22:04:34 +0530
Subject: [PATCH 12/93] fix: Reauthorize when channel settings updated (#7134)

Fixes: https://linear.app/chatwoot/issue/CW-1803/bug-inbox-doesnt-update-reauthorisation-required-automattically
---
 .../api/v1/accounts/inboxes_controller.rb     | 50 +++++++++++--------
 .../v1/accounts/inboxes_controller_spec.rb    | 30 +++++++++--
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 9b5cafc4c..70c3f2a23 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -44,26 +44,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   def update
     @inbox.update!(permitted_params.except(:channel))
     update_inbox_working_hours
-    channel_attributes = get_channel_attributes(@inbox.channel_type)
-
-    # Inbox update doesn't necessarily need channel attributes
-    return if permitted_params(channel_attributes)[:channel].blank?
-
-    if @inbox.inbox_type == 'Email'
-      begin
-        validate_email_channel(channel_attributes)
-      rescue StandardError => e
-        render json: { message: e }, status: :unprocessable_entity and return
-      end
-      @inbox.channel.reauthorized!
-    end
-
-    @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
-    update_channel_feature_flags
-  end
-
-  def update_inbox_working_hours
-    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
+    update_channel if channel_update_required?
   end
 
   def agent_bot
@@ -103,6 +84,35 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     account_channels_method.create!(permitted_params(channel_type_from_params::EDITABLE_ATTRS)[:channel].except(:type))
   end
 
+  def update_inbox_working_hours
+    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
+  end
+
+  def update_channel
+    channel_attributes = get_channel_attributes(@inbox.channel_type)
+    return if permitted_params(channel_attributes)[:channel].blank?
+
+    validate_and_update_email_channel(channel_attributes) if @inbox.inbox_type == 'Email'
+
+    reauthorize_and_update_channel(channel_attributes)
+    update_channel_feature_flags
+  end
+
+  def channel_update_required?
+    permitted_params(get_channel_attributes(@inbox.channel_type))[:channel].present?
+  end
+
+  def validate_and_update_email_channel(channel_attributes)
+    validate_email_channel(channel_attributes)
+  rescue StandardError => e
+    render json: { message: e }, status: :unprocessable_entity and return
+  end
+
+  def reauthorize_and_update_channel(channel_attributes)
+    @inbox.channel.reauthorized! if @inbox.channel.respond_to?(:reauthorized!)
+    @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
+  end
+
   def update_channel_feature_flags
     return unless @inbox.web_widget?
     return unless permitted_params(Channel::WebWidget::EDITABLE_ATTRS)[:channel].key? :selected_feature_flags
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index b4b6da6fe..70bfb4acd 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -469,17 +469,37 @@ RSpec.describe 'Inboxes API', type: :request do
         expect(api_channel.reload.webhook_url).to eq('webhook.test')
       end
 
-      it 'updates twitter inbox when administrator' do
-        api_channel = create(:channel_twitter_profile, account: account, tweets_enabled: true)
-        api_inbox = create(:inbox, channel: api_channel, account: account)
+      it 'updates whatsapp inbox when administrator' do
+        stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook').to_return(status: 200, body: '', headers: {})
+        stub_request(:get, 'https://waba.360dialog.io/v1/configs/templates').to_return(status: 200, body: '', headers: {})
+        whatsapp_channel = create(:channel_whatsapp, account: account)
+        whatsapp_inbox = create(:inbox, channel: whatsapp_channel, account: account)
+        whatsapp_channel.prompt_reauthorization!
 
-        patch "/api/v1/accounts/#{account.id}/inboxes/#{api_inbox.id}",
+        expect(whatsapp_channel).to be_reauthorization_required
+
+        patch "/api/v1/accounts/#{account.id}/inboxes/#{whatsapp_inbox.id}",
+              headers: admin.create_new_auth_token,
+              params: { enable_auto_assignment: false, channel: { provider_config: { api_key: 'new_key' } } },
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(whatsapp_inbox.reload.enable_auto_assignment).to be_falsey
+        expect(whatsapp_channel.reload.provider_config['api_key']).to eq('new_key')
+        expect(whatsapp_channel.reload).not_to be_reauthorization_required
+      end
+
+      it 'updates twitter inbox when administrator' do
+        twitter_channel = create(:channel_twitter_profile, account: account, tweets_enabled: true)
+        twitter_inbox = create(:inbox, channel: twitter_channel, account: account)
+
+        patch "/api/v1/accounts/#{account.id}/inboxes/#{twitter_inbox.id}",
               headers: admin.create_new_auth_token,
               params: { channel: { tweets_enabled: false } },
               as: :json
 
         expect(response).to have_http_status(:success)
-        expect(api_channel.reload.tweets_enabled).to be(false)
+        expect(twitter_channel.reload.tweets_enabled).to be(false)
       end
 
       it 'updates email inbox when administrator' do

From b8dae07c0f6e1b0db0edf8a9f84fc85716b057e4 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Sun, 21 May 2023 20:35:05 -0700
Subject: [PATCH 13/93] feat: Add an option to use darkMode only in the widget
 (#7151)

---
 app/javascript/sdk/constants.js                       | 2 +-
 app/javascript/widget/App.vue                         | 9 +++++++++
 app/javascript/widget/components/ConversationWrap.vue | 6 +++---
 app/javascript/widget/mixins/darkModeMixin.js         | 3 +++
 tailwind.config.js                                    | 4 ++++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/javascript/sdk/constants.js b/app/javascript/sdk/constants.js
index 7bf84d430..7c172d159 100644
--- a/app/javascript/sdk/constants.js
+++ b/app/javascript/sdk/constants.js
@@ -1,3 +1,3 @@
 export const BUBBLE_DESIGN = ['standard', 'expanded_bubble'];
 export const WIDGET_DESIGN = ['standard', 'flat'];
-export const DARK_MODE = ['light', 'auto'];
+export const DARK_MODE = ['light', 'auto', 'dark'];
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index 7d158eb74..d4611b3a4 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -2,6 +2,7 @@
   <div
     v-if="!conversationSize && isFetchingList"
     class="flex flex-1 items-center h-full bg-black-25 justify-center"
+    :class="{ dark: prefersDarkMode }"
   >
     <spinner size="" />
   </div>
@@ -13,6 +14,7 @@
       'is-widget-right': isRightAligned,
       'is-bubble-hidden': hideMessageBubble,
       'is-flat-design': isWidgetStyleFlat,
+      dark: prefersDarkMode,
     }"
   >
     <router-view />
@@ -65,6 +67,7 @@ export default {
       isFetchingList: 'conversation/getIsFetchingList',
       isRightAligned: 'appConfig/isRightAligned',
       isWidgetOpen: 'appConfig/getIsWidgetOpen',
+      darkMode: 'appConfig/darkMode',
       messageCount: 'conversation/getMessageCount',
       unreadMessageCount: 'conversation/getUnreadMessageCount',
       isWidgetStyleFlat: 'appConfig/isWidgetStyleFlat',
@@ -75,6 +78,12 @@ export default {
     isRNWebView() {
       return RNHelper.isRNWebView();
     },
+    prefersDarkMode() {
+      const isOSOnDarkMode =
+        this.darkMode === 'auto' &&
+        window.matchMedia('(prefers-color-scheme: dark)').matches;
+      return isOSOnDarkMode || this.darkMode === 'dark';
+    },
   },
   watch: {
     activeCampaign() {
diff --git a/app/javascript/widget/components/ConversationWrap.vue b/app/javascript/widget/components/ConversationWrap.vue
index eff57fd86..1c589488d 100755
--- a/app/javascript/widget/components/ConversationWrap.vue
+++ b/app/javascript/widget/components/ConversationWrap.vue
@@ -60,7 +60,7 @@ export default {
       isAgentTyping: 'conversation/getIsAgentTyping',
     }),
     colorSchemeClass() {
-      return `${this.darkMode === 'light' ? 'light' : 'dark'}`;
+      return `${this.darkMode === 'dark' ? 'dark-scheme' : 'light-scheme'}`;
     },
   },
   watch: {
@@ -117,10 +117,10 @@ export default {
   overflow-y: auto;
   color-scheme: light dark;
 
-  &.light {
+  &.light-scheme {
     color-scheme: light;
   }
-  &.dark {
+  &.dark-scheme {
     color-scheme: dark;
   }
 }
diff --git a/app/javascript/widget/mixins/darkModeMixin.js b/app/javascript/widget/mixins/darkModeMixin.js
index dd8f19cfc..87d7c8048 100644
--- a/app/javascript/widget/mixins/darkModeMixin.js
+++ b/app/javascript/widget/mixins/darkModeMixin.js
@@ -9,6 +9,9 @@ export default {
       if (this.darkMode === 'light') {
         return light;
       }
+      if (this.darkMode === 'dark') {
+        return dark;
+      }
       return light + ' ' + dark;
     },
   },
diff --git a/tailwind.config.js b/tailwind.config.js
index 0dc013c8e..81def1169 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,6 +1,7 @@
 const { colors } = require('tailwindcss/defaultTheme');
 
 module.exports = {
+  dark: 'class',
   purge: [
     './app/javascript/widget/**/*.vue',
     './app/javascript/portal/**/*.vue',
@@ -11,6 +12,9 @@ module.exports = {
   future: {
     removeDeprecatedGapUtilities: true,
   },
+  experimental: {
+    darkModeVariant: true,
+  },
   theme: {
     colors: {
       white: colors.white,

From e8f56d0e56a1703e14465462ab0aea2e596157ed Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 22 May 2023 09:37:37 +0530
Subject: [PATCH 14/93] chore: Update greeting message label in settings
 (#7088)

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

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 06af3794e..776dd101f 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -83,7 +83,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Automatically send a greeting message after the contact's first message in a conversation.",
+          "HELP_TEXT": "Auto-send greeting messages when customers start a conversation and send their first message.",
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },

From d6ce1ceeeb177266fb69bd32e94487c6c1145a05 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 22 May 2023 11:01:01 +0530
Subject: [PATCH 15/93] fix: CSAT chart showing incorrect data (#7152)

* fix: computation of data for csat chart

* fix: make horizontal chart reactive
---
 .../components/widgets/chart/HorizontalBarChart.js        | 8 ++++++++
 .../dashboard/settings/reports/components/CsatMetrics.vue | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/chart/HorizontalBarChart.js b/app/javascript/dashboard/components/widgets/chart/HorizontalBarChart.js
index c986c9507..340c78319 100644
--- a/app/javascript/dashboard/components/widgets/chart/HorizontalBarChart.js
+++ b/app/javascript/dashboard/components/widgets/chart/HorizontalBarChart.js
@@ -45,6 +45,14 @@ export default {
       default: () => {},
     },
   },
+  watch: {
+    collection() {
+      this.renderChart(this.collection, {
+        ...chartOptions,
+        ...this.chartOptions,
+      });
+    },
+  },
   mounted() {
     this.renderChart(this.collection, {
       ...chartOptions,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index 9144e95c1..b1e03636c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -60,9 +60,9 @@ export default {
     chartData() {
       return {
         labels: ['Rating'],
-        datasets: CSAT_RATINGS.map((rating, index) => ({
+        datasets: CSAT_RATINGS.map(rating => ({
           label: rating.emoji,
-          data: [this.ratingPercentage[index + 1]],
+          data: [this.ratingPercentage[rating.value]],
           backgroundColor: rating.color,
         })),
       };

From 0e903d23657971aad0c269b026bd11b742e0935c Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 22 May 2023 13:51:14 +0530
Subject: [PATCH 16/93] chore: Add delay for slack job when message has
 attachments (#7107)

---
 app/jobs/hook_job.rb                | 10 +++++++--
 app/jobs/send_on_slack_job.rb       |  8 ++++++++
 spec/jobs/hook_job_spec.rb          | 15 +++++++-------
 spec/jobs/send_on_slack_job_spec.rb | 32 +++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 app/jobs/send_on_slack_job.rb
 create mode 100644 spec/jobs/send_on_slack_job_spec.rb

diff --git a/app/jobs/hook_job.rb b/app/jobs/hook_job.rb
index 9d54462e2..15efa40f2 100644
--- a/app/jobs/hook_job.rb
+++ b/app/jobs/hook_job.rb
@@ -20,8 +20,14 @@ class HookJob < ApplicationJob
     return unless ['message.created'].include?(event_name)
 
     message = event_data[:message]
-
-    Integrations::Slack::SendOnSlackService.new(message: message, hook: hook).perform
+    if message.attachments.blank?
+      ::SendOnSlackJob.perform_later(message: message,
+                                     hook: hook)
+    else
+      ::SendOnSlackJob.set(wait: 2.seconds).perform_later(
+        message: message, hook: hook
+      )
+    end
   end
 
   def process_dialogflow_integration(hook, event_name, event_data)
diff --git a/app/jobs/send_on_slack_job.rb b/app/jobs/send_on_slack_job.rb
new file mode 100644
index 000000000..521510ff9
--- /dev/null
+++ b/app/jobs/send_on_slack_job.rb
@@ -0,0 +1,8 @@
+class SendOnSlackJob < ApplicationJob
+  queue_as :medium
+  pattr_initialize [:message!, :hook!]
+
+  def perform
+    Integrations::Slack::SendOnSlackService.new(message: message, hook: hook).perform
+  end
+end
diff --git a/spec/jobs/hook_job_spec.rb b/spec/jobs/hook_job_spec.rb
index 67dfcaf5f..d3cd46223 100644
--- a/spec/jobs/hook_job_spec.rb
+++ b/spec/jobs/hook_job_spec.rb
@@ -22,18 +22,19 @@ RSpec.describe HookJob do
       allow(process_service).to receive(:perform)
     end
 
-    it 'calls Integrations::Slack::SendOnSlackService when its a slack hook' do
+    it 'calls SendOnSlackJob when its a slack hook' do
       hook = create(:integrations_hook, app_id: 'slack', account: account)
-      allow(Integrations::Slack::SendOnSlackService).to receive(:new).and_return(process_service)
-      expect(Integrations::Slack::SendOnSlackService).to receive(:new).with(message: event_data[:message], hook: hook)
+      allow(SendOnSlackJob).to receive(:perform_later).and_return(process_service)
+      expect(SendOnSlackJob).to receive(:perform_later).with(message: event_data[:message], hook: hook)
       described_class.perform_now(hook, event_name, event_data)
     end
 
-    it 'calls Integrations::Slack::SendOnSlackService when its a slack hook for template message' do
-      event_data = { message: create(:message, account: account, message_type: :template) }
+    it 'calls SendOnSlackJob when its a slack hook for message with attachments' do
+      event_data = { message: create(:message, :with_attachment, account: account) }
       hook = create(:integrations_hook, app_id: 'slack', account: account)
-      allow(Integrations::Slack::SendOnSlackService).to receive(:new).and_return(process_service)
-      expect(Integrations::Slack::SendOnSlackService).to receive(:new)
+      allow(SendOnSlackJob).to receive(:set).with(wait: 2.seconds).and_return(SendOnSlackJob)
+      allow(SendOnSlackJob).to receive(:perform_later).and_return(process_service)
+      expect(SendOnSlackJob).to receive(:perform_later).with(message: event_data[:message], hook: hook)
       described_class.perform_now(hook, event_name, event_data)
     end
 
diff --git a/spec/jobs/send_on_slack_job_spec.rb b/spec/jobs/send_on_slack_job_spec.rb
new file mode 100644
index 000000000..59f15a9b5
--- /dev/null
+++ b/spec/jobs/send_on_slack_job_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+RSpec.describe SendOnSlackJob do
+  let(:account) { create(:account) }
+  let(:hook) { create(:integrations_hook, account: account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:event_name) { 'message.created' }
+  let(:event_data) { { message: create(:message, account: account, content: 'muchas muchas gracias', message_type: :incoming) } }
+
+  context 'when handleable events like message.created' do
+    let(:process_service) { double }
+
+    before do
+      allow(process_service).to receive(:perform)
+    end
+
+    it 'calls Integrations::Slack::SendOnSlackService when its a slack hook' do
+      hook = create(:integrations_hook, app_id: 'slack', account: account)
+      allow(Integrations::Slack::SendOnSlackService).to receive(:new).and_return(process_service)
+      expect(Integrations::Slack::SendOnSlackService).to receive(:new).with(message: event_data[:message], hook: hook)
+      described_class.perform_now(message: event_data[:message], hook: hook)
+    end
+
+    it 'calls Integrations::Slack::SendOnSlackService when its a slack hook for template message' do
+      event_data = { message: create(:message, account: account, message_type: :template) }
+      hook = create(:integrations_hook, app_id: 'slack', account: account)
+      allow(Integrations::Slack::SendOnSlackService).to receive(:new).and_return(process_service)
+      expect(Integrations::Slack::SendOnSlackService).to receive(:new).with(message: event_data[:message], hook: hook)
+      described_class.perform_now(message: event_data[:message], hook: hook)
+    end
+  end
+end

From 590e4e9c1c590e264206fe880cdb00da2a169220 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 22 May 2023 13:51:56 +0530
Subject: [PATCH 17/93] Fix: prevent IMAPBadResponse exception from sending the
 authorization mail (#7154)

---
 app/jobs/inboxes/fetch_imap_emails_job.rb | 5 +++--
 lib/exception_list.rb                     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 9f9393df7..8ffea6c18 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -7,9 +7,10 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     return unless should_fetch_email?(channel)
 
     process_email_for_channel(channel)
-  rescue *ExceptionList::IMAP_EXCEPTIONS
+  rescue *ExceptionList::IMAP_EXCEPTIONS => e
+    Rails.logger.error e
     channel.authorization_error!
-  rescue EOFError, OpenSSL::SSL::SSLError => e
+  rescue EOFError, OpenSSL::SSL::SSLError, Net::IMAP::NoResponseError => e
     Rails.logger.error e
   rescue StandardError => e
     ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
diff --git a/lib/exception_list.rb b/lib/exception_list.rb
index fccc747c6..2fee0a170 100644
--- a/lib/exception_list.rb
+++ b/lib/exception_list.rb
@@ -12,7 +12,7 @@ module ExceptionList
   ].freeze
 
   IMAP_EXCEPTIONS = [
-    Errno::ECONNREFUSED, Net::OpenTimeout, Net::IMAP::NoResponseError,
+    Errno::ECONNREFUSED, Net::OpenTimeout,
     Errno::ECONNRESET, Errno::ENETUNREACH, Net::IMAP::ByeResponseError,
     SocketError
   ].freeze

From d01f2063d0fdc99cf1a0d8205feb0c81d3e1d54e Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Mon, 22 May 2023 15:15:19 +0530
Subject: [PATCH 18/93] feat: Creates component to show articles search results
 [CW-1451] (#7126)

* feat: Creates component to show articles search results

* Adds story for the component
---
 .../dashboard/i18n/locale/en/helpCenter.json  |   8 ++
 .../components/ArticleSearchResultItem.vue    | 130 ++++++++++++++++++
 .../ArticleSearchResultItem.stories.js        |  56 ++++++++
 .../FluentIcon/dashboard-icons.json           |   4 +
 4 files changed, 198 insertions(+)
 create mode 100644 app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearchResultItem.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleSearchResultItem.stories.js

diff --git a/app/javascript/dashboard/i18n/locale/en/helpCenter.json b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
index 782945f34..55c406fa9 100644
--- a/app/javascript/dashboard/i18n/locale/en/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
@@ -74,6 +74,14 @@
         "DELETE": "Delete article"
       }
     },
+    "ARTICLE_SEARCH_RESULT": {
+      "UNCATEGORIZED": "Uncategorized",
+      "INSERT_ARTICLE": "Insert",
+      "NO_RESULT": "No articles found",
+      "COPY_LINK": "Copy article link to clipboard",
+      "OPEN_LINK": "Open article in new tab",
+      "PREVIEW_LINK": "Preview article"
+    },
     "PORTAL": {
       "HEADER": "Portals",
       "DEFAULT": "Default",
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearchResultItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearchResultItem.vue
new file mode 100644
index 000000000..06a1ab241
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearchResultItem.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="article-item">
+    <h4 class="text-block-title margin-bottom-0">{{ title }}</h4>
+    <p class="margin-bottom-0 text-truncate">{{ body }}</p>
+    <div class="footer">
+      <p class="text-small meta">
+        {{ locale }}
+        {{ ` / ` }}
+        {{
+          category ||
+            $t('HELP_CENTER.ARTICLE_SEARCH_RESULT.ARTICLE_SEARCH_RESULT')
+        }}
+      </p>
+      <div class="action-buttons">
+        <woot-button
+          :title="$t('HELP_CENTER.ARTICLE_SEARCH_RESULT.COPY_LINK')"
+          variant="hollow"
+          color-scheme="secondary"
+          size="tiny"
+          icon="copy"
+          @click="handleCopy"
+        />
+
+        <a
+          :href="url"
+          class="button hollow button--only-icon tiny secondary"
+          rel="noopener noreferrer nofollow"
+          target="_blank"
+          :title="$t('HELP_CENTER.ARTICLE_SEARCH_RESULT.OPEN_LINK')"
+        >
+          <fluent-icon size="12" icon="arrow-up-right" />
+          <span class="show-for-sr">{{ url }}</span>
+        </a>
+        <woot-button
+          variant="hollow"
+          color-scheme="secondary"
+          size="tiny"
+          icon="preview-link"
+          :title="$t('HELP_CENTER.ARTICLE_SEARCH_RESULT.PREVIEW_LINK')"
+          @click="handlePreview"
+        />
+        <woot-button
+          class="insert-button"
+          variant="smooth"
+          color-scheme="secondary"
+          size="tiny"
+          @click="handleClick"
+        >
+          {{ $t('HELP_CENTER.ARTICLE_SEARCH_RESULT.INSERT_ARTICLE') }}
+        </woot-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
+
+export default {
+  name: 'ArticleSearchResultItem',
+  props: {
+    title: {
+      type: String,
+      default: 'Untitled',
+    },
+    body: {
+      type: String,
+      default: '',
+    },
+    url: {
+      type: String,
+      default: '',
+    },
+    category: {
+      type: String,
+      default: '',
+    },
+    locale: {
+      type: String,
+      default: 'en-US',
+    },
+  },
+  methods: {
+    handleClick() {
+      this.$emit('click');
+    },
+    handlePreview() {
+      this.$emit('preview');
+    },
+    async handleCopy() {
+      await copyTextToClipboard(this.url);
+      this.showAlert(this.$t('CONTACT_PANEL.COPY_SUCCESSFUL'));
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.article-item {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-micro);
+}
+
+.footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: var(--space-micro);
+}
+
+.meta {
+  color: var(--s-600);
+  margin-bottom: 0;
+}
+
+.action-buttons {
+  display: flex;
+  gap: var(--space-micro);
+}
+.action-buttons .button:not(.insert-button) {
+  visibility: hidden;
+  opacity: 0;
+  transition: all 0.1s ease-in;
+}
+
+.article-item:hover .action-buttons .button:not(.insert-button) {
+  visibility: visible;
+  opacity: 1;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleSearchResultItem.stories.js b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleSearchResultItem.stories.js
new file mode 100644
index 000000000..c0010c06a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/stories/ArticleSearchResultItem.stories.js
@@ -0,0 +1,56 @@
+import ArticleSearchResultItem from '../ArticleSearchResultItem.vue';
+
+export default {
+  title: 'Components/Help Center/ArticleSearchResultItem',
+  component: ArticleSearchResultItem,
+  argTypes: {
+    title: {
+      defaultValue: 'Setup your account',
+      control: {
+        type: 'text',
+      },
+    },
+    body: {
+      defaultValue:
+        'You can integrate your Chatwoot account with multiple conversation channels like website live-chat, email, Facebook page, Twitter handle, WhatsApp, etc. You can view all of your conversations from different channels on one dashboard. This helps in reducing the time and friction involved with switching between multiple tools.',
+      control: {
+        type: 'text',
+      },
+    },
+    category: {
+      defaultValue: 'Getting started',
+      control: {
+        type: 'text',
+      },
+    },
+    locale: {
+      defaultValue: 'en-US',
+      control: {
+        type: 'text',
+      },
+    },
+    url: {
+      defaultValue: '/app/accounts/1/conversations/23842',
+      control: {
+        type: 'text',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { ArticleSearchResultItem },
+  template:
+    '<ArticleSearchResultItem v-bind="$props" ></ArticleSearchResultItem>',
+});
+
+export const ArticleSearchResultItemStory = Template.bind({});
+ArticleSearchResultItemStory.args = {
+  title: 'Setup your account',
+  body: `You can integrate your Chatwoot account with multiple conversation channels like website live-chat, email, Facebook page, Twitter handle, WhatsApp, etc. You can view all of your conversations from different channels on one dashboard. This helps in reducing the time and friction involved with switching between multiple tools.
+
+You can manage your conversations and collaborate with your team on the go with Chatwoot mobile apps (available for Android and iOS).
+
+In this user guide, we’ve explained the features, capabilities, modes of operation, and step-by-step procedures for easily using the Chatwoot platform.`,
+};
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index f19a9e57c..992be124f 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -196,6 +196,10 @@
     "M5 18C5 17.4477 5.44772 17 6 17H10C10.5523 17 11 17.4477 11 18V21C11 21.5523 10.5523 22 10 22H6C5.44772 22 5 21.5523 5 21V18Z",
     "M13 18C13 17.4477 13.4477 17 14 17H18C18.5523 17 19 17.4477 19 18V21C19 21.5523 18.5523 22 18 22H14C13.4477 22 13 21.5523 13 21V18Z"
   ],
+  "preview-link-outline": [
+    "M4.524 6.25a.75.75 0 0 1 .75-.75H18.73a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-.75.75H5.274a.75.75 0 0 1-.75-.75v-3.5Zm1.5.75v2H17.98V7H6.024ZM14.23 11.979a.75.75 0 0 0-.75.75v4.5c0 .414.335.75.75.75h4.5a.75.75 0 0 0 .75-.75v-4.5a.75.75 0 0 0-.75-.75h-4.5Zm.75 4.5v-3h3v3h-3ZM4.524 13.25a.75.75 0 0 1 .75-.75h5.976a.75.75 0 0 1 0 1.5H5.274a.75.75 0 0 1-.75-.75ZM5.274 16a.75.75 0 0 0 0 1.5h5.976a.75.75 0 0 0 0-1.5H5.274Z",
+    "M2 5.75A2.75 2.75 0 0 1 4.75 3h14.5A2.75 2.75 0 0 1 22 5.75v12.5A2.75 2.75 0 0 1 19.25 21H4.75A2.75 2.75 0 0 1 2 18.25V5.75ZM4.75 4.5c-.69 0-1.25.56-1.25 1.25v12.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H4.75Z"
+  ],
   "priority-urgent-outline": [
     "M2.33325 2.91667C2.33325 2.27233 2.85559 1.75 3.49992 1.75C4.14425 1.75 4.66659 2.27233 4.66659 2.91667V8.16667C4.66659 8.811 4.14425 9.33333 3.49992 9.33333C2.85559 9.33333 2.33325 8.811 2.33325 8.16667V2.91667Z",
     "M2.33325 11.0833C2.33325 10.439 2.85559 9.91667 3.49992 9.91667C4.14425 9.91667 4.66659 10.439 4.66659 11.0833C4.66659 11.7277 4.14425 12.25 3.49992 12.25C2.85559 12.25 2.33325 11.7277 2.33325 11.0833Z",

From 9553329092e92f2105c9b5749cd473d746446bbf Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 22 May 2023 16:01:31 +0530
Subject: [PATCH 19/93] chore: find instagram_direct_message query (#7157)

---
 app/builders/messages/instagram/message_builder.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index eb34d4052..e2c594376 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -63,9 +63,9 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
   end
 
   def conversation
-    @conversation ||= Conversation.where(
+    @conversation ||= Conversation.where(conversation_params).find_by(
       "additional_attributes ->> 'type' = 'instagram_direct_message'"
-    ).find_by(conversation_params) || build_conversation
+    ) || build_conversation
   end
 
   def message_content
@@ -96,6 +96,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
 
   def build_conversation
     @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: message_source_id)
+
     Conversation.create!(conversation_params.merge(
                            contact_inbox_id: @contact_inbox.id,
                            additional_attributes: { type: 'instagram_direct_message' }

From 958c0d79461ee5d5c57b67a9eb319b1aaee29546 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 22 May 2023 16:03:11 +0530
Subject: [PATCH 20/93] feat(perf): improve performance of conversation filter
 API [CW-1605] (#7120)

* feat(perf): don't use count

* feat(perf): include messages in the conversation query

* feat: include contact inboxes

* refactor: use blank?
---
 app/services/conversations/filter_service.rb                   | 3 ++-
 .../api/v1/conversations/partials/_conversation.json.jbuilder  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/services/conversations/filter_service.rb b/app/services/conversations/filter_service.rb
index d91916b12..012dd662f 100644
--- a/app/services/conversations/filter_service.rb
+++ b/app/services/conversations/filter_service.rb
@@ -58,8 +58,9 @@ class Conversations::FilterService < FilterService
 
   def conversations
     @conversations = @conversations.includes(
-      :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team
+      :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :messages, :contact_inbox
     )
+
     @conversations.latest.page(current_page)
   end
 end
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 9ea7df4e6..63e1f22fb 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -17,7 +17,7 @@ json.meta do
 end
 
 json.id conversation.display_id
-if conversation.messages.count.zero?
+if conversation.messages.first.blank?
   json.messages []
 elsif conversation.unread_incoming_messages.count.zero?
   json.messages [conversation.messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last.try(:push_event_data)]

From 68dedc37ba2c57b1be75f8749bf2e4978a5158e3 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Mon, 22 May 2023 17:08:50 +0530
Subject: [PATCH 21/93] chore: update auditlog timestamp format (#7128)

---
 .../routes/dashboard/settings/auditlogs/Index.vue          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
index 990e0cb4e..63856b6d8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
@@ -37,7 +37,12 @@
                 {{ auditLogItem.remote_address }}
               </td>
               <td class="wrap-break-words">
-                {{ dynamicTime(auditLogItem.created_at) }}
+                {{
+                  messageTimestamp(
+                    auditLogItem.created_at,
+                    'MMM dd, yyyy hh:mm a'
+                  )
+                }}
               </td>
             </tr>
           </tbody>

From d481b9fbcf578fda50d529a213664786e66807e8 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 22 May 2023 18:03:15 +0530
Subject: [PATCH 22/93] feat: Limit the number of custom filters per user
 (#7101)

---
 .../v1/accounts/custom_filters_controller.rb  |  1 +
 .../dashboard/customviews/AddCustomViews.vue  |  2 +-
 app/models/custom_filter.rb                   |  8 ++++++++
 config/locales/en.yml                         |  2 ++
 .../custom_filters_controller_spec.rb         | 19 +++++++++++++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/accounts/custom_filters_controller.rb b/app/controllers/api/v1/accounts/custom_filters_controller.rb
index 188f0e623..6cd70b07d 100644
--- a/app/controllers/api/v1/accounts/custom_filters_controller.rb
+++ b/app/controllers/api/v1/accounts/custom_filters_controller.rb
@@ -11,6 +11,7 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
     @custom_filter = current_user.custom_filters.create!(
       permitted_payload.merge(account_id: Current.account.id)
     )
+    render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid?
   end
 
   def update
diff --git a/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue b/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
index c87c85883..1736cecad 100644
--- a/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
+++ b/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
@@ -98,7 +98,7 @@ export default {
         const errorMessage = error?.message;
         this.alertMessage =
           errorMessage || this.filterType === 0
-            ? this.$t('FILTER.CUSTOM_VIEWS.ADD.API_FOLDERS.ERROR_MESSAGE')
+            ? errorMessage
             : this.$t('FILTER.CUSTOM_VIEWS.ADD.API_SEGMENTS.ERROR_MESSAGE');
       } finally {
         this.showAlert(this.alertMessage);
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index e506edc5a..b3d58fd17 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -17,8 +17,16 @@
 #  index_custom_filters_on_user_id     (user_id)
 #
 class CustomFilter < ApplicationRecord
+  MAX_FILTER_PER_USER = 50
   belongs_to :user
   belongs_to :account
 
   enum filter_type: { conversation: 0, contact: 1, report: 2 }
+  validate :validate_number_of_filters
+
+  def validate_number_of_filters
+    return true if account.custom_filters.where(user_id: user_id).size < MAX_FILTER_PER_USER
+
+    errors.add :account_id, I18n.t('errors.custom_filters.number_of_records')
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2a2437566..daa5a295c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -70,6 +70,8 @@ en:
         connection_closed_error: Connection closed.
       validations:
         name: should not start or end with symbols, and it should not have < > / \ @ characters.
+    custom_filters:
+      number_of_records: Limit reached. The maximum number of allowed custom filters for a user per account is 50.
 
   reports:
     period: Reporting period %{since} to %{until}
diff --git a/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb b/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
index 73ba61859..2b0815add 100644
--- a/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
@@ -66,6 +66,8 @@ RSpec.describe 'Custom Filters API', type: :request do
 
     context 'when it is an authenticated user' do
       let(:user) { create(:user, account: account) }
+      let(:new_account) { create(:account) }
+      let(:new_user) { create(:user, account: new_account) }
 
       it 'creates the filter' do
         expect do
@@ -77,6 +79,23 @@ RSpec.describe 'Custom Filters API', type: :request do
         json_response = response.parsed_body
         expect(json_response['name']).to eq 'vip-customers'
       end
+
+      it 'gives the error for 51st record' do
+        CustomFilter::MAX_FILTER_PER_USER.times do
+          create(:custom_filter, user: user, account: account)
+        end
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/custom_filters", headers: user.create_new_auth_token,
+                                                                params: payload
+        end.not_to change(CustomFilter, :count)
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        json_response = response.parsed_body
+        expect(json_response['message']).to include(
+          'Account Limit reached. The maximum number of allowed custom filters for a user per account is 50.'
+        )
+      end
     end
   end
 

From 03bbd048a784791297946a0134bd4e9314e776ee Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 23 May 2023 04:04:09 +0530
Subject: [PATCH 23/93] chore: Add action to set dark mode from the
 react-native-widget (#7167)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/javascript/packs/sdk.js                               | 6 ++++++
 app/javascript/widget/App.vue                             | 3 +++
 app/javascript/widget/store/modules/appConfig.js          | 7 +++++++
 .../widget/store/modules/specs/appConfig/actions.spec.js  | 7 +++++++
 .../store/modules/specs/appConfig/mutations.spec.js       | 8 ++++++++
 app/javascript/widget/store/types.js                      | 1 +
 6 files changed, 32 insertions(+)

diff --git a/app/javascript/packs/sdk.js b/app/javascript/packs/sdk.js
index 80cbb6de0..912e7ca7e 100755
--- a/app/javascript/packs/sdk.js
+++ b/app/javascript/packs/sdk.js
@@ -146,6 +146,12 @@ const runSDK = ({ baseUrl, websiteToken }) => {
       IFrameHelper.sendMessage('set-locale', { locale: localeToBeUsed });
     },
 
+    setColorScheme(darkMode = 'light') {
+      IFrameHelper.sendMessage('set-color-scheme', {
+        darkMode: getDarkMode(darkMode),
+      });
+    },
+
     reset() {
       if (window.$chatwoot.isOpen) {
         IFrameHelper.events.toggleBubble();
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index d4611b3a4..d8a809d5d 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -117,6 +117,7 @@ export default {
       'setReferrerHost',
       'setWidgetColor',
       'setBubbleVisibility',
+      'setColorScheme',
     ]),
     ...mapActions('conversation', ['fetchOldConversations', 'setUserLastSeen']),
     ...mapActions('campaign', [
@@ -307,6 +308,8 @@ export default {
         } else if (message.event === 'set-locale') {
           this.setLocale(message.locale);
           this.setBubbleLabel();
+        } else if (message.event === 'set-color-scheme') {
+          this.setColorScheme(message.darkMode);
         } else if (message.event === 'toggle-open') {
           this.$store.dispatch('appConfig/toggleWidgetOpen', message.isOpen);
 
diff --git a/app/javascript/widget/store/modules/appConfig.js b/app/javascript/widget/store/modules/appConfig.js
index 91149a2c3..a87276672 100644
--- a/app/javascript/widget/store/modules/appConfig.js
+++ b/app/javascript/widget/store/modules/appConfig.js
@@ -1,5 +1,6 @@
 import {
   SET_BUBBLE_VISIBILITY,
+  SET_COLOR_SCHEME,
   SET_REFERRER_HOST,
   SET_WIDGET_APP_CONFIG,
   SET_WIDGET_COLOR,
@@ -55,6 +56,9 @@ export const actions = {
   setWidgetColor({ commit }, widgetColor) {
     commit(SET_WIDGET_COLOR, widgetColor);
   },
+  setColorScheme({ commit }, darkMode) {
+    commit(SET_COLOR_SCHEME, darkMode);
+  },
   setReferrerHost({ commit }, referrerHost) {
     commit(SET_REFERRER_HOST, referrerHost);
   },
@@ -83,6 +87,9 @@ export const mutations = {
   [SET_BUBBLE_VISIBILITY]($state, hideMessageBubble) {
     $state.hideMessageBubble = hideMessageBubble;
   },
+  [SET_COLOR_SCHEME]($state, darkMode) {
+    $state.darkMode = darkMode;
+  },
 };
 
 export default {
diff --git a/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js b/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
index 58441e0c8..2ae31ab2e 100644
--- a/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
@@ -24,4 +24,11 @@ describe('#actions', () => {
       expect(commit.mock.calls).toEqual([['SET_WIDGET_COLOR', '#eaeaea']]);
     });
   });
+
+  describe('#setColorScheme', () => {
+    it('creates actions for dark mode properly', () => {
+      actions.setColorScheme({ commit }, 'dark');
+      expect(commit.mock.calls).toEqual([['SET_DARK_MODE', 'dark']]);
+    });
+  });
 });
diff --git a/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js b/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
index dc17014fc..e79235e28 100644
--- a/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
@@ -24,4 +24,12 @@ describe('#mutations', () => {
       expect(state.widgetColor).toEqual('#00bcd4');
     });
   });
+
+  describe('#SET_COLOR_SCHEME', () => {
+    it('sets dark mode properly', () => {
+      const state = { darkMode: 'light' };
+      mutations.SET_COLOR_SCHEME(state, 'dark');
+      expect(state.darkMode).toEqual('dark');
+    });
+  });
 });
diff --git a/app/javascript/widget/store/types.js b/app/javascript/widget/store/types.js
index dca4d5dc9..17398b682 100644
--- a/app/javascript/widget/store/types.js
+++ b/app/javascript/widget/store/types.js
@@ -2,6 +2,7 @@ export const CLEAR_CONVERSATION_ATTRIBUTES = 'CLEAR_CONVERSATION_ATTRIBUTES';
 export const SET_CONVERSATION_ATTRIBUTES = 'SET_CONVERSATION_ATTRIBUTES';
 export const SET_WIDGET_APP_CONFIG = 'SET_WIDGET_APP_CONFIG';
 export const SET_WIDGET_COLOR = 'SET_WIDGET_COLOR';
+export const SET_COLOR_SCHEME = 'SET_COLOR_SCHEME';
 export const UPDATE_CONVERSATION_ATTRIBUTES = 'UPDATE_CONVERSATION_ATTRIBUTES';
 export const TOGGLE_WIDGET_OPEN = 'TOGGLE_WIDGET_OPEN';
 export const SET_REFERRER_HOST = 'SET_REFERRER_HOST';

From fdbaf98c3b2bde8d0b4e6c560d7e56c00a1de056 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 22 May 2023 17:01:27 -0700
Subject: [PATCH 24/93] fix: Update breaking specs (#7169)

---
 .../widget/store/modules/specs/appConfig/actions.spec.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js b/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
index 2ae31ab2e..89aea11a0 100644
--- a/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
@@ -28,7 +28,7 @@ describe('#actions', () => {
   describe('#setColorScheme', () => {
     it('creates actions for dark mode properly', () => {
       actions.setColorScheme({ commit }, 'dark');
-      expect(commit.mock.calls).toEqual([['SET_DARK_MODE', 'dark']]);
+      expect(commit.mock.calls).toEqual([['SET_COLOR_SCHEME', 'dark']]);
     });
   });
 });

From 4f0fcfcbcda5ae837fa077353315e4c5b81a7c50 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 23 May 2023 08:00:01 +0530
Subject: [PATCH 25/93] feat: allow Microsoft Clarity from CDN  (#7163)

* feat: add microsoft clarity to main app

* feat: mask messages

* fix: spacing
---
 .env.example                                        |  3 +++
 .../widgets/conversation/MessagesView.vue           |  2 ++
 app/views/layouts/vueapp.html.erb                   | 13 +++++++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 70bf5d588..f405ea03d 100644
--- a/.env.example
+++ b/.env.example
@@ -173,6 +173,9 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## LogRocket
 # LOG_ROCKET_PROJECT_ID=xxxxx/some-project
 
+# MICROSOFT CLARITY
+# MS_CLARITY_TOKEN=xxxxxxxxx
+
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 7fb349c18..23ebdc23e 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -36,6 +36,7 @@
         v-for="message in getReadMessages"
         :key="message.id"
         class="message--read ph-no-capture"
+        data-clarity-mask="True"
         :data="message"
         :is-a-tweet="isATweet"
         :is-a-whatsapp-channel="isAWhatsAppChannel"
@@ -56,6 +57,7 @@
         v-for="message in getUnReadMessages"
         :key="message.id"
         class="message--unread ph-no-capture"
+        data-clarity-mask="True"
         :data="message"
         :is-a-tweet="isATweet"
         :is-a-whatsapp-channel="isAWhatsAppChannel"
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index eba020c8b..32ab67e80 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -50,8 +50,8 @@
       window.browserConfig = {
         browser_name: '<%= browser.name %>',
       }
-      window.errorLoggingConfig = '<%= ENV.fetch('SENTRY_DSN', '')%>'
-      window.logRocketProjectId = '<%= ENV.fetch('LOG_ROCKET_PROJECT_ID', '')%>'
+      window.errorLoggingConfig = '<%= ENV.fetch('SENTRY_DSN', '') %>'
+      window.logRocketProjectId = '<%= ENV.fetch('LOG_ROCKET_PROJECT_ID', '') %>'
     </script>
     <% if @global_config['ANALYTICS_TOKEN'].present? %>
     <script>
@@ -84,5 +84,14 @@
       })(document,"script");
     </script>
     <% end %>
+    <% if ENV.fetch('MS_CLARITY_TOKEN', nil).present? %>
+      <script type="text/javascript">
+          (function(c,l,a,r,i,t,y){
+              c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
+              t=l.createElement(r);t.async=1;t.src='https://www.clarity.ms/tag/'+i;
+              y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+          })(window, document, 'clarity', 'script', '<%= ENV.fetch('MS_CLARITY_TOKEN', '') %>');
+      </script>
+    <% end %>
   </body>
 </html>

From 2764338453759adacfc648a2940ce638d874d5cf Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 23 May 2023 09:37:40 +0530
Subject: [PATCH 26/93] fix: Fixes wrong copy being sent to users via email
 invite [cw-1290] (#7159)

* fix: Fixes invite email copy

* fix: Fixes wrong copy being sent to users via email invite
---
 app/views/devise/mailer/confirmation_instructions.html.erb | 4 +++-
 spec/mailers/confirmation_instructions_spec.rb             | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index ef94788a2..4a3b450a3 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -9,9 +9,11 @@
 <% if @resource.confirmed? %>
   <p>You can login to your <%= global_config['BRAND_NAME'] || 'Chatwoot' %> account through the link below:</p>
 <% else %>
+  <% if account_user&.inviter.blank? %>
   <p>
     Welcome to <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! We have a suite of powerful tools ready for you to explore. Before that we quickly need to verify your email address to know it's really you.
   </p>
+  <% end %>
   <p>Please take a moment and click the link below and activate your account.</p>
 <% end %>
 
@@ -24,4 +26,4 @@
   <p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
 <% else %>
   <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/spec/mailers/confirmation_instructions_spec.rb b/spec/mailers/confirmation_instructions_spec.rb
index 8c66c4fea..7c6fd8e6c 100644
--- a/spec/mailers/confirmation_instructions_spec.rb
+++ b/spec/mailers/confirmation_instructions_spec.rb
@@ -27,6 +27,7 @@ RSpec.describe 'Confirmation Instructions' do
 
     it 'does not refer to the inviter and their account' do
       expect(mail.body).to_not match('has invited you to try out Chatwoot!')
+      expect(mail.body).to match('We have a suite of powerful tools ready for you to explore.')
     end
 
     it 'sends a confirmation link' do
@@ -41,6 +42,7 @@ RSpec.describe 'Confirmation Instructions' do
         expect(mail.body).to match(
           "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot."
         )
+        expect(mail.body).not_to match('We have a suite of powerful tools ready for you to explore.')
       end
 
       it 'sends a password reset link' do

From 9c6c19c3e5a971598581ca98e381cb1f95aa6481 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 23 May 2023 16:47:04 +0530
Subject: [PATCH 27/93] fix: CSAT filter metrics rendering & conversation
 reports not working [CW-1840, CW-1818] (#7170)

* fix: emoji rendering for CSAT

* feat: add tests for CSAT Metrics

* fix: allow rating in metrics

* refactor: hide satisfaction score & total response chart if rating filter is enabled

* refactor: optional chaining in group by

* fix: spacing using autofill

* test: update csat metrics tests

* test: CSAT metric card
---
 app/javascript/dashboard/api/csatReports.js   |  4 +-
 .../settings/reports/CsatResponses.vue        |  2 +-
 .../dashboard/settings/reports/Index.vue      |  8 +--
 .../reports/components/CsatMetricCard.vue     | 18 +++++-
 .../reports/components/CsatMetrics.vue        | 22 ++++++-
 .../reports/components/FilterSelector.vue     |  2 +-
 .../components/specs/CSATMetrics.spec.js      | 64 +++++++++++++++++++
 .../components/specs/CsatMetricCard.spec.js   | 46 +++++++++++++
 .../__snapshots__/CSATMetrics.spec.js.snap    | 10 +++
 9 files changed, 164 insertions(+), 12 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CSATMetrics.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CsatMetricCard.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap

diff --git a/app/javascript/dashboard/api/csatReports.js b/app/javascript/dashboard/api/csatReports.js
index 46d5decd4..2d3ce12e5 100644
--- a/app/javascript/dashboard/api/csatReports.js
+++ b/app/javascript/dashboard/api/csatReports.js
@@ -35,10 +35,10 @@ class CSATReportsAPI extends ApiClient {
     });
   }
 
-  getMetrics({ from, to, user_ids, inbox_id, team_id } = {}) {
+  getMetrics({ from, to, user_ids, inbox_id, team_id, rating } = {}) {
     // no ratings for metrics
     return axios.get(`${this.url}/metrics`, {
-      params: { since: from, until: to, user_ids, inbox_id, team_id },
+      params: { since: from, until: to, user_ids, inbox_id, team_id, rating },
     });
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
index 501dc5a7c..7d29fc8d9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
@@ -16,7 +16,7 @@
     >
       {{ $t('CSAT_REPORTS.DOWNLOAD') }}
     </woot-button>
-    <csat-metrics />
+    <csat-metrics :filters="requestPayload" />
     <csat-table :page-index="pageIndex" @page-change="onPageNumberChange" />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index 0d9d00003..d38e983a7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -92,7 +92,7 @@ export default {
       }
       if (!this.accountReport.data.length) return {};
       const labels = this.accountReport.data.map(element => {
-        if (this.groupBy.period === GROUP_BY_FILTER[2].period) {
+        if (this.groupBy?.period === GROUP_BY_FILTER[2].period) {
           let week_date = new Date(fromUnixTime(element.timestamp));
           const first_day = week_date.getDate() - week_date.getDay();
           const last_day = first_day + 6;
@@ -105,10 +105,10 @@ export default {
             'dd/MM/yy'
           )}`;
         }
-        if (this.groupBy.period === GROUP_BY_FILTER[3].period) {
+        if (this.groupBy?.period === GROUP_BY_FILTER[3].period) {
           return format(fromUnixTime(element.timestamp), 'MMM-yyyy');
         }
-        if (this.groupBy.period === GROUP_BY_FILTER[4].period) {
+        if (this.groupBy?.period === GROUP_BY_FILTER[4].period) {
           return format(fromUnixTime(element.timestamp), 'yyyy');
         }
         return format(fromUnixTime(element.timestamp), 'dd-MMM-yyyy');
@@ -213,7 +213,7 @@ export default {
       return {
         from,
         to,
-        groupBy: groupBy.period,
+        groupBy: groupBy?.period,
         businessHours,
       };
     },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
index 1846d1549..7bee6765f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="medium-2 small-6 csat--metric-card">
+  <div
+    class="medium-2 small-6 csat--metric-card"
+    :class="{
+      disabled: disabled,
+    }"
+  >
     <h3 class="heading">
       <span>{{ label }}</span>
       <fluent-icon
@@ -29,6 +34,10 @@ export default {
       type: String,
       required: true,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
 };
 </script>
@@ -37,6 +46,13 @@ export default {
   margin: 0;
   padding: var(--space-normal);
 
+  &.disabled {
+    // grayscale everything
+    filter: grayscale(100%);
+    opacity: 0.3;
+    pointer-events: none;
+  }
+
   .heading {
     align-items: center;
     color: var(--color-heading);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index b1e03636c..ab70471a5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -6,16 +6,20 @@
       :value="responseCount"
     />
     <csat-metric-card
+      :disabled="ratingFilterEnabled"
       :label="$t('CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP')"
-      :value="formatToPercent(satisfactionScore)"
+      :value="ratingFilterEnabled ? '--' : formatToPercent(satisfactionScore)"
     />
     <csat-metric-card
       :label="$t('CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP')"
       :value="formatToPercent(responseRate)"
     />
-    <div v-if="metrics.totalResponseCount" class="medium-6 report-card">
+    <div
+      v-if="metrics.totalResponseCount && !ratingFilterEnabled"
+      class="medium-6 report-card"
+    >
       <h3 class="heading">
         <div class="emoji--distribution">
           <div
@@ -24,7 +28,7 @@
             class="emoji--distribution-item"
           >
             <span class="emoji--distribution-key">{{
-              csatRatings[key - 1].emoji
+              ratingToEmoji(key)
             }}</span>
             <span>{{ formatToPercent(rating) }}</span>
           </div>
@@ -45,6 +49,12 @@ export default {
   components: {
     CsatMetricCard,
   },
+  props: {
+    filters: {
+      type: Object,
+      required: true,
+    },
+  },
   data() {
     return {
       csatRatings: CSAT_RATINGS,
@@ -57,6 +67,9 @@ export default {
       satisfactionScore: 'csat/getSatisfactionScore',
       responseRate: 'csat/getResponseRate',
     }),
+    ratingFilterEnabled() {
+      return Boolean(this.filters.rating);
+    },
     chartData() {
       return {
         labels: ['Rating'],
@@ -77,6 +90,9 @@ export default {
     formatToPercent(value) {
       return value ? `${value}%` : '--';
     },
+    ratingToEmoji(value) {
+      return CSAT_RATINGS.find(rating => rating.value === Number(value)).emoji;
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
index 62ea95b70..b0e032c0a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
@@ -231,7 +231,7 @@ export default {
 <style scoped>
 .filter-container {
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
   grid-gap: var(--space-slab);
 
   margin-bottom: var(--space-normal);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CSATMetrics.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CSATMetrics.spec.js
new file mode 100644
index 000000000..90578153d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CSATMetrics.spec.js
@@ -0,0 +1,64 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import CsatMetrics from '../CsatMetrics.vue';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+const mountParams = {
+  mocks: {
+    $t: msg => msg,
+  },
+  stubs: ['csat-metric-card', 'woot-horizontal-bar'],
+};
+
+describe('CsatMetrics.vue', () => {
+  let getters;
+  let store;
+  let wrapper;
+  const filters = { rating: 3 };
+
+  beforeEach(() => {
+    getters = {
+      'csat/getMetrics': () => ({ totalResponseCount: 100 }),
+      'csat/getRatingPercentage': () => ({ 1: 10, 2: 20, 3: 30, 4: 30, 5: 10 }),
+      'csat/getSatisfactionScore': () => 85,
+      'csat/getResponseRate': () => 90,
+    };
+
+    store = new Vuex.Store({
+      getters,
+    });
+
+    wrapper = shallowMount(CsatMetrics, {
+      store,
+      localVue,
+      propsData: { filters },
+      ...mountParams,
+    });
+  });
+
+  it('computes response count correctly', () => {
+    expect(wrapper.vm.responseCount).toBe('100');
+    expect(wrapper.html()).toMatchSnapshot();
+  });
+
+  it('formats values to percent correctly', () => {
+    expect(wrapper.vm.formatToPercent(85)).toBe('85%');
+    expect(wrapper.vm.formatToPercent(null)).toBe('--');
+  });
+
+  it('maps rating value to emoji correctly', () => {
+    const rating = wrapper.vm.csatRatings[0]; // assuming this is { value: 1, emoji: '😡' }
+    expect(wrapper.vm.ratingToEmoji(rating.value)).toBe(rating.emoji);
+  });
+
+  it('hides report card if rating filter is enabled', () => {
+    expect(wrapper.find('.report-card').exists()).toBe(false);
+  });
+
+  it('shows report card if rating filter is not enabled', async () => {
+    await wrapper.setProps({ filters: {} });
+    expect(wrapper.find('.report-card').exists()).toBe(true);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CsatMetricCard.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CsatMetricCard.spec.js
new file mode 100644
index 000000000..8c52d2e1a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CsatMetricCard.spec.js
@@ -0,0 +1,46 @@
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import CsatMetricCard from '../CsatMetricCard.vue';
+
+import VTooltip from 'v-tooltip';
+
+const localVue = createLocalVue();
+localVue.use(VTooltip);
+
+describe('CsatMetricCard.vue', () => {
+  it('renders props correctly', () => {
+    const label = 'Total Responses';
+    const value = '100';
+    const infoText = 'Total number of responses';
+    const wrapper = shallowMount(CsatMetricCard, {
+      propsData: { label, value, infoText },
+      localVue,
+      stubs: ['fluent-icon'],
+    });
+
+    expect(wrapper.find('.heading span').text()).toMatch(label);
+    expect(wrapper.find('.metric').text()).toMatch(value);
+    expect(wrapper.find('.csat--icon').classes()).toContain('has-tooltip');
+  });
+
+  it('adds disabled class when disabled prop is true', () => {
+    const wrapper = shallowMount(CsatMetricCard, {
+      propsData: { label: '', value: '', infoText: '', disabled: true },
+      localVue,
+      stubs: ['fluent-icon'],
+    });
+
+    expect(wrapper.find('.csat--metric-card').classes()).toContain('disabled');
+  });
+
+  it('does not add disabled class when disabled prop is false', () => {
+    const wrapper = shallowMount(CsatMetricCard, {
+      propsData: { label: '', value: '', infoText: '', disabled: false },
+      localVue,
+      stubs: ['fluent-icon'],
+    });
+
+    expect(wrapper.find('.csat--metric-card').classes()).not.toContain(
+      'disabled'
+    );
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
new file mode 100644
index 000000000..357d4dfa8
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CsatMetrics.vue computes response count correctly 1`] = `
+<div class="row csat--metrics-container">
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL" value="100" infotext="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP"></csat-metric-card-stub>
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL" value="--" infotext="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP" disabled="true"></csat-metric-card-stub>
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL" value="90%" infotext="CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP"></csat-metric-card-stub>
+  <!---->
+</div>
+`;

From 44b1047b905249f027ddc794c38ad440c92d1062 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 23 May 2023 17:22:47 +0530
Subject: [PATCH 28/93] feat(perf): contacts query performance (#7175)

* feat: use more indexable where condition

* feat: add index concurrently

* chore: update schema

* refactor: update index name
---
 app/models/contact.rb                                     | 3 ++-
 ...30523104139_add_partial_index_for_resolved_contacts.rb | 8 ++++++++
 db/schema.rb                                              | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20230523104139_add_partial_index_for_resolved_contacts.rb

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 96457996f..b13e3d60e 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -19,6 +19,7 @@
 #  index_contacts_on_account_id                          (account_id)
 #  index_contacts_on_lower_email_account_id              (lower((email)::text), account_id)
 #  index_contacts_on_name_email_phone_number_identifier  (name,email,phone_number,identifier) USING gin
+#  index_contacts_on_identifiable_fields                 (account_id,email,phone_number,identifier) WHERE (((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text)) # rubocop:disable Layout/LineLength
 #  index_contacts_on_phone_number_and_account_id         (phone_number,account_id)
 #  uniq_email_per_account_contact                        (email,account_id) UNIQUE
 #  uniq_identifier_per_account_contact                   (identifier,account_id) UNIQUE
@@ -136,7 +137,7 @@ class Contact < ApplicationRecord
   end
 
   def self.resolved_contacts
-    where("COALESCE(NULLIF(contacts.email,''),NULLIF(contacts.phone_number,''),NULLIF(contacts.identifier,'')) IS NOT NULL")
+    where("contacts.email <> '' OR contacts.phone_number <> '' OR contacts.identifier <> ''")
   end
 
   def discard_invalid_attrs
diff --git a/db/migrate/20230523104139_add_partial_index_for_resolved_contacts.rb b/db/migrate/20230523104139_add_partial_index_for_resolved_contacts.rb
new file mode 100644
index 000000000..6302ea106
--- /dev/null
+++ b/db/migrate/20230523104139_add_partial_index_for_resolved_contacts.rb
@@ -0,0 +1,8 @@
+class AddPartialIndexForResolvedContacts < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :contacts, [:account_id, :email, :phone_number, :identifier], where: "(email <> '' OR phone_number <> '' OR identifier <> '')",
+                                                                            name: 'index_contacts_on_nonempty_fields', algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 171e8e12b..5875dd977 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[7.0].define(version: 2023_05_15_051424) do
+ActiveRecord::Schema[7.0].define(version: 2023_05_23_104139) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -405,6 +405,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_15_051424) do
     t.jsonb "custom_attributes", default: {}
     t.datetime "last_activity_at", precision: nil
     t.index "lower((email)::text), account_id", name: "index_contacts_on_lower_email_account_id"
+    t.index ["account_id", "email", "phone_number", "identifier"], name: "index_contacts_on_nonempty_fields", where: "(((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))"
     t.index ["account_id"], name: "index_contacts_on_account_id"
     t.index ["email", "account_id"], name: "uniq_email_per_account_contact", unique: true
     t.index ["identifier", "account_id"], name: "uniq_identifier_per_account_contact", unique: true

From 4807052c3781a4b8bd454444665b601fcba91d2d Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 23 May 2023 20:39:15 +0530
Subject: [PATCH 29/93] doc: Swagger for conversation priority API (#7172)

---
 .../conversation/toggle_priority.yml          | 28 ++++++++
 swagger/paths/index.yml                       |  6 ++
 swagger/swagger.json                          | 67 +++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 swagger/paths/application/conversation/toggle_priority.yml

diff --git a/swagger/paths/application/conversation/toggle_priority.yml b/swagger/paths/application/conversation/toggle_priority.yml
new file mode 100644
index 000000000..22a80c891
--- /dev/null
+++ b/swagger/paths/application/conversation/toggle_priority.yml
@@ -0,0 +1,28 @@
+tags:
+  - Conversations
+operationId: toggle-priority-of-a-conversation
+summary: Toggle Priority
+description: Toggles the priority of conversation
+security:
+  - userApiKey: []
+  - agentBotApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      required:
+        - priority
+      properties:
+        priority:
+          type: string
+          enum:  ["urgent", "high", "medium", "low", "none"]
+          description: "The priority of the conversation"
+responses:
+  200:
+    description: Success
+  404:
+    description: Conversation not found
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 6a42fc37e..c3e0f9d51 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -267,6 +267,12 @@
     - $ref: '#/parameters/conversation_id'
   post:
     $ref: ./application/conversation/toggle_status.yml
+/api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_priority:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/conversation_id'
+  post:
+    $ref: ./application/conversation/toggle_priority.yml
 
 # Conversations Assignments
 
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 62a7d673e..5ae02e056 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2877,6 +2877,73 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_priority": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/conversation_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Conversations"
+        ],
+        "operationId": "toggle-priority-of-a-conversation",
+        "summary": "Toggle Priority",
+        "description": "Toggles the priority of conversation",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          },
+          {
+            "agentBotApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "priority"
+              ],
+              "properties": {
+                "priority": {
+                  "type": "string",
+                  "enum": [
+                    "urgent",
+                    "high",
+                    "medium",
+                    "low",
+                    "none"
+                  ],
+                  "description": "The priority of the conversation"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "404": {
+            "description": "Conversation not found"
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/assignments": {
       "parameters": [
         {

From 5618b5ebd364d3d0b60dbcce51cb72344ceaf355 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 24 May 2023 15:05:31 +0530
Subject: [PATCH 30/93] fix: Enable `ogg` format for audio recording in API
 channel (#7178)

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

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 1c6f4f796..e72a38c5c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -501,7 +501,7 @@ export default {
       return `draft-${this.conversationIdByRoute}-${this.replyType}`;
     },
     audioRecordFormat() {
-      if (this.isAWhatsAppChannel) {
+      if (this.isAWhatsAppChannel || this.isAPIInbox) {
         return AUDIO_FORMATS.OGG;
       }
       return AUDIO_FORMATS.WAV;

From bfaca851f1111d1b595a19170c3a8c3e3f70b772 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 24 May 2023 19:56:23 +0530
Subject: [PATCH 31/93] chore: Throttle conversation transcript endpoints
 (#7155)

- Throttle conversation transcripts to 20 per hour via rack attack

Fixes: https://linear.app/chatwoot/issue/CW-1630/throttle-transcript-endpoint
---
 config/initializers/rack_attack.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index f04ecaadb..5f1463db6 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -48,6 +48,10 @@ class Rack::Attack
 
   throttle('req/ip', limit: 300, period: 1.minute, &:ip)
 
+  ###-----------------------------------------------###
+  ###-----Authentication Related Throttling---------###
+  ###-----------------------------------------------###
+
   ### Prevent Brute-Force Super Admin Login Attacks ###
   throttle('super_admin_login/ip', limit: 5, period: 5.minutes) do |req|
     req.ip if req.path_without_extentions == '/super_admin/sign_in' && req.post?
@@ -95,6 +99,12 @@ class Rack::Attack
     req.ip if req.path_without_extentions == '/api/v1/accounts' && req.post?
   end
 
+  ##-----------------------------------------------##
+
+  ###-----------------------------------------------###
+  ###-----------Widget API Throttling---------------###
+  ###-----------------------------------------------###
+
   ## Prevent Conversation Bombing on Widget APIs ###
   throttle('api/v1/widget/conversations', limit: 6, period: 12.hours) do |req|
     req.ip if req.path_without_extentions == '/api/v1/widget/conversations' && req.post?
@@ -109,6 +119,20 @@ class Rack::Attack
   throttle('widget?website_token={website_token}&cw_conversation={x-auth-token}', limit: 5, period: 1.hour) do |req|
     req.ip if req.path_without_extentions == '/widget' && ActionDispatch::Request.new(req.env).params['cw_conversation'].blank?
   end
+
+  ##-----------------------------------------------##
+
+  ###-----------------------------------------------###
+  ###----------Application API Throttling-----------###
+  ###-----------------------------------------------###
+
+  ## Prevent Abuse of Converstion Transcript APIs ###
+  throttle('/api/v1/accounts/:account_id/conversations/:conversation_id/transcript', limit: 20, period: 1.hour) do |req|
+    match_data = %r{/api/v1/accounts/(?<account_id>\d+)/conversations/(?<conversation_id>\d+)/transcript}.match(req.path)
+    match_data[:account_id] if match_data.present?
+  end
+
+  ## ----------------------------------------------- ##
 end
 
 # Log blocked events

From 8e79cf72e11b5469b1dfd01a48b033c54d5b6d1d Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 24 May 2023 20:22:34 +0530
Subject: [PATCH 32/93] fix: issue with slack job (#7179)

---
 app/jobs/hook_job.rb                |  7 ++-----
 app/jobs/send_on_slack_job.rb       |  3 +--
 spec/jobs/hook_job_spec.rb          |  4 ++--
 spec/jobs/send_on_slack_job_spec.rb | 15 +++++++++------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/jobs/hook_job.rb b/app/jobs/hook_job.rb
index 15efa40f2..fe615980a 100644
--- a/app/jobs/hook_job.rb
+++ b/app/jobs/hook_job.rb
@@ -21,12 +21,9 @@ class HookJob < ApplicationJob
 
     message = event_data[:message]
     if message.attachments.blank?
-      ::SendOnSlackJob.perform_later(message: message,
-                                     hook: hook)
+      ::SendOnSlackJob.perform_later(message, hook)
     else
-      ::SendOnSlackJob.set(wait: 2.seconds).perform_later(
-        message: message, hook: hook
-      )
+      ::SendOnSlackJob.set(wait: 2.seconds).perform_later(message, hook)
     end
   end
 
diff --git a/app/jobs/send_on_slack_job.rb b/app/jobs/send_on_slack_job.rb
index 521510ff9..e9b84731b 100644
--- a/app/jobs/send_on_slack_job.rb
+++ b/app/jobs/send_on_slack_job.rb
@@ -1,8 +1,7 @@
 class SendOnSlackJob < ApplicationJob
   queue_as :medium
-  pattr_initialize [:message!, :hook!]
 
-  def perform
+  def perform(message, hook)
     Integrations::Slack::SendOnSlackService.new(message: message, hook: hook).perform
   end
 end
diff --git a/spec/jobs/hook_job_spec.rb b/spec/jobs/hook_job_spec.rb
index d3cd46223..2f9a6ba5c 100644
--- a/spec/jobs/hook_job_spec.rb
+++ b/spec/jobs/hook_job_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe HookJob do
     it 'calls SendOnSlackJob when its a slack hook' do
       hook = create(:integrations_hook, app_id: 'slack', account: account)
       allow(SendOnSlackJob).to receive(:perform_later).and_return(process_service)
-      expect(SendOnSlackJob).to receive(:perform_later).with(message: event_data[:message], hook: hook)
+      expect(SendOnSlackJob).to receive(:perform_later).with(event_data[:message], hook)
       described_class.perform_now(hook, event_name, event_data)
     end
 
@@ -34,7 +34,7 @@ RSpec.describe HookJob do
       hook = create(:integrations_hook, app_id: 'slack', account: account)
       allow(SendOnSlackJob).to receive(:set).with(wait: 2.seconds).and_return(SendOnSlackJob)
       allow(SendOnSlackJob).to receive(:perform_later).and_return(process_service)
-      expect(SendOnSlackJob).to receive(:perform_later).with(message: event_data[:message], hook: hook)
+      expect(SendOnSlackJob).to receive(:perform_later).with(event_data[:message], hook)
       described_class.perform_now(hook, event_name, event_data)
     end
 
diff --git a/spec/jobs/send_on_slack_job_spec.rb b/spec/jobs/send_on_slack_job_spec.rb
index 59f15a9b5..b7eec9487 100644
--- a/spec/jobs/send_on_slack_job_spec.rb
+++ b/spec/jobs/send_on_slack_job_spec.rb
@@ -11,22 +11,25 @@ RSpec.describe SendOnSlackJob do
     let(:process_service) { double }
 
     before do
+      stub_request(:post, 'https://slack.com/api/chat.postMessage')
       allow(process_service).to receive(:perform)
     end
 
     it 'calls Integrations::Slack::SendOnSlackService when its a slack hook' do
       hook = create(:integrations_hook, app_id: 'slack', account: account)
-      allow(Integrations::Slack::SendOnSlackService).to receive(:new).and_return(process_service)
-      expect(Integrations::Slack::SendOnSlackService).to receive(:new).with(message: event_data[:message], hook: hook)
-      described_class.perform_now(message: event_data[:message], hook: hook)
+      slack_service_instance = Integrations::Slack::SendOnSlackService.new(message: event_data[:message], hook: hook)
+      expect(Integrations::Slack::SendOnSlackService).to receive(:new).with(message: event_data[:message],
+                                                                            hook: hook).and_return(slack_service_instance)
+      described_class.perform_now(event_data[:message], hook)
     end
 
     it 'calls Integrations::Slack::SendOnSlackService when its a slack hook for template message' do
       event_data = { message: create(:message, account: account, message_type: :template) }
       hook = create(:integrations_hook, app_id: 'slack', account: account)
-      allow(Integrations::Slack::SendOnSlackService).to receive(:new).and_return(process_service)
-      expect(Integrations::Slack::SendOnSlackService).to receive(:new).with(message: event_data[:message], hook: hook)
-      described_class.perform_now(message: event_data[:message], hook: hook)
+      slack_service_instance = Integrations::Slack::SendOnSlackService.new(message: event_data[:message], hook: hook)
+      expect(Integrations::Slack::SendOnSlackService).to receive(:new).with(message: event_data[:message],
+                                                                            hook: hook).and_return(slack_service_instance)
+      described_class.perform_now(event_data[:message], hook)
     end
   end
 end

From 88cef88d80da44ec2783ceea7f6420c1aaf4fbb1 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 25 May 2023 12:20:42 +0530
Subject: [PATCH 33/93] fix: Instagram story with video not rendering (#7184)

* fix: instagram story with video not rendering

* chore: Minor fixes

---------

Co-authored-by: Tejaswini Chile <tejaswini@chatwoot.com>
---
 .../components/widgets/conversation/Message.vue    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 6f20cac7c..dd51ea838 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -25,10 +25,14 @@
         <blockquote v-if="storyReply" class="story-reply-quote">
           <span>{{ $t('CONVERSATION.REPLIED_TO_STORY') }}</span>
           <bubble-image
-            v-if="!hasStoryError"
+            v-if="!hasImgStoryError && storyUrl"
             :url="storyUrl"
             @error="onStoryLoadError"
           />
+          <bubble-video
+            v-else-if="hasImgStoryError && storyUrl"
+            :url="storyUrl"
+          />
         </blockquote>
         <bubble-text
           v-if="data.content"
@@ -200,7 +204,7 @@ export default {
       hasImageError: false,
       contextMenuPosition: {},
       showBackgroundHighlight: false,
-      hasStoryError: false,
+      hasImgStoryError: false,
     };
   },
   computed: {
@@ -429,12 +433,12 @@ export default {
   watch: {
     data() {
       this.hasImageError = false;
-      this.hasStoryError = false;
+      this.hasImgStoryError = false;
     },
   },
   mounted() {
     this.hasImageError = false;
-    this.hasStoryError = false;
+    this.hasImgStoryError = false;
     bus.$on(BUS_EVENTS.ON_MESSAGE_LIST_SCROLL, this.closeContextMenu);
     this.setupHighlightTimer();
   },
@@ -464,7 +468,7 @@ export default {
       this.hasImageError = true;
     },
     onStoryLoadError() {
-      this.hasStoryError = true;
+      this.hasImgStoryError = true;
     },
     openContextMenu(e) {
       const shouldSkipContextMenu =

From 123fc7339418693e93442e7082933d1dbc4b4702 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Thu, 25 May 2023 14:27:30 +0530
Subject: [PATCH 34/93] feat: add audit trail for sign_in and sign_out (#7158)

* feat: add audit_trail for sign_in event

* chore: ignore unrelated User model columns for auditing

* chore: fix prepend call for webhook/automation rule

* chore: add spec for sign_in event

* chore: refactor sign_in auditlog method to enterprise namespace

* feat: add sign_out audit trail

* feat: review comments
---
 Gemfile.lock                                  |  2 +-
 .../devise_overrides/sessions_controller.rb   |  2 +
 app/models/automation_rule.rb                 |  2 +-
 app/models/user.rb                            |  2 +
 app/models/webhook.rb                         |  2 +-
 .../devise_overrides/sessions_controller.rb   | 25 +++++++++
 .../app/models/enterprise/audit/user.rb       | 13 +++++
 .../session_controller_spec.rb                | 53 +++++++++++++++++++
 8 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 enterprise/app/controllers/enterprise/devise_overrides/sessions_controller.rb
 create mode 100644 enterprise/app/models/enterprise/audit/user.rb
 create mode 100644 spec/enterprise/controllers/enterprise/devise_overrides/session_controller_spec.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index bec62cc75..990d14bfb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -784,8 +784,8 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
-  arm64-darwin-22
   arm64-darwin-21
+  arm64-darwin-22
   ruby
   x86_64-darwin-18
   x86_64-darwin-20
diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index ace47a8b5..2659aeebf 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -37,3 +37,5 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
     @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
   end
 end
+
+DeviseOverrides::SessionsController.prepend_mod_with('DeviseOverrides::SessionsController')
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 0159ff846..7a9550bd3 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -77,4 +77,4 @@ class AutomationRule < ApplicationRecord
   end
 end
 
-AutomationRule.include_mod_with('Audit::Inbox')
+AutomationRule.include_mod_with('Audit::AutomationRule')
diff --git a/app/models/user.rb b/app/models/user.rb
index c50ab208e..6ff4fb61d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -166,3 +166,5 @@ class User < ApplicationRecord
     macros.personal.destroy_all
   end
 end
+
+User.include_mod_with('Audit::User')
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index f43c80548..4f0e32a43 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -38,4 +38,4 @@ class Webhook < ApplicationRecord
   end
 end
 
-Webhook.include_mod_with('Audit::Inbox')
+Webhook.include_mod_with('Audit::Webhook')
diff --git a/enterprise/app/controllers/enterprise/devise_overrides/sessions_controller.rb b/enterprise/app/controllers/enterprise/devise_overrides/sessions_controller.rb
new file mode 100644
index 000000000..e11e3fff9
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/devise_overrides/sessions_controller.rb
@@ -0,0 +1,25 @@
+module Enterprise::DeviseOverrides::SessionsController
+  def render_create_success
+    create_audit_event('sign_in')
+    super
+  end
+
+  def destroy
+    create_audit_event('sign_out')
+    super
+  end
+
+  def create_audit_event(action)
+    return unless @resource
+
+    associated_type = 'Account'
+    @resource.accounts.each do |account|
+      @resource.audits.create(
+        action: action,
+        user_id: @resource.id,
+        associated_id: account.id,
+        associated_type: associated_type
+      )
+    end
+  end
+end
diff --git a/enterprise/app/models/enterprise/audit/user.rb b/enterprise/app/models/enterprise/audit/user.rb
new file mode 100644
index 000000000..5d0276607
--- /dev/null
+++ b/enterprise/app/models/enterprise/audit/user.rb
@@ -0,0 +1,13 @@
+module Enterprise::Audit::User
+  extend ActiveSupport::Concern
+
+  included do
+    audited only: [
+      :availability,
+      :display_name,
+      :email,
+      :name
+    ]
+    audited associated_with: :account
+  end
+end
diff --git a/spec/enterprise/controllers/enterprise/devise_overrides/session_controller_spec.rb b/spec/enterprise/controllers/enterprise/devise_overrides/session_controller_spec.rb
new file mode 100644
index 000000000..89f8794ee
--- /dev/null
+++ b/spec/enterprise/controllers/enterprise/devise_overrides/session_controller_spec.rb
@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Audit API', type: :request do
+  let!(:account) { create(:account) }
+  let!(:user) { create(:user, password: 'Password1!', account: account) }
+
+  describe 'POST /sign_in' do
+    it 'creates a sign_in audit event wwith valid credentials' do
+      params = { email: user.email, password: 'Password1!' }
+
+      expect do
+        post new_user_session_url,
+             params: params,
+             as: :json
+      end.to change(Enterprise::AuditLog, :count).by(1)
+
+      expect(response).to have_http_status(:success)
+      expect(response.body).to include(user.email)
+
+      # Check if the sign_in event is created
+      user.reload
+      expect(user.audits.last.action).to eq('sign_in')
+      expect(user.audits.last.associated_id).to eq(account.id)
+      expect(user.audits.last.associated_type).to eq('Account')
+    end
+
+    it 'will not create a sign_in audit event with invalid credentials' do
+      params = { email: user.email, password: 'invalid' }
+      expect do
+        post new_user_session_url,
+             params: params,
+             as: :json
+      end.not_to change(Enterprise::AuditLog, :count)
+    end
+  end
+
+  describe 'DELETE /sign_out' do
+    context 'when it is an authenticated user' do
+      it 'signs out the user and creates an audit event' do
+        expect do
+          delete '/auth/sign_out', headers: user.create_new_auth_token
+        end.to change(Enterprise::AuditLog, :count).by(1)
+        expect(response).to have_http_status(:success)
+
+        user.reload
+
+        expect(user.audits.last.action).to eq('sign_out')
+        expect(user.audits.last.associated_id).to eq(account.id)
+        expect(user.audits.last.associated_type).to eq('Account')
+      end
+    end
+  end
+end

From 6bd0e074dc2a1ec91f7b8396da8cecc1eb9a2180 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 25 May 2023 14:49:56 +0530
Subject: [PATCH 35/93] feat: Sort agents on availability status (#7174)

---
 .../conversation/contextMenu/Index.vue        |  18 +-
 .../conversation/contextMenu/menuItem.vue     |   1 +
 app/javascript/dashboard/mixins/agentMixin.js |  63 ++++--
 .../dashboard/mixins/specs/agentFixtures.js   | 194 +++++++++++++++++-
 .../dashboard/mixins/specs/agentMixin.spec.js | 101 ++++++++-
 5 files changed, 354 insertions(+), 23 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
index ca7117cfc..643b2be03 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
@@ -79,6 +79,7 @@ import MenuItem from './menuItem.vue';
 import MenuItemWithSubmenu from './menuItemWithSubmenu.vue';
 import wootConstants from 'dashboard/constants/globals';
 import snoozeTimesMixin from 'dashboard/mixins/conversation/snoozeTimesMixin';
+import agentMixin from 'dashboard/mixins/agentMixin';
 import { mapGetters } from 'vuex';
 import AgentLoadingPlaceholder from './agentLoadingPlaceholder.vue';
 export default {
@@ -87,7 +88,7 @@ export default {
     MenuItemWithSubmenu,
     AgentLoadingPlaceholder,
   },
-  mixins: [snoozeTimesMixin],
+  mixins: [snoozeTimesMixin, agentMixin],
   props: {
     status: {
       type: String,
@@ -202,6 +203,16 @@ export default {
       teams: 'teams/getTeams',
       assignableAgentsUiFlags: 'inboxAssignableAgents/getUIFlags',
     }),
+    filteredAgentOnAvailability() {
+      const agents = this.$store.getters[
+        'inboxAssignableAgents/getAssignableAgents'
+      ](this.inboxId);
+      const agentsByUpdatedPresence = this.getAgentsByUpdatedPresence(agents);
+      const filteredAgents = this.sortedAgentsByAvailability(
+        agentsByUpdatedPresence
+      );
+      return filteredAgents;
+    },
     assignableAgents() {
       return [
         {
@@ -212,9 +223,7 @@ export default {
           account_id: 0,
           email: 'None',
         },
-        ...this.$store.getters['inboxAssignableAgents/getAssignableAgents'](
-          this.inboxId
-        ),
+        ...this.filteredAgentOnAvailability,
       ];
     },
   },
@@ -246,6 +255,7 @@ export default {
         ...(type === 'icon' && { icon: option.icon }),
         ...(type === 'label' && { color: option.color }),
         ...(type === 'agent' && { thumbnail: option.thumbnail }),
+        ...(type === 'agent' && { status: option.availability_status }),
         ...(type === 'text' && { label: option.label }),
         ...(type === 'label' && { label: option.title }),
         ...(type === 'agent' && { label: option.name }),
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
index a2fc5eb7c..670d5a61a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
@@ -15,6 +15,7 @@
       v-if="variant === 'agent'"
       :username="option.label"
       :src="option.thumbnail"
+      :status="option.status"
       size="20px"
       class="agent-thumbnail"
     />
diff --git a/app/javascript/dashboard/mixins/agentMixin.js b/app/javascript/dashboard/mixins/agentMixin.js
index 14c5bb043..1b3545a62 100644
--- a/app/javascript/dashboard/mixins/agentMixin.js
+++ b/app/javascript/dashboard/mixins/agentMixin.js
@@ -2,39 +2,68 @@ import { mapGetters } from 'vuex';
 
 export default {
   computed: {
+    ...mapGetters({
+      currentUser: 'getCurrentUser',
+      currentAccountId: 'getCurrentAccountId',
+    }),
     assignableAgents() {
       return this.$store.getters['inboxAssignableAgents/getAssignableAgents'](
         this.inboxId
       );
     },
-    ...mapGetters({ currentUser: 'getCurrentUser' }),
     isAgentSelected() {
       return this.currentChat?.meta?.assignee;
     },
+    createNoneAgent() {
+      return {
+        confirmed: true,
+        name: 'None',
+        id: 0,
+        role: 'agent',
+        account_id: 0,
+        email: 'None',
+      };
+    },
     agentsList() {
       const agents = this.assignableAgents || [];
-      return [
-        ...(this.isAgentSelected
-          ? [
-              {
-                confirmed: true,
-                name: 'None',
-                id: 0,
-                role: 'agent',
-                account_id: 0,
-                email: 'None',
-              },
-            ]
-          : []),
-        ...agents,
-      ].map(item =>
+      const agentsByUpdatedPresence = this.getAgentsByUpdatedPresence(agents);
+      const none = this.createNoneAgent;
+      const filteredAgentsByAvailability = this.sortedAgentsByAvailability(
+        agentsByUpdatedPresence
+      );
+      const filteredAgents = [
+        ...(this.isAgentSelected ? [none] : []),
+        ...filteredAgentsByAvailability,
+      ];
+      return filteredAgents;
+    },
+  },
+  methods: {
+    getAgentsByAvailability(agents, availability) {
+      return agents
+        .filter(agent => agent.availability_status === availability)
+        .sort((a, b) => a.name.localeCompare(b.name));
+    },
+    sortedAgentsByAvailability(agents) {
+      const onlineAgents = this.getAgentsByAvailability(agents, 'online');
+      const busyAgents = this.getAgentsByAvailability(agents, 'busy');
+      const offlineAgents = this.getAgentsByAvailability(agents, 'offline');
+      const filteredAgents = [...onlineAgents, ...busyAgents, ...offlineAgents];
+      return filteredAgents;
+    },
+    getAgentsByUpdatedPresence(agents) {
+      // Here we are updating the availability status of the current user dynamically (live) based on the current account availability status
+      const agentsWithDynamicPresenceUpdate = agents.map(item =>
         item.id === this.currentUser.id
           ? {
               ...item,
-              availability_status: this.currentUser.availability_status,
+              availability_status: this.currentUser.accounts.find(
+                account => account.id === this.currentAccountId
+              ).availability_status,
             }
           : item
       );
+      return agentsWithDynamicPresenceUpdate;
     },
   },
 };
diff --git a/app/javascript/dashboard/mixins/specs/agentFixtures.js b/app/javascript/dashboard/mixins/specs/agentFixtures.js
index 1c45b6034..58c360ed1 100644
--- a/app/javascript/dashboard/mixins/specs/agentFixtures.js
+++ b/app/javascript/dashboard/mixins/specs/agentFixtures.js
@@ -20,6 +20,36 @@ export default {
       name: 'Samuel Keta',
       role: 'agent',
     },
+    {
+      account_id: 1,
+      availability_status: 'offline',
+      available_name: 'James K',
+      confirmed: true,
+      email: 'james@chatwoot.com',
+      id: 3,
+      name: 'James Koti',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'busy',
+      available_name: 'Honey',
+      confirmed: true,
+      email: 'bee@chatwoot.com',
+      id: 4,
+      name: 'Honey Bee',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'online',
+      available_name: 'Abraham',
+      confirmed: true,
+      email: 'abraham@chatwoot.com',
+      id: 5,
+      name: 'Abraham Keta',
+      role: 'agent',
+    },
   ],
   formattedAgents: [
     {
@@ -32,7 +62,17 @@ export default {
     },
     {
       account_id: 1,
-      availability_status: 'busy',
+      availability_status: 'online',
+      available_name: 'Abraham',
+      confirmed: true,
+      email: 'abraham@chatwoot.com',
+      id: 5,
+      name: 'Abraham Keta',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'online',
       available_name: 'John K',
       confirmed: true,
       email: 'john@chatwoot.com',
@@ -40,6 +80,70 @@ export default {
       name: 'John Kennady',
       role: 'administrator',
     },
+    {
+      account_id: 1,
+      availability_status: 'busy',
+      available_name: 'Honey',
+      confirmed: true,
+      email: 'bee@chatwoot.com',
+      id: 4,
+      name: 'Honey Bee',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'busy',
+      available_name: 'Samuel K',
+      confirmed: true,
+      email: 'samuel@chatwoot.com',
+      id: 2,
+      name: 'Samuel Keta',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'offline',
+      available_name: 'James K',
+      confirmed: true,
+      email: 'james@chatwoot.com',
+      id: 3,
+      name: 'James Koti',
+      role: 'agent',
+    },
+  ],
+  onlineAgents: [
+    {
+      account_id: 1,
+      availability_status: 'online',
+      available_name: 'Abraham',
+      confirmed: true,
+      email: 'abraham@chatwoot.com',
+      id: 5,
+      name: 'Abraham Keta',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'online',
+      available_name: 'John K',
+      confirmed: true,
+      email: 'john@chatwoot.com',
+      id: 1,
+      name: 'John Kennady',
+      role: 'administrator',
+    },
+  ],
+  busyAgents: [
+    {
+      account_id: 1,
+      availability_status: 'busy',
+      available_name: 'Honey',
+      confirmed: true,
+      email: 'bee@chatwoot.com',
+      id: 4,
+      name: 'Honey Bee',
+      role: 'agent',
+    },
     {
       account_id: 1,
       availability_status: 'busy',
@@ -51,4 +155,92 @@ export default {
       role: 'agent',
     },
   ],
+  offlineAgents: [
+    {
+      account_id: 1,
+      availability_status: 'offline',
+      available_name: 'James K',
+      confirmed: true,
+      email: 'james@chatwoot.com',
+      id: 3,
+      name: 'James Koti',
+      role: 'agent',
+    },
+  ],
+  sortedByAvailability: [
+    {
+      account_id: 1,
+      availability_status: 'online',
+      available_name: 'Abraham',
+      confirmed: true,
+      email: 'abraham@chatwoot.com',
+      id: 5,
+      name: 'Abraham Keta',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'online',
+      available_name: 'John K',
+      confirmed: true,
+      email: 'john@chatwoot.com',
+      id: 1,
+      name: 'John Kennady',
+      role: 'administrator',
+    },
+    {
+      account_id: 1,
+      availability_status: 'busy',
+      available_name: 'Honey',
+      confirmed: true,
+      email: 'bee@chatwoot.com',
+      id: 4,
+      name: 'Honey Bee',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'busy',
+      available_name: 'Samuel K',
+      confirmed: true,
+      email: 'samuel@chatwoot.com',
+      id: 2,
+      name: 'Samuel Keta',
+      role: 'agent',
+    },
+    {
+      account_id: 1,
+      availability_status: 'offline',
+      available_name: 'James K',
+      confirmed: true,
+      email: 'james@chatwoot.com',
+      id: 3,
+      name: 'James Koti',
+      role: 'agent',
+    },
+  ],
+  formattedAgentsByPresenceOnline: [
+    {
+      account_id: 1,
+      availability_status: 'online',
+      available_name: 'Abraham',
+      confirmed: true,
+      email: 'abr@chatwoot.com',
+      id: 1,
+      name: 'Abraham Keta',
+      role: 'agent',
+    },
+  ],
+  formattedAgentsByPresenceOffline: [
+    {
+      account_id: 1,
+      availability_status: 'offline',
+      available_name: 'Abraham',
+      confirmed: true,
+      email: 'abr@chatwoot.com',
+      id: 1,
+      name: 'Abraham Keta',
+      role: 'agent',
+    },
+  ],
 };
diff --git a/app/javascript/dashboard/mixins/specs/agentMixin.spec.js b/app/javascript/dashboard/mixins/specs/agentMixin.spec.js
index 7cd2ad0db..f92f48555 100644
--- a/app/javascript/dashboard/mixins/specs/agentMixin.spec.js
+++ b/app/javascript/dashboard/mixins/specs/agentMixin.spec.js
@@ -12,12 +12,71 @@ describe('agentMixin', () => {
     getters = {
       getCurrentUser: () => ({
         id: 1,
-        availability_status: 'busy',
+        accounts: [
+          {
+            id: 1,
+            availability_status: 'online',
+            auto_offline: false,
+          },
+        ],
       }),
+      getCurrentAccountId: () => 1,
     };
     store = new Vuex.Store({ getters });
   });
 
+  it('return agents by availability', () => {
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [agentMixin],
+      data() {
+        return {
+          inboxId: 1,
+          currentChat: { meta: { assignee: { name: 'John' } } },
+        };
+      },
+      computed: {
+        assignableAgents() {
+          return agentFixtures.allAgents;
+        },
+      },
+    };
+    const wrapper = shallowMount(Component, { store, localVue });
+    expect(
+      wrapper.vm.getAgentsByAvailability(agentFixtures.allAgents, 'online')
+    ).toEqual(agentFixtures.onlineAgents);
+    expect(
+      wrapper.vm.getAgentsByAvailability(agentFixtures.allAgents, 'busy')
+    ).toEqual(agentFixtures.busyAgents);
+    expect(
+      wrapper.vm.getAgentsByAvailability(agentFixtures.allAgents, 'offline')
+    ).toEqual(agentFixtures.offlineAgents);
+  });
+
+  it('return sorted agents by availability', () => {
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [agentMixin],
+      data() {
+        return {
+          inboxId: 1,
+          currentChat: { meta: { assignee: { name: 'John' } } },
+        };
+      },
+      computed: {
+        assignableAgents() {
+          return agentFixtures.allAgents;
+        },
+      },
+    };
+    const wrapper = shallowMount(Component, { store, localVue });
+    expect(
+      wrapper.vm.sortedAgentsByAvailability(agentFixtures.allAgents)
+    ).toEqual(agentFixtures.sortedByAvailability);
+  });
+
   it('return formatted agents', () => {
     const Component = {
       render() {},
@@ -38,4 +97,44 @@ describe('agentMixin', () => {
     const wrapper = shallowMount(Component, { store, localVue });
     expect(wrapper.vm.agentsList).toEqual(agentFixtures.formattedAgents);
   });
+
+  it('return formatted agents by presence', () => {
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [agentMixin],
+      data() {
+        return {
+          inboxId: 1,
+          currentChat: { meta: { assignee: { name: 'John' } } },
+        };
+      },
+      computed: {
+        currentUser() {
+          return {
+            id: 1,
+            accounts: [
+              {
+                id: 1,
+                availability_status: 'offline',
+                auto_offline: false,
+              },
+            ],
+          };
+        },
+        currentAccountId() {
+          return 1;
+        },
+        assignableAgents() {
+          return agentFixtures.allAgents;
+        },
+      },
+    };
+    const wrapper = shallowMount(Component, { store, localVue });
+    expect(
+      wrapper.vm.getAgentsByUpdatedPresence(
+        agentFixtures.formattedAgentsByPresenceOnline
+      )
+    ).toEqual(agentFixtures.formattedAgentsByPresenceOffline);
+  });
 });

From 2c85098698f06d2fd705646616ee39cff79a41c2 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 25 May 2023 18:18:56 +0530
Subject: [PATCH 36/93]  fix: Mentions in assigned/participation
 notification(#7185)

---
 app/models/notification.rb       |  2 +-
 spec/models/notification_spec.rb | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index eadb48032..8fad75618 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -101,7 +101,7 @@ class Notification < ApplicationRecord
       I18n.t(
         'notifications.notification_title.assigned_conversation_new_message',
         display_id: conversation.display_id,
-        content: primary_actor&.content&.truncate_words(10)
+        content: transform_user_mention_content(primary_actor&.content&.truncate_words(10))
       )
     when 'conversation_mention'
       "[##{conversation&.display_id}] #{transform_user_mention_content primary_actor&.content}"
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 15894d2d7..71a6209ad 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -59,6 +59,32 @@ RSpec.describe Notification do
 #{message.content.truncate_words(10)}"
     end
 
+    it 'returns appropriate title suited for the notification type participating_conversation_new_message having mention' do
+      message = create(:message, sender: create(:user), content: 'Hey [@John](mention://user/1/john), can you check this ticket?')
+      notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: message,
+                                           secondary_actor: message.sender)
+
+      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} Hey @John, can you check this ticket?"
+    end
+
+    it 'returns appropriate title suited for the notification type participating_conversation_new_message having multple mention' do
+      message = create(:message, sender: create(:user),
+                                 content: 'Hey [@John](mention://user/1/john), [@Alisha Peter](mention://user/2/alisha) can you check this ticket?')
+      notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: message,
+                                           secondary_actor: message.sender)
+
+      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} \
+Hey @John, @Alisha Peter can you check this ticket?"
+    end
+
+    it 'returns appropriate title suited for the notification type participating_conversation_new_message if username contains white space' do
+      message = create(:message, sender: create(:user), content: 'Hey [@John Peter](mention://user/1/john%20K) please check this?')
+      notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: message,
+                                           secondary_actor: message.sender)
+
+      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} Hey @John Peter please check this?"
+    end
+
     it 'returns appropriate title suited for the notification type conversation_mention' do
       message = create(:message, sender: create(:user), content: 'Hey [@John](mention://user/1/john), can you check this ticket?')
       notification = create(:notification, notification_type: 'conversation_mention', primary_actor: message, secondary_actor: message.sender)

From 776ea6d39afd4a3f4c50c34613109f279d76266a Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 25 May 2023 18:50:00 +0530
Subject: [PATCH 37/93] fix: Help center api doc (#7189)

---
 swagger/definitions/index.yml                 |  18 +
 .../portal/article_create_update_payload.yml  |  34 ++
 .../portal/category_create_update_payload.yml |  28 +
 .../portal/portal_create_update_payload.yml   |  36 ++
 swagger/definitions/resource/article.yml      |  33 ++
 swagger/definitions/resource/category.yml     |  25 +
 swagger/definitions/resource/portal.yml       |  34 ++
 swagger/index.yml                             |   1 +
 swagger/parameters/portal_id.yml              |   5 +
 swagger/paths/application/article/create.yml  |  20 +
 swagger/paths/application/category/create.yml |  20 +
 swagger/paths/application/portal/create.yml   |  20 +
 swagger/paths/application/portal/index.yml    |  19 +
 swagger/paths/application/portal/update.yml   |  20 +
 swagger/paths/index.yml                       |  29 +
 swagger/swagger.json                          | 508 +++++++++++++++++-
 16 files changed, 849 insertions(+), 1 deletion(-)
 create mode 100644 swagger/definitions/request/portal/article_create_update_payload.yml
 create mode 100644 swagger/definitions/request/portal/category_create_update_payload.yml
 create mode 100644 swagger/definitions/request/portal/portal_create_update_payload.yml
 create mode 100644 swagger/definitions/resource/article.yml
 create mode 100644 swagger/definitions/resource/category.yml
 create mode 100644 swagger/definitions/resource/portal.yml
 create mode 100644 swagger/parameters/portal_id.yml
 create mode 100644 swagger/paths/application/article/create.yml
 create mode 100644 swagger/paths/application/category/create.yml
 create mode 100644 swagger/paths/application/portal/create.yml
 create mode 100644 swagger/paths/application/portal/index.yml
 create mode 100644 swagger/paths/application/portal/update.yml

diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index 3f70db3f9..ccc288180 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -18,6 +18,16 @@ custom_attribute:
   $ref: ./resource/custom_attribute.yml
 automation_rule:
   $ref: ./resource/automation_rule.yml
+portal:
+  $ref: ./resource/portal.yml
+category:
+  $ref: ./resource/category.yml
+article:
+  $ref: ./resource/article.yml
+category:
+  $ref: ./resource/category.yml
+article:
+  $ref: ./resource/article.yml
 contact:
   $ref: ./resource/contact.yml
 conversation:
@@ -110,6 +120,14 @@ integrations_hook_update_payload:
 automation_rule_create_update_payload:
   $ref: ./request/automation_rule/create_update_payload.yml
 
+# Help Center
+portal_create_update_payload:
+  $ref: ./request/portal/portal_create_update_payload.yml
+category_create_update_payload:
+  $ref: ./request/portal/category_create_update_payload.yml
+article_create_update_payload:
+  $ref: ./request/portal/article_create_update_payload.yml
+
 
 ## public requests
 public_contact_create_update_payload:
diff --git a/swagger/definitions/request/portal/article_create_update_payload.yml b/swagger/definitions/request/portal/article_create_update_payload.yml
new file mode 100644
index 000000000..cddac1d1d
--- /dev/null
+++ b/swagger/definitions/request/portal/article_create_update_payload.yml
@@ -0,0 +1,34 @@
+type: object
+properties:
+  content:
+    type: string
+    description: The text content.
+  meta:
+    type: object
+    description: Use for search
+    example: { tags: ['article_name'],  title: 'article title', description: 'article description' }
+  position:
+    type: integer
+    description: article position in category
+  status:
+    type: integer
+    example: ['draft', 'published', 'archived']
+  title:
+    type: string
+  slug:
+    type: string
+  views:
+    type: integer
+  portal_id:
+    type: integer
+  account_id:
+    type: integer
+  author_id:
+    type: integer
+  category_id:
+    type: integer
+  folder_id:
+    type: integer
+  associated_article_id:
+    type: integer
+    description: To associate similar articles to each other, e.g to provide the link for the reference.
diff --git a/swagger/definitions/request/portal/category_create_update_payload.yml b/swagger/definitions/request/portal/category_create_update_payload.yml
new file mode 100644
index 000000000..0d1ce5c8f
--- /dev/null
+++ b/swagger/definitions/request/portal/category_create_update_payload.yml
@@ -0,0 +1,28 @@
+type: object
+properties:
+  description:
+    type: string
+    description: Category description
+  locale:
+    type: string
+    description: Category locale
+    example: en/es
+  name:
+    type: string
+    description: Category name
+  slug:
+    type: string
+    description: Category slug
+  position:
+    type: integer
+    description: Category position in the portal list to sort
+  portal_id:
+    type: integer
+  account_id:
+    type: integer
+  associated_category_id:
+    type: integer
+    description: To associate similar categories to each other, e.g same category of product documentation in different languages
+  parent_category_id:
+    type: integer
+    description: To define parent category, e.g product documentation has multiple level features in sales category or in engineering category.
diff --git a/swagger/definitions/request/portal/portal_create_update_payload.yml b/swagger/definitions/request/portal/portal_create_update_payload.yml
new file mode 100644
index 000000000..d1e82aaf4
--- /dev/null
+++ b/swagger/definitions/request/portal/portal_create_update_payload.yml
@@ -0,0 +1,36 @@
+type: object
+properties:
+  archived:
+    type: boolean
+    description: Status to check if portal is live
+  color:
+    type: string
+    description: Header color for help-center
+    example: add color HEX string, "#fffff"
+  config:
+    type: object
+    description: Configuration about supporting locales
+    example: { allowed_locales: ['en', 'es'], default_locale: 'en' }
+  custom_domain:
+    type: string
+    description: Custom domain to  display help center.
+    example: https://chatwoot.help/.
+  header_text:
+    type: string
+    description: Help center header
+    example: Handbook
+  homepage_link:
+    type: string
+    description: link to main dashboard
+    example: https://www.chatwoot.com/
+  name:
+    type: string
+    description: Name for the portal
+  slug:
+    type: string
+    description: Slug for the portal to display in link
+  page_title:
+    type: string
+    description: Page title for the portal
+  account_id:
+    type: integer
diff --git a/swagger/definitions/resource/article.yml b/swagger/definitions/resource/article.yml
new file mode 100644
index 000000000..1624c45d2
--- /dev/null
+++ b/swagger/definitions/resource/article.yml
@@ -0,0 +1,33 @@
+type: object
+properties:
+  id:
+    type: integer
+  content:
+    type: string
+    description: The text content.
+  meta:
+    type: object
+  position:
+    type: integer
+  status:
+    type: integer
+    enum: ['draft', 'published', 'archived']
+  title:
+    type: string
+  slug:
+    type: string
+  views:
+    type: integer
+  portal_id:
+    type: integer
+  account_id:
+    type: integer
+  author_id:
+    type: integer
+  category_id:
+    type: integer
+  folder_id:
+    type: integer
+  associated_article_id:
+    type: integer
+    description: To associate similar articles to each other, e.g to provide the link for the reference.
diff --git a/swagger/definitions/resource/category.yml b/swagger/definitions/resource/category.yml
new file mode 100644
index 000000000..16c97b8f3
--- /dev/null
+++ b/swagger/definitions/resource/category.yml
@@ -0,0 +1,25 @@
+type: object
+properties:
+  id:
+    type: integer
+  description:
+    type: string
+    description: The text content.
+  locale:
+    type: string
+  name:
+    type: string
+  slug:
+    type: string
+  position:
+    type: integer
+  portal_id:
+    type: integer
+  account_id:
+    type: integer
+  associated_category_id:
+    type: integer
+    description: To associate similar categories to each other, e.g same category of product documentation in different languages
+  parent_category_id:
+    type: integer
+    description: To define parent category, e.g product documentation has multiple level features in sales category or in engineering category.
diff --git a/swagger/definitions/resource/portal.yml b/swagger/definitions/resource/portal.yml
new file mode 100644
index 000000000..a1bef33bc
--- /dev/null
+++ b/swagger/definitions/resource/portal.yml
@@ -0,0 +1,34 @@
+type: object
+properties:
+  id:
+    type: integer
+  archived:
+    type: boolean
+  color:
+    type: string
+  config:
+    type: object
+    description: Save information about locales, allowed_locales and default portal/help-center locale
+  custom_domain:
+    type: string
+  header_text:
+    type: string
+    description: The text content.
+  homepage_link:
+    type: string
+  name:
+    type: string
+  slug:
+    type: string
+  page_title:
+    type: string
+  account_id:
+    type: integer
+  categories:
+    type: array
+    items:
+      $ref: '#/definitions/category'
+  articles:
+    type: array
+    items:
+      $ref: '#/definitions/article'
diff --git a/swagger/index.yml b/swagger/index.yml
index 3dc245ddf..bddaf934c 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -69,6 +69,7 @@ x-tagGroups:
       - Teams
       - Webhooks
       - Automation Rule
+      - Help Center
   - name: Client
     tags:
       - Contacts API
diff --git a/swagger/parameters/portal_id.yml b/swagger/parameters/portal_id.yml
new file mode 100644
index 000000000..b45f69629
--- /dev/null
+++ b/swagger/parameters/portal_id.yml
@@ -0,0 +1,5 @@
+in: path
+name: portal_id
+type: integer
+required: true
+description: The numeric ID of the portal
diff --git a/swagger/paths/application/article/create.yml b/swagger/paths/application/article/create.yml
new file mode 100644
index 000000000..0733fb860
--- /dev/null
+++ b/swagger/paths/application/article/create.yml
@@ -0,0 +1,20 @@
+tags:
+  - Help Center
+operationId: add-new-article-to-account
+summary: Add a new article
+description: Add a new article to portal
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/article_create_update_payload'
+responses:
+  '200':
+    description: Success
+    schema:
+      $ref: '#/definitions/article'
+  '403':
+    description: Access denied
diff --git a/swagger/paths/application/category/create.yml b/swagger/paths/application/category/create.yml
new file mode 100644
index 000000000..7b569a40b
--- /dev/null
+++ b/swagger/paths/application/category/create.yml
@@ -0,0 +1,20 @@
+tags:
+  - Help Center
+operationId: add-new-category-to-account
+summary: Add a new category
+description: Add a new category to portal
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/category_create_update_payload'
+responses:
+  '200':
+    description: Success
+    schema:
+      $ref: '#/definitions/category'
+  '403':
+    description: Access denied
diff --git a/swagger/paths/application/portal/create.yml b/swagger/paths/application/portal/create.yml
new file mode 100644
index 000000000..187c20008
--- /dev/null
+++ b/swagger/paths/application/portal/create.yml
@@ -0,0 +1,20 @@
+tags:
+  - Help Center
+operationId: add-new-portal-to-account
+summary: Add a new portal
+description: Add a new portal to account
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/portal_create_update_payload'
+responses:
+  '200':
+    description: Success
+    schema:
+      $ref: '#/definitions/portal'
+  '403':
+    description: Access denied
diff --git a/swagger/paths/application/portal/index.yml b/swagger/paths/application/portal/index.yml
new file mode 100644
index 000000000..ea56563a4
--- /dev/null
+++ b/swagger/paths/application/portal/index.yml
@@ -0,0 +1,19 @@
+tags:
+  - Help Center
+operationId: get-portal
+summary: List all portals in an account
+parameters:
+  - $ref: '#/parameters/account_id'
+description: Get details of portals in an Account
+security:
+  - userApiKey: []
+responses:
+  '200':
+    description: Success
+    schema:
+      type: array
+      description: Array of all portals
+      items:
+        $ref: '#/definitions/portal'
+  '403':
+    description: Access denied
diff --git a/swagger/paths/application/portal/update.yml b/swagger/paths/application/portal/update.yml
new file mode 100644
index 000000000..8c6a74e85
--- /dev/null
+++ b/swagger/paths/application/portal/update.yml
@@ -0,0 +1,20 @@
+tags:
+  - Help Center
+operationId: update-new-portal-to-account
+summary: update a new portal
+description: update a new portal to account
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/portal_create_update_payload'
+responses:
+  '200':
+    description: Success
+    schema:
+      $ref: '#/definitions/portal'
+  '403':
+    description: Access denied
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index c3e0f9d51..3f208c2c9 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -245,6 +245,35 @@
     $ref: ./application/automation_rule/delete.yml
 
 
+# Help Center
+/api/v1/accounts/{account_id}/portals:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  post:
+    $ref: ./application/portal/create.yml
+  get:
+    $ref: ./application/portal/index.yml
+  patch:
+    $ref: ./application/portal/update.yml
+
+
+# Help Center category
+/api/v1/accounts/{account_id}/portals/{portal_id}/categories:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/portal_id'
+  post:
+    $ref: ./application/category/create.yml
+
+# Help Center article
+/api/v1/accounts/{account_id}/portals/{portal_id}/articles:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/portal_id'
+  post:
+    $ref: ./application/article/create.yml
+
+
 # Conversations
 /api/v1/accounts/{account_id}/conversations/meta:
   $ref: ./application/conversation/meta.yml
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 5ae02e056..c6583cb1e 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2396,6 +2396,212 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/portals": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Help Center"
+        ],
+        "operationId": "add-new-portal-to-account",
+        "summary": "Add a new portal",
+        "description": "Add a new portal to account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/portal_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/portal"
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Help Center"
+        ],
+        "operationId": "get-portal",
+        "summary": "List all portals in an account",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          }
+        ],
+        "description": "Get details of portals in an Account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of all portals",
+              "items": {
+                "$ref": "#/definitions/portal"
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Help Center"
+        ],
+        "operationId": "update-new-portal-to-account",
+        "summary": "update a new portal",
+        "description": "update a new portal to account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/portal_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/portal"
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/portals/{portal_id}/categories": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/portal_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Help Center"
+        ],
+        "operationId": "add-new-category-to-account",
+        "summary": "Add a new category",
+        "description": "Add a new category to portal",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/category_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/category"
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/portals/{portal_id}/articles": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/portal_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Help Center"
+        ],
+        "operationId": "add-new-article-to-account",
+        "summary": "Add a new article",
+        "description": "Add a new article to portal",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/article_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/article"
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/conversations/meta": {
       "parameters": [
         {
@@ -4921,6 +5127,150 @@
         }
       }
     },
+    "portal": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "integer"
+        },
+        "archived": {
+          "type": "boolean"
+        },
+        "color": {
+          "type": "string"
+        },
+        "config": {
+          "type": "object",
+          "description": "Save information about locales, allowed_locales and default portal/help-center locale"
+        },
+        "custom_domain": {
+          "type": "string"
+        },
+        "header_text": {
+          "type": "string",
+          "description": "The text content."
+        },
+        "homepage_link": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "slug": {
+          "type": "string"
+        },
+        "page_title": {
+          "type": "string"
+        },
+        "account_id": {
+          "type": "integer"
+        },
+        "categories": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/category"
+          }
+        },
+        "articles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/article"
+          }
+        }
+      }
+    },
+    "category": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "integer"
+        },
+        "description": {
+          "type": "string",
+          "description": "The text content."
+        },
+        "locale": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "slug": {
+          "type": "string"
+        },
+        "position": {
+          "type": "integer"
+        },
+        "portal_id": {
+          "type": "integer"
+        },
+        "account_id": {
+          "type": "integer"
+        },
+        "associated_category_id": {
+          "type": "integer",
+          "description": "To associate similar categories to each other, e.g same category of product documentation in different languages"
+        },
+        "parent_category_id": {
+          "type": "integer",
+          "description": "To define parent category, e.g product documentation has multiple level features in sales category or in engineering category."
+        }
+      }
+    },
+    "article": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "integer"
+        },
+        "content": {
+          "type": "string",
+          "description": "The text content."
+        },
+        "meta": {
+          "type": "object"
+        },
+        "position": {
+          "type": "integer"
+        },
+        "status": {
+          "type": "integer",
+          "enum": [
+            "draft",
+            "published",
+            "archived"
+          ]
+        },
+        "title": {
+          "type": "string"
+        },
+        "slug": {
+          "type": "string"
+        },
+        "views": {
+          "type": "integer"
+        },
+        "portal_id": {
+          "type": "integer"
+        },
+        "account_id": {
+          "type": "integer"
+        },
+        "author_id": {
+          "type": "integer"
+        },
+        "category_id": {
+          "type": "integer"
+        },
+        "folder_id": {
+          "type": "integer"
+        },
+        "associated_article_id": {
+          "type": "integer",
+          "description": "To associate similar articles to each other, e.g to provide the link for the reference."
+        }
+      }
+    },
     "contact": {
       "type": "object",
       "properties": {
@@ -6002,6 +6352,161 @@
         }
       }
     },
+    "portal_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "archived": {
+          "type": "boolean",
+          "description": "Status to check if portal is live"
+        },
+        "color": {
+          "type": "string",
+          "description": "Header color for help-center",
+          "example": "add color HEX string, \"#fffff\""
+        },
+        "config": {
+          "type": "object",
+          "description": "Configuration about supporting locales",
+          "example": {
+            "allowed_locales": [
+              "en",
+              "es"
+            ],
+            "default_locale": "en"
+          }
+        },
+        "custom_domain": {
+          "type": "string",
+          "description": "Custom domain to  display help center.",
+          "example": "https://chatwoot.help/."
+        },
+        "header_text": {
+          "type": "string",
+          "description": "Help center header",
+          "example": "Handbook"
+        },
+        "homepage_link": {
+          "type": "string",
+          "description": "link to main dashboard",
+          "example": "https://www.chatwoot.com/"
+        },
+        "name": {
+          "type": "string",
+          "description": "Name for the portal"
+        },
+        "slug": {
+          "type": "string",
+          "description": "Slug for the portal to display in link"
+        },
+        "page_title": {
+          "type": "string",
+          "description": "Page title for the portal"
+        },
+        "account_id": {
+          "type": "integer"
+        }
+      }
+    },
+    "category_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Category description"
+        },
+        "locale": {
+          "type": "string",
+          "description": "Category locale",
+          "example": "en/es"
+        },
+        "name": {
+          "type": "string",
+          "description": "Category name"
+        },
+        "slug": {
+          "type": "string",
+          "description": "Category slug"
+        },
+        "position": {
+          "type": "integer",
+          "description": "Category position in the portal list to sort"
+        },
+        "portal_id": {
+          "type": "integer"
+        },
+        "account_id": {
+          "type": "integer"
+        },
+        "associated_category_id": {
+          "type": "integer",
+          "description": "To associate similar categories to each other, e.g same category of product documentation in different languages"
+        },
+        "parent_category_id": {
+          "type": "integer",
+          "description": "To define parent category, e.g product documentation has multiple level features in sales category or in engineering category."
+        }
+      }
+    },
+    "article_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "content": {
+          "type": "string",
+          "description": "The text content."
+        },
+        "meta": {
+          "type": "object",
+          "description": "Use for search",
+          "example": {
+            "tags": [
+              "article_name"
+            ],
+            "title": "article title",
+            "description": "article description"
+          }
+        },
+        "position": {
+          "type": "integer",
+          "description": "article position in category"
+        },
+        "status": {
+          "type": "integer",
+          "example": [
+            "draft",
+            "published",
+            "archived"
+          ]
+        },
+        "title": {
+          "type": "string"
+        },
+        "slug": {
+          "type": "string"
+        },
+        "views": {
+          "type": "integer"
+        },
+        "portal_id": {
+          "type": "integer"
+        },
+        "account_id": {
+          "type": "integer"
+        },
+        "author_id": {
+          "type": "integer"
+        },
+        "category_id": {
+          "type": "integer"
+        },
+        "folder_id": {
+          "type": "integer"
+        },
+        "associated_article_id": {
+          "type": "integer",
+          "description": "To associate similar articles to each other, e.g to provide the link for the reference."
+        }
+      }
+    },
     "public_contact_create_update_payload": {
       "type": "object",
       "properties": {
@@ -6567,7 +7072,8 @@
         "Reports",
         "Teams",
         "Webhooks",
-        "Automation Rule"
+        "Automation Rule",
+        "Help Center"
       ]
     },
     {

From 1d0930ef63908677117f3cb270741f3980e99227 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 26 May 2023 00:54:37 +0530
Subject: [PATCH 38/93] fix: Updates editor to fix the extra slash issue
 [cw-1505][cw-1526] (#7091)

* fix: Updates editor to fix the extra slash issue

* Updates yarn package

* Updates yarn package for editor schema

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 yarn.lock | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 323c690c7..2d05808cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2180,8 +2180,9 @@
 
 "@chatwoot/prosemirror-schema@https://github.com/chatwoot/prosemirror-schema.git":
   version "1.0.0"
-  resolved "https://github.com/chatwoot/prosemirror-schema.git#b937c3cb44210b7d251daf766988758975befec7"
+  resolved "https://github.com/chatwoot/prosemirror-schema.git#218f22b79d10f0a1240a125b0887b19186205ea6"
   dependencies:
+    markdown-it-sup "^1.0.0"
     prosemirror-commands "^1.1.4"
     prosemirror-dropcursor "^1.3.2"
     prosemirror-gapcursor "^1.1.5"
@@ -12292,6 +12293,11 @@ markdown-it-link-attributes@^4.0.1:
   resolved "https://registry.yarnpkg.com/markdown-it-link-attributes/-/markdown-it-link-attributes-4.0.1.tgz#25751f2cf74fd91f0a35ba7b3247fa45f2056d88"
   integrity sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ==
 
+markdown-it-sup@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz#cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3"
+  integrity sha512-E32m0nV9iyhRR7CrhnzL5msqic7rL1juWre6TQNxsnApg7Uf+F97JOKxUijg5YwXz86lZ0mqfOnutoryyNdntQ==
+
 markdown-it@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"

From afc97faa8bae226a915cc4f588d756d489131279 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 27 May 2023 13:24:31 +0530
Subject: [PATCH 39/93] chore: Rotate pubsub token on password change (#7194)

Fixes: https://linear.app/chatwoot/issue/CW-1350/
---
 app/models/concerns/pubsubable.rb | 10 ++++++++++
 spec/models/user_spec.rb          | 16 ++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/app/models/concerns/pubsubable.rb b/app/models/concerns/pubsubable.rb
index 7da99ea14..bbdef5100 100644
--- a/app/models/concerns/pubsubable.rb
+++ b/app/models/concerns/pubsubable.rb
@@ -6,6 +6,16 @@ module Pubsubable
   included do
     # Used by the actionCable/PubSub Service we use for real time communications
     has_secure_token :pubsub_token
+    before_save :rotate_pubsub_token
+  end
+
+  def rotate_pubsub_token
+    # ATM we are only rotating the token if the user is changing their password
+    return unless is_a?(User)
+
+    # Using the class method to avoid the extra Save
+    # TODO: Should we do this on signin ?
+    self.pubsub_token = self.class.generate_unique_secure_token if will_save_change_to_encrypted_password?
   end
 
   def pubsub_token
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 7bae381ac..f38b3db0b 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -34,6 +34,22 @@ RSpec.describe User do
 
     it { expect(user.pubsub_token).not_to be_nil }
     it { expect(user.saved_changes.keys).not_to eq('pubsub_token') }
+
+    context 'rotates the pubsub_token' do
+      it 'changes the pubsub_token when password changes' do
+        pubsub_token = user.pubsub_token
+        user.password = Faker::Internet.password(special_characters: true)
+        user.save!
+        expect(user.pubsub_token).not_to eq(pubsub_token)
+      end
+
+      it 'will not change pubsub_token when other attributes change' do
+        pubsub_token = user.pubsub_token
+        user.name = Faker::Name.name
+        user.save!
+        expect(user.pubsub_token).to eq(pubsub_token)
+      end
+    end
   end
 
   describe 'hmac_identifier' do

From 91d1d44aa933523f550ecd57738ce81b18965b4c Mon Sep 17 00:00:00 2001
From: amplitudes <62763456+amplitudesxd@users.noreply.github.com>
Date: Mon, 29 May 2023 10:30:14 +0100
Subject: [PATCH 40/93] fix: profile picture distortion (#7203)

By applying pr-1 on a container div instead of directly on the image (which distorts it), it creates the intended padding effect without any image distortion.
---
 app/views/public/api/v1/portals/articles/show.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/public/api/v1/portals/articles/show.html.erb b/app/views/public/api/v1/portals/articles/show.html.erb
index 20f14e787..e3b560454 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -35,7 +35,9 @@
     <div class="flex flex-col items-start justify-between w-full md:flex-row md:items-center pt-2">
       <div class="flex items-center space-x-2">
         <% if @article.author&.avatar_url&.present? %>
-          <img src="<%= @article.author.avatar_url %>" alt="<%= @article.author.display_name %>" class="w-12 h-12 border rounded-full pr-1">
+          <div class="pr-1">
+            <img src="<%= @article.author.avatar_url %>" alt="<%= @article.author.display_name %>" class="w-12 h-12 border rounded-full">
+          </div>
         <% end %>
         <div>
           <h5 class="text-base font-medium text-slate-900 mb-2"><%= @article.author.available_name %></h5>

From 3a7633b564b94be04c9359302f3aa8dd227feb8c Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 29 May 2023 21:57:24 +0530
Subject: [PATCH 41/93] feat: API to create HMAC verified conversations (#7209)

Fixes: #6744
---
 .../contacts/contact_inboxes_controller.rb    |  4 +++-
 .../v1/accounts/conversations_controller.rb   |  7 +++----
 app/controllers/concerns/hmac_concern.rb      |  5 +++++
 .../contact_inboxes_controller_spec.rb        | 19 ++++++++++++++++++-
 .../accounts/conversations_controller_spec.rb | 19 ++-----------------
 5 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 app/controllers/concerns/hmac_concern.rb

diff --git a/app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb b/app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb
index b4287ae08..d985c8a73 100644
--- a/app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts/contact_inboxes_controller.rb
@@ -1,11 +1,13 @@
 class Api::V1::Accounts::Contacts::ContactInboxesController < Api::V1::Accounts::Contacts::BaseController
+  include HmacConcern
   before_action :ensure_inbox, only: [:create]
 
   def create
     @contact_inbox = ContactInboxBuilder.new(
       contact: @contact,
       inbox: @inbox,
-      source_id: params[:source_id]
+      source_id: params[:source_id],
+      hmac_verified: hmac_verified?
     ).perform
   end
 
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 1f3fbae0b..cd8547213 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -1,6 +1,7 @@
 class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseController
   include Events::Types
   include DateRangeHelper
+  include HmacConcern
 
   before_action :conversation, except: [:index, :meta, :search, :create, :filter]
   before_action :inbox, :contact, :contact_inbox, only: [:create]
@@ -104,9 +105,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   end
 
   def set_conversation_status
-    # TODO: temporary fallback for the old bot status in conversation, we will remove after couple of releases
-    # commenting this out to see if there are any errors, if not we can remove this in subsequent releases
-    # status = params[:status] == 'bot' ? 'pending' : params[:status]
     @conversation.status = params[:status]
     @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
   end
@@ -152,7 +150,8 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     ContactInboxBuilder.new(
       contact: @contact,
       inbox: @inbox,
-      source_id: params[:source_id]
+      source_id: params[:source_id],
+      hmac_verified: hmac_verified?
     ).perform
   end
 
diff --git a/app/controllers/concerns/hmac_concern.rb b/app/controllers/concerns/hmac_concern.rb
new file mode 100644
index 000000000..abc55a394
--- /dev/null
+++ b/app/controllers/concerns/hmac_concern.rb
@@ -0,0 +1,5 @@
+module HmacConcern
+  def hmac_verified?
+    ActiveModel::Type::Boolean.new.cast(params[:hmac_verified]).present?
+  end
+end
diff --git a/spec/controllers/api/v1/accounts/contacts/contact_inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts/contact_inboxes_controller_spec.rb
index 2bd393a5a..659d41f4a 100644
--- a/spec/controllers/api/v1/accounts/contacts/contact_inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts/contact_inboxes_controller_spec.rb
@@ -27,7 +27,9 @@ RSpec.describe '/api/v1/accounts/{account.id}/contacts/:id/contact_inboxes', typ
         end.to change(ContactInbox, :count).by(1)
 
         expect(response).to have_http_status(:success)
-        expect(contact.reload.contact_inboxes.map(&:inbox_id)).to include(channel_api.inbox.id)
+        contact_inbox = contact.reload.contact_inboxes.find_by(inbox_id: channel_api.inbox.id)
+        expect(contact_inbox).to be_present
+        expect(contact_inbox.hmac_verified).to be(false)
       end
 
       it 'creates a valid email contact inbox' do
@@ -43,6 +45,21 @@ RSpec.describe '/api/v1/accounts/{account.id}/contacts/:id/contact_inboxes', typ
         expect(contact.reload.contact_inboxes.map(&:inbox_id)).to include(channel_email.inbox.id)
       end
 
+      it 'creates an hmac verified contact inbox' do
+        create(:inbox_member, inbox: channel_api.inbox, user: agent)
+        expect do
+          post "/api/v1/accounts/#{account.id}/contacts/#{contact.id}/contact_inboxes",
+               params: { inbox_id: channel_api.inbox.id, hmac_verified: true },
+               headers: agent.create_new_auth_token,
+               as: :json
+        end.to change(ContactInbox, :count).by(1)
+
+        expect(response).to have_http_status(:success)
+        contact_inbox = contact.reload.contact_inboxes.find_by(inbox_id: channel_api.inbox.id)
+        expect(contact_inbox).to be_present
+        expect(contact_inbox.hmac_verified).to be(true)
+      end
+
       it 'throws error for invalid source id' do
         create(:inbox_member, inbox: channel_twilio_sms.inbox, user: agent)
         expect do
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 496ce5cdb..f98dfba65 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -273,21 +273,6 @@ RSpec.describe 'Conversations API', type: :request do
           expect(response_data[:status]).to eq('pending')
         end
 
-        # TODO: remove this spec when we remove the condition check in controller
-        # Added for backwards compatibility for bot status
-        # remove this in subsequent release
-        # it 'creates a conversation as pending if status is specified as bot' do
-        #   allow(Rails.configuration.dispatcher).to receive(:dispatch)
-        #   post "/api/v1/accounts/#{account.id}/conversations",
-        #        headers: agent.create_new_auth_token,
-        #        params: { source_id: contact_inbox.source_id, status: 'bot' },
-        #        as: :json
-
-        #   expect(response).to have_http_status(:success)
-        #   response_data = JSON.parse(response.body, symbolize_names: true)
-        #   expect(response_data[:status]).to eq('pending')
-        # end
-
         it 'creates a new conversation with message when message is passed' do
           allow(Rails.configuration.dispatcher).to receive(:dispatch)
           post "/api/v1/accounts/#{account.id}/conversations",
@@ -304,13 +289,13 @@ RSpec.describe 'Conversations API', type: :request do
         it 'calls contact inbox builder if contact_id and inbox_id is present' do
           builder = double
           allow(Rails.configuration.dispatcher).to receive(:dispatch)
-          allow(ContactInboxBuilder).to receive(:new).and_return(builder)
+          allow(ContactInboxBuilder).to receive(:new).with(contact: contact, inbox: inbox, source_id: nil, hmac_verified: false).and_return(builder)
           allow(builder).to receive(:perform)
           expect(builder).to receive(:perform)
 
           post "/api/v1/accounts/#{account.id}/conversations",
                headers: agent.create_new_auth_token,
-               params: { contact_id: contact.id, inbox_id: inbox.id },
+               params: { contact_id: contact.id, inbox_id: inbox.id, hmac_verified: 'false' },
                as: :json
         end
 

From ffc63646906b082f60d984697dbd9958c9f613da Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 29 May 2023 22:23:22 +0530
Subject: [PATCH 42/93] chore: Improve Whatsapp Templates Sync (#7210)

- update the templates updated at, even if the API request fails ( to prevent jobs from stacking up in case of API failures upstream )
- sequence the job in batches of 25 requests per minutes schedule ( in case API response time is high, also not to send too many requests in a single batch )
- move the sync job re-rerun to 3 hours ( since we are updating the updated at even in case of failures )(prev 15 minutes )

Fixes: https://linear.app/chatwoot/issue/CW-1590
---
 .../whatsapp/templates_sync_scheduler_job.rb  |  6 ++----
 .../providers/whatsapp_360_dialog_service.rb  |  3 ++-
 .../providers/whatsapp_cloud_service.rb       |  4 ++--
 lib/limits.rb                                 |  1 +
 .../templates_sync_scheduler_job_spec.rb      |  2 +-
 .../whatsapp360_dialog_service_spec.rb        | 21 +++++++++++++++++++
 .../whatsapp_360_dialog_service_spec.rb       |  1 -
 .../providers/whatsapp_cloud_service_spec.rb  | 11 ++++++++++
 8 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 spec/services/whatsapp/providers/whatsapp360_dialog_service_spec.rb
 delete mode 100644 spec/services/whatsapp/providers/whatsapp_360_dialog_service_spec.rb

diff --git a/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb b/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
index 1b11c32c4..ade3eb082 100644
--- a/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
+++ b/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
@@ -3,10 +3,8 @@ class Channels::Whatsapp::TemplatesSyncSchedulerJob < ApplicationJob
 
   def perform
     Channel::Whatsapp.where('message_templates_last_updated <= ? OR message_templates_last_updated IS NULL',
-                            15.minutes.ago).find_in_batches do |channels_batch|
-      channels_batch.each do |channel|
-        Channels::Whatsapp::TemplatesSyncJob.perform_later(channel)
-      end
+                            3.hours.ago).limit(Limits::BULK_EXTERNAL_HTTP_CALLS_LIMIT).all.each do |channel|
+      Channels::Whatsapp::TemplatesSyncJob.perform_later(channel)
     end
   end
 end
diff --git a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
index c67e448bb..94f4dc370 100644
--- a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
@@ -23,7 +23,8 @@ class Whatsapp::Providers::Whatsapp360DialogService < Whatsapp::Providers::BaseS
 
   def sync_templates
     response = HTTParty.get("#{api_base_path}/configs/templates", headers: api_headers)
-    whatsapp_channel.update(message_templates: response['waba_templates'], message_templates_last_updated: Time.now.utc) if response.success?
+    whatsapp_channel[:message_templates] = response['waba_templates'] if response.success?
+    whatsapp_channel.update(message_templates_last_updated: Time.now.utc)
   end
 
   def validate_provider_config?
diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
index 9b6c793aa..fc8f729a5 100644
--- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
@@ -24,8 +24,8 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
 
   def sync_templates
     templates = fetch_whatsapp_templates("#{business_account_path}/message_templates?access_token=#{whatsapp_channel.provider_config['api_key']}")
-
-    whatsapp_channel.update(message_templates: templates, message_templates_last_updated: Time.now.utc) if templates.present?
+    whatsapp_channel[:message_templates] = templates if templates.present?
+    whatsapp_channel.update(message_templates_last_updated: Time.now.utc)
   end
 
   def fetch_whatsapp_templates(url)
diff --git a/lib/limits.rb b/lib/limits.rb
index 1e2d36447..fe526748a 100644
--- a/lib/limits.rb
+++ b/lib/limits.rb
@@ -1,3 +1,4 @@
 module Limits
   BULK_ACTIONS_LIMIT = 100
+  BULK_EXTERNAL_HTTP_CALLS_LIMIT = 25
 end
diff --git a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
index 1b1050b5d..e6545bfe3 100644
--- a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
+++ b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Channels::Whatsapp::TemplatesSyncSchedulerJob do
       stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
       non_synced = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: nil)
       synced_recently = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: Time.zone.now)
-      synced_old = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: 16.minutes.ago)
+      synced_old = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: 4.hours.ago)
       described_class.perform_now
       expect(Channels::Whatsapp::TemplatesSyncJob).not_to(
         have_been_enqueued.with(synced_recently).on_queue('low')
diff --git a/spec/services/whatsapp/providers/whatsapp360_dialog_service_spec.rb b/spec/services/whatsapp/providers/whatsapp360_dialog_service_spec.rb
new file mode 100644
index 000000000..477674497
--- /dev/null
+++ b/spec/services/whatsapp/providers/whatsapp360_dialog_service_spec.rb
@@ -0,0 +1,21 @@
+## the specs are covered in send in spec/services/whatsapp/send_on_whatsapp_service_spec.rb
+require 'rails_helper'
+
+describe Whatsapp::Providers::Whatsapp360DialogService do
+  subject(:service) { described_class.new(whatsapp_channel: whatsapp_channel) }
+
+  let!(:whatsapp_channel) { create(:channel_whatsapp, sync_templates: false, validate_provider_config: false) }
+
+  describe '#sync_templates' do
+    context 'when called' do
+      it 'updates message_templates_last_updated even when template request fails' do
+        stub_request(:get, 'https://waba.360dialog.io/v1/configs/templates')
+          .to_return(status: 401)
+
+        timstamp = whatsapp_channel.reload.message_templates_last_updated
+        subject.sync_templates
+        expect(whatsapp_channel.reload.message_templates_last_updated).not_to eq(timstamp)
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/providers/whatsapp_360_dialog_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_360_dialog_service_spec.rb
deleted file mode 100644
index b36a9de56..000000000
--- a/spec/services/whatsapp/providers/whatsapp_360_dialog_service_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-## the specs are covered in send in spec/services/whatsapp/send_on_whatsapp_service_spec.rb
diff --git a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
index 3fbea97e9..32cd654ee 100644
--- a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
@@ -127,10 +127,21 @@ describe Whatsapp::Providers::WhatsappCloudService do
               ], paging: { prev: 'https://graph.facebook.com/v14.0/123456789/message_templates?access_token=test_key' } }.to_json }
           )
 
+        timstamp = whatsapp_channel.reload.message_templates_last_updated
         expect(subject.sync_templates).to be(true)
         expect(whatsapp_channel.reload.message_templates.first).to eq({ id: '123456789', name: 'test_template' }.stringify_keys)
         expect(whatsapp_channel.reload.message_templates.second).to eq({ id: '123456789', name: 'next_template' }.stringify_keys)
         expect(whatsapp_channel.reload.message_templates.last).to eq({ id: '123456789', name: 'last_template' }.stringify_keys)
+        expect(whatsapp_channel.reload.message_templates_last_updated).not_to eq(timstamp)
+      end
+
+      it 'updates message_templates_last_updated even when template request fails' do
+        stub_request(:get, 'https://graph.facebook.com/v14.0/123456789/message_templates?access_token=test_key')
+          .to_return(status: 401)
+
+        timstamp = whatsapp_channel.reload.message_templates_last_updated
+        subject.sync_templates
+        expect(whatsapp_channel.reload.message_templates_last_updated).not_to eq(timstamp)
       end
     end
   end

From f1a77ba934bb91f7012461ee1aa3b69a57e6b7e9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 29 May 2023 23:05:17 +0530
Subject: [PATCH 43/93] feat: allow superadmins to reset cache keys for
 IndexedDB (#7180)

Allows super admins to reset the cache for an account. This will force the front end to fetch the data again on the next load.

fixes: https://linear.app/chatwoot/issue/CW-1817

Co-authored-by: Sojan <sojan@pepalo.com>
---
 .../super_admin/accounts_controller.rb        |  7 ++
 app/models/concerns/cache_keys.rb             | 30 +++++---
 .../accounts/_reset_cache.html.erb            |  9 +++
 app/views/super_admin/accounts/show.html.erb  |  2 +
 config/routes.rb                              |  1 +
 .../super_admin/accounts_controller_spec.rb   | 28 ++++++-
 spec/models/concerns/cache_keys_spec.rb       | 73 +++++++++++++++++++
 7 files changed, 139 insertions(+), 11 deletions(-)
 create mode 100644 app/views/super_admin/accounts/_reset_cache.html.erb
 create mode 100644 spec/models/concerns/cache_keys_spec.rb

diff --git a/app/controllers/super_admin/accounts_controller.rb b/app/controllers/super_admin/accounts_controller.rb
index 6a5fb0fdc..5de25f677 100644
--- a/app/controllers/super_admin/accounts_controller.rb
+++ b/app/controllers/super_admin/accounts_controller.rb
@@ -50,6 +50,13 @@ class SuperAdmin::AccountsController < SuperAdmin::ApplicationController
     # rubocop:enable Rails/I18nLocaleTexts
   end
 
+  def reset_cache
+    requested_resource.reset_cache_keys
+    # rubocop:disable Rails/I18nLocaleTexts
+    redirect_back(fallback_location: [namespace, requested_resource], notice: 'Cache keys cleared')
+    # rubocop:enable Rails/I18nLocaleTexts
+  end
+
   def destroy
     account = Account.find(params[:id])
 
diff --git a/app/models/concerns/cache_keys.rb b/app/models/concerns/cache_keys.rb
index 4c27e6bbb..7a01f0925 100644
--- a/app/models/concerns/cache_keys.rb
+++ b/app/models/concerns/cache_keys.rb
@@ -4,29 +4,41 @@ module CacheKeys
   include CacheKeysHelper
   include Events::Types
 
+  included do
+    class_attribute :cacheable_models
+    self.cacheable_models = [Label, Inbox, Team]
+  end
+
   def cache_keys
-    {
-      label: fetch_value_for_key(id, Label.name.underscore),
-      inbox: fetch_value_for_key(id, Inbox.name.underscore),
-      team: fetch_value_for_key(id, Team.name.underscore)
-    }
+    keys = {}
+    self.class.cacheable_models.each do |model|
+      keys[model.name.underscore.to_sym] = fetch_value_for_key(id, model.name.underscore)
+    end
+
+    keys
   end
 
   def invalidate_cache_key_for(key)
     prefixed_cache_key = get_prefixed_cache_key(id, key)
-    Redis::Alfred.del(prefixed_cache_key)
-    dispatch_cache_udpate_event
+    Redis::Alfred.delete(prefixed_cache_key)
+    dispatch_cache_update_event
   end
 
   def update_cache_key(key)
     prefixed_cache_key = get_prefixed_cache_key(id, key)
     Redis::Alfred.set(prefixed_cache_key, Time.now.utc.to_i)
-    dispatch_cache_udpate_event
+    dispatch_cache_update_event
+  end
+
+  def reset_cache_keys
+    self.class.cacheable_models.each do |model|
+      invalidate_cache_key_for(model.name.underscore)
+    end
   end
 
   private
 
-  def dispatch_cache_udpate_event
+  def dispatch_cache_update_event
     Rails.configuration.dispatcher.dispatch(ACCOUNT_CACHE_INVALIDATED, Time.zone.now, cache_keys: cache_keys, account: self)
   end
 end
diff --git a/app/views/super_admin/accounts/_reset_cache.html.erb b/app/views/super_admin/accounts/_reset_cache.html.erb
new file mode 100644
index 000000000..7710693b7
--- /dev/null
+++ b/app/views/super_admin/accounts/_reset_cache.html.erb
@@ -0,0 +1,9 @@
+<section class="main-content__body">
+ <hr/>
+  <%= form_for([:reset_cache, namespace, page.resource], method: :post, html: { class: "form" }) do |f| %>
+    <div class="form-actions">
+      <p>This will clear the IndexedDB cache keys from redis. <br>The next load will fetch the data from backend.</p>
+      <%= f.submit 'Reset Frontend Cache' %>
+    </div>
+  <% end %>
+</section>
\ No newline at end of file
diff --git a/app/views/super_admin/accounts/show.html.erb b/app/views/super_admin/accounts/show.html.erb
index 995af9ff0..65cb6c567 100644
--- a/app/views/super_admin/accounts/show.html.erb
+++ b/app/views/super_admin/accounts/show.html.erb
@@ -87,3 +87,5 @@ as well as a link to its edit page.
 </section>
 
 <%= render partial: "seed_data", locals: {page: page} %>
+
+<%= render partial: "reset_cache", locals: {page: page} %>
diff --git a/config/routes.rb b/config/routes.rb
index 650f8a64c..fe5196fde 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -397,6 +397,7 @@ Rails.application.routes.draw do
       # order of resources affect the order of sidebar navigation in super admin
       resources :accounts, only: [:index, :new, :create, :show, :edit, :update, :destroy] do
         post :seed, on: :member
+        post :reset_cache, on: :member
       end
       resources :users, only: [:index, :new, :create, :show, :edit, :update, :destroy]
       resources :access_tokens, only: [:index, :show]
diff --git a/spec/controllers/super_admin/accounts_controller_spec.rb b/spec/controllers/super_admin/accounts_controller_spec.rb
index 23235888a..ee295472d 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -15,8 +15,6 @@ RSpec.describe 'Super Admin accounts API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let!(:account) { create(:account) }
-
       it 'shows the list of accounts' do
         sign_in(super_admin, scope: :super_admin)
         get '/super_admin/accounts'
@@ -27,6 +25,32 @@ RSpec.describe 'Super Admin accounts API', type: :request do
     end
   end
 
+  describe 'POST /super_admin/accounts/{account_id}/reset_cache' do
+    before do
+      create(:label, account: account)
+      create(:inbox, account: account)
+      create(:team, account: account)
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/super_admin/accounts/#{account.id}/reset_cache"
+        expect(response).to have_http_status(:redirect)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'shows the list of accounts' do
+        expect(account.cache_keys.keys).to contain_exactly(:inbox, :label, :team)
+        sign_in(super_admin, scope: :super_admin)
+        post "/super_admin/accounts/#{account.id}/reset_cache"
+        expect(response).to have_http_status(:redirect)
+        expect(flash[:notice]).to eq('Cache keys cleared')
+        expect(account.reload.cache_keys.values.map(&:to_i)).to eq([0, 0, 0])
+      end
+    end
+  end
+
   describe 'DELETE /super_admin/accounts/{account_id}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
diff --git a/spec/models/concerns/cache_keys_spec.rb b/spec/models/concerns/cache_keys_spec.rb
new file mode 100644
index 000000000..51d3c8b7a
--- /dev/null
+++ b/spec/models/concerns/cache_keys_spec.rb
@@ -0,0 +1,73 @@
+require 'rails_helper'
+
+RSpec.describe CacheKeys do
+  let(:test_model) do
+    Struct.new(:id) do
+      include CacheKeys
+
+      def fetch_value_for_key(_id, _key)
+        'value'
+      end
+    end.new(1)
+  end
+
+  before do
+    allow(Redis::Alfred).to receive(:delete)
+    allow(Redis::Alfred).to receive(:set)
+    allow(Rails.configuration.dispatcher).to receive(:dispatch)
+  end
+
+  describe '#cache_keys' do
+    it 'returns a hash of cache keys' do
+      expected_keys = test_model.class.cacheable_models.map do |model|
+        [model.name.underscore.to_sym, 'value']
+      end.to_h
+
+      expect(test_model.cache_keys).to eq(expected_keys)
+    end
+  end
+
+  describe '#invalidate_cache_key_for' do
+    it 'deletes the cache key' do
+      test_model.invalidate_cache_key_for('label')
+      expect(Redis::Alfred).to have_received(:delete).with('idb-cache-key-account-1-label')
+    end
+
+    it 'dispatches a cache update event' do
+      test_model.invalidate_cache_key_for('label')
+      expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+        CacheKeys::ACCOUNT_CACHE_INVALIDATED,
+        kind_of(ActiveSupport::TimeWithZone),
+        cache_keys: test_model.cache_keys,
+        account: test_model
+      )
+    end
+  end
+
+  describe '#update_cache_key' do
+    it 'updates the cache key' do
+      allow(Time).to receive(:now).and_return(Time.parse('2023-05-29 00:00:00 UTC'))
+      test_model.update_cache_key('label')
+      expect(Redis::Alfred).to have_received(:set).with('idb-cache-key-account-1-label', Time.now.utc.to_i)
+    end
+
+    it 'dispatches a cache update event' do
+      test_model.update_cache_key('label')
+      expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+        CacheKeys::ACCOUNT_CACHE_INVALIDATED,
+        kind_of(ActiveSupport::TimeWithZone),
+        cache_keys: test_model.cache_keys,
+        account: test_model
+      )
+    end
+  end
+
+  describe '#reset_cache_keys' do
+    it 'invalidates all cache keys for cacheable models' do
+      test_model.reset_cache_keys
+      test_model.class.cacheable_models.each do |model|
+        expect(Redis::Alfred).to have_received(:delete).with("idb-cache-key-account-1-#{model.name.underscore}")
+      end
+    end
+  end
+end

From 412d750b6a2dfbccbfffe18e25434bfafeb3f362 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Tue, 30 May 2023 14:41:29 +0530
Subject: [PATCH 44/93] feat: auditlogs design refactor cw1764 (#7181)

* chore: refactor auditlogs design

* chore: refactor aduit log text

* chore: fix 60% width for activity column

* chore: improve log text formatting

* Apply suggestions from code review

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

* feat: show agent names if available in auditlogs

* chore: add sign_out

* Apply suggestions from code review

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

* chore: handle custom user actions

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/i18n/locale/en/auditLogs.json   | 15 +++-
 .../dashboard/settings/auditlogs/Index.vue    | 83 +++++++++++++++----
 2 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/auditLogs.json b/app/javascript/dashboard/i18n/locale/en/auditLogs.json
index e288e2959..a2bb40135 100644
--- a/app/javascript/dashboard/i18n/locale/en/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/en/auditLogs.json
@@ -10,15 +10,22 @@
       "TITLE": "Manage Audit Logs",
       "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
       "TABLE_HEADER": [
-        "User",
-        "Action",
-        "IP Address",
-        "Time"
+        "Activity",
+        "Time",
+        "IP Address"
       ]
     },
     "API": {
       "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
       "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "ACTION": {
+      "ADD": "created",
+      "EDIT": "updated",
+      "DELETE": "deleted",
+      "SIGN_IN": "signed in",
+      "SIGN_OUT": "signed out",
+      "SYSTEM": "System"
     }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
index 63856b6d8..f11bbb6f4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="column content-box">
+  <div class="column content-box audit-log--settings">
     <!-- List Audit Logs -->
-    <div class="row">
-      <div class="small-8 columns with-right-space ">
+    <div>
+      <div>
         <p
           v-if="!uiFlags.fetchingList && !records.length"
           class="no-items-error-message"
@@ -16,8 +16,13 @@
 
         <table
           v-if="!uiFlags.fetchingList && records.length"
-          class="woot-table"
+          class="woot-table width-100"
         >
+          <colgroup>
+            <col class="column-activity" />
+            <col />
+            <col />
+          </colgroup>
           <thead>
             <!-- Header -->
             <th
@@ -29,12 +34,8 @@
           </thead>
           <tbody>
             <tr v-for="auditLogItem in records" :key="auditLogItem.id">
-              <td class="wrap-break-words">{{ auditLogItem.username }}</td>
               <td class="wrap-break-words">
-                {{ auditLogItem.auditable_type }}.{{ auditLogItem.action }}
-              </td>
-              <td class="remote-address">
-                {{ auditLogItem.remote_address }}
+                {{ generateLogText(auditLogItem) }}
               </td>
               <td class="wrap-break-words">
                 {{
@@ -44,6 +45,9 @@
                   )
                 }}
               </td>
+              <td class="remote-address">
+                {{ auditLogItem.remote_address }}
+              </td>
             </tr>
           </tbody>
         </table>
@@ -81,13 +85,48 @@ export default {
       records: 'auditlogs/getAuditLogs',
       uiFlags: 'auditlogs/getUIFlags',
       meta: 'auditlogs/getMeta',
+      agentList: 'agents/getAgents',
     }),
   },
   mounted() {
     // Fetch API Call
     this.$store.dispatch('auditlogs/fetch', { page: 1 });
+    this.$store.dispatch('agents/get');
   },
   methods: {
+    getAgentName(email) {
+      if (email === null) {
+        return this.$t('AUDIT_LOGS.ACTION.SYSTEM');
+      }
+      const agentName = this.agentList.find(agent => agent.email === email)
+        ?.name;
+      // If agent does not exist(removed/deleted), return email from audit log
+      return agentName || email;
+    },
+    generateLogText(auditLogItem) {
+      const username = this.getAgentName(auditLogItem.username);
+      const auditableType = auditLogItem.auditable_type.toLowerCase();
+      const action = auditLogItem.action.toLowerCase();
+
+      const logActions = {
+        create: this.$t('AUDIT_LOGS.ACTION.ADD'),
+        destroy: this.$t('AUDIT_LOGS.ACTION.DELETE'),
+        update: this.$t('AUDIT_LOGS.ACTION.EDIT'),
+        sign_in: this.$t('AUDIT_LOGS.ACTION.SIGN_IN'),
+        sign_out: this.$t('AUDIT_LOGS.ACTION.SIGN_OUT'),
+      };
+
+      // detect if the action is custom user action, which involves
+      // only the user, such as signing in, signing out etc.
+      // if it is, then do not show the auditable type
+      const userActions = this.getUserActions(action);
+      return `${username} ${logActions[action] || action} ${
+        userActions ? '' : auditableType
+      }`;
+    },
+    getUserActions(action) {
+      return ['sign_in', 'sign_out'].includes(action);
+    },
     onPageChange(page) {
       window.history.pushState({}, null, `${this.$route.path}?page=${page}`);
       try {
@@ -101,12 +140,24 @@ export default {
   },
 };
 </script>
-<style scoped>
-.remote-address {
-  width: 14rem;
-}
-.wrap-break-words {
-  word-break: break-all;
-  white-space: normal;
+
+<style lang="scss" scoped>
+.audit-log--settings {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+
+  .remote-address {
+    width: 14rem;
+  }
+
+  .wrap-break-words {
+    word-break: break-all;
+    white-space: normal;
+  }
+
+  .column-activity {
+    width: 60%;
+  }
 }
 </style>

From ae7df60a7507666718b65e5cf991970686496115 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 30 May 2023 18:54:51 +0530
Subject: [PATCH 45/93] fix: Special characters not being decoded (#7218)

---
 app/javascript/widget/components/AgentMessage.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/javascript/widget/components/AgentMessage.vue b/app/javascript/widget/components/AgentMessage.vue
index 32dda6b76..ae1c10c37 100755
--- a/app/javascript/widget/components/AgentMessage.vue
+++ b/app/javascript/widget/components/AgentMessage.vue
@@ -42,11 +42,10 @@
         </div>
         <p
           v-if="message.showAvatar || hasRecordedResponse"
+          v-dompurify-html="agentName"
           class="agent-name"
           :class="$dm('text-slate-700', 'dark:text-slate-200')"
-        >
-          {{ agentName }}
-        </p>
+        />
       </div>
     </div>
 

From 373f5f5b6471fc8b5832da5d83a459f6d2f8e53a Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 30 May 2023 19:18:19 +0530
Subject: [PATCH 46/93] chore: Disable coverage reports for .vue files (#7214)

- Disable coverage reporting for .vue files

fixes: https://linear.app/chatwoot/issue/CW-1331
---
 .circleci/config.yml |  2 +-
 jest.config.js       | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e287574e9..f758b5492 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -157,7 +157,7 @@ jobs:
       - run:
           name: Code Climate Test Coverage
           command: |
-            ~/tmp/cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json buildreports/lcov.info    
+            ~/tmp/cc-test-reporter format-coverage -t lcov -o "coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json"  
             
       - persist_to_workspace:
           root: coverage
diff --git a/jest.config.js b/jest.config.js
index 3f7749840..5b946a867 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -13,11 +13,15 @@ module.exports = {
     '^.+\\.(js|jsx)?$': 'babel-jest',
   },
   cacheDirectory: '<rootDir>/.jest-cache',
-  collectCoverage: false,
-  coverageDirectory: 'buildreports',
-  collectCoverageFrom: ['**/app/javascript/**/*.{js,vue}'],
+  collectCoverage: true,
+  coverageDirectory: 'coverage',
+  coverageReporters: ['text', 'lcov'],
+  collectCoverageFrom: [
+    '**/app/javascript/**/*.js',
+    '!**/*.stories.js',
+    '!**/i18n/locale/**/*.js',
+  ],
   reporters: ['default'],
-  // setupTestFrameworkScriptFile: './tests/setup.ts',
   transformIgnorePatterns: ['node_modules/*'],
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/app/javascript/$1',

From d93a8d05bc455052fd3d3b4f684216869075edf9 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 31 May 2023 19:17:24 +0530
Subject: [PATCH 47/93] chore: Increase character limit for external url fields
 (#7230)

- Increase the external url field validation to 2048 characters

fixes: https://github.com/chatwoot/chatwoot/issues/7098
---
 app/models/agent_bot.rb         |  1 +
 app/models/attachment.rb        |  2 +-
 app/models/channel/api.rb       |  1 +
 lib/limits.rb                   |  1 +
 spec/models/agent_bot_spec.rb   | 15 +++++++++++++++
 spec/models/attachment_spec.rb  |  6 +++---
 spec/models/channel/api_spec.rb | 23 +++++++++++++++++++++++
 7 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 spec/models/channel/api_spec.rb

diff --git a/app/models/agent_bot.rb b/app/models/agent_bot.rb
index 72f6b2618..e01f286ab 100644
--- a/app/models/agent_bot.rb
+++ b/app/models/agent_bot.rb
@@ -28,6 +28,7 @@ class AgentBot < ApplicationRecord
   enum bot_type: { webhook: 0, csml: 1 }
 
   validate :validate_agent_bot_config
+  validates :outgoing_url, length: { maximum: Limits::URL_LENGTH_LIMIT }
 
   def available_name
     name
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 9325d8168..3af08f21e 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -37,7 +37,7 @@ class Attachment < ApplicationRecord
   belongs_to :message
   has_one_attached :file
   validate :acceptable_file
-  validates :external_url, length: { maximum: 1000 }
+  validates :external_url, length: { maximum: Limits::URL_LENGTH_LIMIT }
   enum file_type: [:image, :audio, :video, :file, :location, :fallback, :share, :story_mention, :contact]
 
   def push_event_data
diff --git a/app/models/channel/api.rb b/app/models/channel/api.rb
index 013a8c17c..a2bf9da48 100644
--- a/app/models/channel/api.rb
+++ b/app/models/channel/api.rb
@@ -27,6 +27,7 @@ class Channel::Api < ApplicationRecord
   has_secure_token :identifier
   has_secure_token :hmac_token
   validate :ensure_valid_agent_reply_time_window
+  validates :webhook_url, length: { maximum: Limits::URL_LENGTH_LIMIT }
 
   def name
     'API'
diff --git a/lib/limits.rb b/lib/limits.rb
index fe526748a..f9b0be7d6 100644
--- a/lib/limits.rb
+++ b/lib/limits.rb
@@ -1,4 +1,5 @@
 module Limits
   BULK_ACTIONS_LIMIT = 100
   BULK_EXTERNAL_HTTP_CALLS_LIMIT = 25
+  URL_LENGTH_LIMIT = 2048 # https://stackoverflow.com/questions/417142
 end
diff --git a/spec/models/agent_bot_spec.rb b/spec/models/agent_bot_spec.rb
index 6e35bd79b..b80c068eb 100644
--- a/spec/models/agent_bot_spec.rb
+++ b/spec/models/agent_bot_spec.rb
@@ -12,4 +12,19 @@ RSpec.describe AgentBot do
     it_behaves_like 'access_tokenable'
     it_behaves_like 'avatarable'
   end
+
+  context 'when it validates outgoing_url length' do
+    let(:agent_bot) { create(:agent_bot) }
+
+    it 'valid when within limit' do
+      agent_bot.outgoing_url = 'a' * Limits::URL_LENGTH_LIMIT
+      expect(agent_bot.valid?).to be true
+    end
+
+    it 'invalid when crossed the limit' do
+      agent_bot.outgoing_url = 'a' * (Limits::URL_LENGTH_LIMIT + 1)
+      agent_bot.valid?
+      expect(agent_bot.errors[:outgoing_url]).to include("is too long (maximum is #{Limits::URL_LENGTH_LIMIT} characters)")
+    end
+  end
 end
diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb
index c03bca062..64a506a92 100644
--- a/spec/models/attachment_spec.rb
+++ b/spec/models/attachment_spec.rb
@@ -11,14 +11,14 @@ RSpec.describe Attachment do
 
     context 'when it validates external url length' do
       it 'valid when within limit' do
-        attachment.external_url = 'a' * 1000
+        attachment.external_url = 'a' * Limits::URL_LENGTH_LIMIT
         expect(attachment.valid?).to be true
       end
 
       it 'invalid when crossed the limit' do
-        attachment.external_url = 'a' * 1500
+        attachment.external_url = 'a' * (Limits::URL_LENGTH_LIMIT + 5)
         attachment.valid?
-        expect(attachment.errors[:external_url]).to include('is too long (maximum is 1000 characters)')
+        expect(attachment.errors[:external_url]).to include("is too long (maximum is #{Limits::URL_LENGTH_LIMIT} characters)")
       end
     end
   end
diff --git a/spec/models/channel/api_spec.rb b/spec/models/channel/api_spec.rb
new file mode 100644
index 000000000..f3a5c8cfe
--- /dev/null
+++ b/spec/models/channel/api_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Channel::Api do
+  # This validation happens in ApplicationRecord
+  describe 'length validations' do
+    let(:channel_api) { create(:channel_api) }
+
+    context 'when it validates webhook_url length' do
+      it 'valid when within limit' do
+        channel_api.webhook_url = 'a' * Limits::URL_LENGTH_LIMIT
+        expect(channel_api.valid?).to be true
+      end
+
+      it 'invalid when crossed the limit' do
+        channel_api.webhook_url = 'a' * (Limits::URL_LENGTH_LIMIT + 1)
+        channel_api.valid?
+        expect(channel_api.errors[:webhook_url]).to include("is too long (maximum is #{Limits::URL_LENGTH_LIMIT} characters)")
+      end
+    end
+  end
+end

From abc27fa791941bef003acb3f037a854c6b7ef297 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 31 May 2023 19:23:29 +0530
Subject: [PATCH 48/93] fix: find mail message by references (#7220)

---
 app/mailboxes/imap/imap_mailbox.rb       | 18 ++++++++++++++++--
 spec/fixtures/files/references.eml       | 16 ++++++++++++++++
 spec/mailboxes/imap/imap_mailbox_spec.rb | 23 +++++++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 spec/fixtures/files/references.eml

diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index a9ed0a7c9..f811eedfa 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -35,9 +35,9 @@ class Imap::ImapMailbox
   end
 
   def find_conversation_by_in_reply_to
-    return if in_reply_to.blank?
+    return if in_reply_to.blank? && @inbound_mail.references.blank?
 
-    message = @inbox.messages.find_by(source_id: in_reply_to)
+    message = @inbox.messages.find_by(source_id: in_reply_to) || find_message_by_references
     if message.nil?
       @inbox.conversations.where("additional_attributes->>'in_reply_to' = ?", in_reply_to).first
     else
@@ -49,6 +49,20 @@ class Imap::ImapMailbox
     @inbound_mail.in_reply_to
   end
 
+  def find_message_by_references
+    message_to_return = nil
+
+    return if @inbound_mail.references.blank?
+
+    references = @inbound_mail.references
+
+    references.each do |message_id|
+      message = @inbox.messages.find_by(source_id: message_id)
+      message_to_return = message if message.present?
+    end
+    message_to_return
+  end
+
   def find_or_create_conversation
     @conversation = find_conversation_by_in_reply_to || ::Conversation.create!({ account_id: @account.id,
                                                                                  inbox_id: @inbox.id,
diff --git a/spec/fixtures/files/references.eml b/spec/fixtures/files/references.eml
new file mode 100644
index 000000000..3cbf59b3c
--- /dev/null
+++ b/spec/fixtures/files/references.eml
@@ -0,0 +1,16 @@
+From: Sony Mathew <sony@chatwoot.com>
+Mime-Version: 1.0 (Apple Message framework v1244.3)
+Content-Type: multipart/alternative; boundary="Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74"
+Subject: Discussion: Let's debate these attachments
+Date: Tue, 20 Apr 2020 04:20:20 -0400
+In-Reply-To: <4e6e35f5a38b4_479f13bb90078178@small-app-01.mail>
+References: <4e6e35f5a38b4_479f13bb90078178@small-app-01.mail> <test-reference-id>
+Message-Id: <0CB459E0-0336-41DA-BC88-E6E28C697DDBF@chatwoot.com>
+X-Mailer: Apple Mail (2.1244.3)
+
+--Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+  charset=utf-8
+
+References Email
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index 49b51b45f..d741440c7 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -83,11 +83,34 @@ RSpec.describe Imap::ImapMailbox do
       let(:reply_mail) do
         create_inbound_email_from_mail(from: 'email@gmail.com', to: 'imap@gmail.com', subject: 'Hello!', in_reply_to: 'test-in-reply-to')
       end
+      let(:references_email) { create_inbound_email_from_fixture('references.eml') }
 
       it 'creates new email conversation with incoming in-reply-to' do
         class_instance.process(reply_mail.mail, channel)
         expect(conversation.additional_attributes['in_reply_to']).to eq(reply_mail.mail.in_reply_to)
       end
+
+      it 'append email to conversation with references id' do
+        inbox = Inbox.last
+        message = create(
+          :message,
+          content: 'Incoming Message',
+          message_type: 'incoming',
+          inbox: inbox,
+          source_id: 'test-reference-id',
+          account: account,
+          conversation: conversation
+        )
+        conversation = message.conversation
+
+        expect(conversation.messages.size).to eq(1)
+
+        class_instance.process(references_email.mail, inbox.channel)
+
+        expect(conversation.messages.size).to eq(2)
+        expect(conversation.messages.last.content).to eq('References Email')
+        expect(references_email.mail.references).to include('test-reference-id')
+      end
     end
   end
 end

From 68f82c11a5a311ff2d5366eb32c9f56e1e634776 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 1 Jun 2023 13:26:02 -0700
Subject: [PATCH 49/93] Revert "fix: Updates editor to fix the extra slash
 issue [cw-1505][cw-1526] (#7091)" (#7238)

This reverts commit 1d0930ef63908677117f3cb270741f3980e99227.
---
 yarn.lock | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2d05808cc..323c690c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2180,9 +2180,8 @@
 
 "@chatwoot/prosemirror-schema@https://github.com/chatwoot/prosemirror-schema.git":
   version "1.0.0"
-  resolved "https://github.com/chatwoot/prosemirror-schema.git#218f22b79d10f0a1240a125b0887b19186205ea6"
+  resolved "https://github.com/chatwoot/prosemirror-schema.git#b937c3cb44210b7d251daf766988758975befec7"
   dependencies:
-    markdown-it-sup "^1.0.0"
     prosemirror-commands "^1.1.4"
     prosemirror-dropcursor "^1.3.2"
     prosemirror-gapcursor "^1.1.5"
@@ -12293,11 +12292,6 @@ markdown-it-link-attributes@^4.0.1:
   resolved "https://registry.yarnpkg.com/markdown-it-link-attributes/-/markdown-it-link-attributes-4.0.1.tgz#25751f2cf74fd91f0a35ba7b3247fa45f2056d88"
   integrity sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ==
 
-markdown-it-sup@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz#cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3"
-  integrity sha512-E32m0nV9iyhRR7CrhnzL5msqic7rL1juWre6TQNxsnApg7Uf+F97JOKxUijg5YwXz86lZ0mqfOnutoryyNdntQ==
-
 markdown-it@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"

From f28533bc47308284ea1574143719e6cd48e9f593 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 2 Jun 2023 11:11:55 +0530
Subject: [PATCH 50/93] feat(perf): update query to reduce N+1 impact [CW-1926]
 (#7228)

* feat: update query to reduce N+1 impact

* feat: remove channel eager loading

fixes the error: ActiveRecord::EagerLoadPolymorphicError Exception: Cannot eagerly load the polymorphic association :channel

* test: fix search test

* chore: revert change
---
 app/finders/conversation_finder.rb                          | 6 +++---
 .../v1/conversations/partials/_conversation.json.jbuilder   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 7ec0a6d30..cadbb4644 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -155,9 +155,9 @@ class ConversationFinder
   end
 
   def conversations
-    @conversations = @conversations.includes(
-      :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox
-    )
+    @conversations = @conversations.includes(:taggings, :inbox,
+                                             { assignee: [{ account_users: [:account] }, { avatar_attachment: [:blob] }] },
+                                             { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox, :messages)
     sort_by = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['latest']
     @conversations.send(sort_by).page(current_page)
   end
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 63e1f22fb..82b9caacf 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -22,7 +22,7 @@ if conversation.messages.first.blank?
 elsif conversation.unread_incoming_messages.count.zero?
   json.messages [conversation.messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last.try(:push_event_data)]
 else
-  json.messages conversation.unread_messages.includes([:user, { attachments: [{ file_attachment: [:blob] }] }]).last(10).map(&:push_event_data)
+  json.messages conversation.unread_messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last(10).map(&:push_event_data)
 end
 
 json.account_id conversation.account_id

From ca9d1087413b811b78d4a6efd74f4da064817592 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 2 Jun 2023 15:36:41 -0700
Subject: [PATCH 51/93] fix: Update documentation of filter APIs (#7245)

---
 swagger/paths/application/contacts/filter.yml |  63 +++---
 .../paths/application/conversation/filter.yml |  63 +++---
 swagger/swagger.json                          | 214 +++++++++---------
 3 files changed, 178 insertions(+), 162 deletions(-)

diff --git a/swagger/paths/application/contacts/filter.yml b/swagger/paths/application/contacts/filter.yml
index 39aa269d9..639784ea5 100644
--- a/swagger/paths/application/contacts/filter.yml
+++ b/swagger/paths/application/contacts/filter.yml
@@ -10,39 +10,42 @@ parameters:
   - name: page
     in: query
     type: integer
-  - name: payload
+  - name: body
     in: body
     required: true
     schema:
-      type: array
-      items:
-        type: object
-        properties:
-          attribute_key:
-            type: string
-            description: filter attribute name
-          filter_operator:
-            type: string
-            description: filter operator name
-            enum: [ equal_to, not_equal_to, contains, does_not_contain ]
-          values:
-            type: array
-            items:
-              type: string
-            description: array of the attribute values to filter
-          query_operator:
-            type: string
-            description: query operator name
-            enum: [ AND, OR ]
-      example:
-        - attribute_key: 'name'
-          filter_operator: 'equal_to'
-          values: ['en']
-          query_operator: 'AND'
-        - attribute_key: 'country_code'
-          filter_operator: 'equal_to'
-          values: ['us']
-          query_operator: nil
+      type: object
+      properties:
+        payload:
+          type: array
+          items:
+            type: object
+            properties:
+              attribute_key:
+                type: string
+                description: filter attribute name
+              filter_operator:
+                type: string
+                description: filter operator name
+                enum: [ equal_to, not_equal_to, contains, does_not_contain ]
+              values:
+                type: array
+                items:
+                  type: string
+                description: array of the attribute values to filter
+              query_operator:
+                type: string
+                description: query operator name
+              enum: [ AND, OR ]
+          example:
+            - attribute_key: 'name'
+              filter_operator: 'equal_to'
+              values: ['en']
+              query_operator: 'AND'
+            - attribute_key: 'country_code'
+              filter_operator: 'equal_to'
+              values: ['us']
+              query_operator: null
 
 responses:
   200:
diff --git a/swagger/paths/application/conversation/filter.yml b/swagger/paths/application/conversation/filter.yml
index 3ef141145..4ee5f5d54 100644
--- a/swagger/paths/application/conversation/filter.yml
+++ b/swagger/paths/application/conversation/filter.yml
@@ -10,39 +10,42 @@ parameters:
   - name: page
     in: query
     type: integer
-  - name: payload
+  - name: body
     in: body
     required: true
     schema:
-      type: array
-      items:
-        type: object
-        properties:
-          attribute_key:
-            type: string
-            description: filter attribute name
-          filter_operator:
-            type: string
-            description: filter operator name
-            enum: [ equal_to, not_equal_to, contains, does_not_contain ]
-          values:
-            type: array
-            items:
-              type: string
-            description: array of the attribute values to filter
-          query_operator:
-            type: string
-            description: query operator name
-            enum: [ AND, OR ]
-      example:
-        - attribute_key: 'browser_language'
-          filter_operator: 'not_eq'
-          values: ['en']
-          query_operator: 'AND'
-        - attribute_key: 'status'
-          filter_operator: 'eq'
-          values: ['pending']
-          query_operator: nil
+      type: object
+      properties:
+        payload:
+          type: array
+          items:
+            type: object
+            properties:
+              attribute_key:
+                type: string
+                description: filter attribute name
+              filter_operator:
+                type: string
+                description: filter operator name
+                enum: [ equal_to, not_equal_to, contains, does_not_contain ]
+              values:
+                type: array
+                items:
+                  type: string
+                description: array of the attribute values to filter
+              query_operator:
+                type: string
+                description: query operator name
+                enum: [ AND, OR ]
+          example:
+            - attribute_key: 'browser_language'
+              filter_operator: 'not_eq'
+              values: ['en']
+              query_operator: 'AND'
+            - attribute_key: 'status'
+              filter_operator: 'eq'
+              values: ['pending']
+              query_operator: null
 
 responses:
   200:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index c6583cb1e..bf39397a6 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2014,63 +2014,68 @@
             "type": "integer"
           },
           {
-            "name": "payload",
+            "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "attribute_key": {
-                    "type": "string",
-                    "description": "filter attribute name"
+              "type": "object",
+              "properties": {
+                "payload": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "attribute_key": {
+                        "type": "string",
+                        "description": "filter attribute name"
+                      },
+                      "filter_operator": {
+                        "type": "string",
+                        "description": "filter operator name",
+                        "enum": [
+                          "equal_to",
+                          "not_equal_to",
+                          "contains",
+                          "does_not_contain"
+                        ]
+                      },
+                      "values": {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        },
+                        "description": "array of the attribute values to filter"
+                      },
+                      "query_operator": {
+                        "type": "string",
+                        "description": "query operator name"
+                      },
+                      "enum": [
+                        "AND",
+                        "OR"
+                      ]
+                    }
                   },
-                  "filter_operator": {
-                    "type": "string",
-                    "description": "filter operator name",
-                    "enum": [
-                      "equal_to",
-                      "not_equal_to",
-                      "contains",
-                      "does_not_contain"
-                    ]
-                  },
-                  "values": {
-                    "type": "array",
-                    "items": {
-                      "type": "string"
+                  "example": [
+                    {
+                      "attribute_key": "name",
+                      "filter_operator": "equal_to",
+                      "values": [
+                        "en"
+                      ],
+                      "query_operator": "AND"
                     },
-                    "description": "array of the attribute values to filter"
-                  },
-                  "query_operator": {
-                    "type": "string",
-                    "description": "query operator name",
-                    "enum": [
-                      "AND",
-                      "OR"
-                    ]
-                  }
+                    {
+                      "attribute_key": "country_code",
+                      "filter_operator": "equal_to",
+                      "values": [
+                        "us"
+                      ],
+                      "query_operator": null
+                    }
+                  ]
                 }
-              },
-              "example": [
-                {
-                  "attribute_key": "name",
-                  "filter_operator": "equal_to",
-                  "values": [
-                    "en"
-                  ],
-                  "query_operator": "AND"
-                },
-                {
-                  "attribute_key": "country_code",
-                  "filter_operator": "equal_to",
-                  "values": [
-                    "us"
-                  ],
-                  "query_operator": "nil"
-                }
-              ]
+              }
             }
           }
         ],
@@ -2907,63 +2912,68 @@
             "type": "integer"
           },
           {
-            "name": "payload",
+            "name": "body",
             "in": "body",
             "required": true,
             "schema": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "attribute_key": {
-                    "type": "string",
-                    "description": "filter attribute name"
+              "type": "object",
+              "properties": {
+                "payload": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "attribute_key": {
+                        "type": "string",
+                        "description": "filter attribute name"
+                      },
+                      "filter_operator": {
+                        "type": "string",
+                        "description": "filter operator name",
+                        "enum": [
+                          "equal_to",
+                          "not_equal_to",
+                          "contains",
+                          "does_not_contain"
+                        ]
+                      },
+                      "values": {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        },
+                        "description": "array of the attribute values to filter"
+                      },
+                      "query_operator": {
+                        "type": "string",
+                        "description": "query operator name",
+                        "enum": [
+                          "AND",
+                          "OR"
+                        ]
+                      }
+                    }
                   },
-                  "filter_operator": {
-                    "type": "string",
-                    "description": "filter operator name",
-                    "enum": [
-                      "equal_to",
-                      "not_equal_to",
-                      "contains",
-                      "does_not_contain"
-                    ]
-                  },
-                  "values": {
-                    "type": "array",
-                    "items": {
-                      "type": "string"
+                  "example": [
+                    {
+                      "attribute_key": "browser_language",
+                      "filter_operator": "not_eq",
+                      "values": [
+                        "en"
+                      ],
+                      "query_operator": "AND"
                     },
-                    "description": "array of the attribute values to filter"
-                  },
-                  "query_operator": {
-                    "type": "string",
-                    "description": "query operator name",
-                    "enum": [
-                      "AND",
-                      "OR"
-                    ]
-                  }
+                    {
+                      "attribute_key": "status",
+                      "filter_operator": "eq",
+                      "values": [
+                        "pending"
+                      ],
+                      "query_operator": null
+                    }
+                  ]
                 }
-              },
-              "example": [
-                {
-                  "attribute_key": "browser_language",
-                  "filter_operator": "not_eq",
-                  "values": [
-                    "en"
-                  ],
-                  "query_operator": "AND"
-                },
-                {
-                  "attribute_key": "status",
-                  "filter_operator": "eq",
-                  "values": [
-                    "pending"
-                  ],
-                  "query_operator": "nil"
-                }
-              ]
+              }
             }
           }
         ],

From 09971fd613369d4765500b8a2092632e371b7814 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Sat, 3 Jun 2023 07:33:36 +0530
Subject: [PATCH 52/93] fix: Wrap references string into array (#7243)

---
 app/mailboxes/imap/imap_mailbox.rb       |  2 +-
 spec/mailboxes/imap/imap_mailbox_spec.rb | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index f811eedfa..71e3d6ec0 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -54,7 +54,7 @@ class Imap::ImapMailbox
 
     return if @inbound_mail.references.blank?
 
-    references = @inbound_mail.references
+    references = Array.wrap(@inbound_mail.references)
 
     references.each do |message_id|
       message = @inbox.messages.find_by(source_id: message_id)
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index d741440c7..3957ac5ab 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -111,6 +111,29 @@ RSpec.describe Imap::ImapMailbox do
         expect(conversation.messages.last.content).to eq('References Email')
         expect(references_email.mail.references).to include('test-reference-id')
       end
+
+      it 'append email to conversation with reference id string' do
+        inbox = Inbox.last
+        message = create(
+          :message,
+          content: 'Incoming Message',
+          message_type: 'incoming',
+          inbox: inbox,
+          source_id: 'test-reference-id-2',
+          account: account,
+          conversation: conversation
+        )
+        conversation = message.conversation
+
+        expect(conversation.messages.size).to eq(1)
+
+        references_email.mail.references = 'test-reference-id-2'
+        class_instance.process(references_email.mail, inbox.channel)
+
+        expect(conversation.messages.size).to eq(2)
+        expect(conversation.messages.last.content).to eq('References Email')
+        expect(references_email.mail.references).to include('test-reference-id-2')
+      end
     end
   end
 end

From 12cb97db5f9abd01141c2778c0887ebc4e0ca9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20St=C3=B6r?= <marcelstoer@users.noreply.github.com>
Date: Mon, 5 Jun 2023 10:49:35 +0200
Subject: [PATCH 53/93] fix: Quote database env variables (#7216)

Database credentials, and passwords, in particular, can easily contain characters that are reserved in YAML and must be quoted.
Example: a case with a password starting with ']'.
---
 config/database.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/database.yml b/config/database.yml
index 5dfaa14b1..5cd278f8d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -8,21 +8,21 @@ default: &default
   variables:
     # we are setting this value to be close to the racktimeout value. we will iterate and reduce this value going forward
     statement_timeout: <%= ENV["POSTGRES_STATEMENT_TIMEOUT"] || "14s" %>
-    
+
 development:
   <<: *default
-  database: <%= ENV.fetch('POSTGRES_DATABASE', 'chatwoot_dev') %>
-  username: <%= ENV.fetch('POSTGRES_USERNAME', 'postgres') %>
-  password: <%= ENV.fetch('POSTGRES_PASSWORD', '') %>
+  database: "<%= ENV.fetch('POSTGRES_DATABASE', 'chatwoot_dev') %>"
+  username: "<%= ENV.fetch('POSTGRES_USERNAME', 'postgres') %>"
+  password: "<%= ENV.fetch('POSTGRES_PASSWORD', '') %>"
 
 test:
   <<: *default
-  database: <%= ENV.fetch('POSTGRES_DATABASE', 'chatwoot_test') %>
-  username: <%= ENV.fetch('POSTGRES_USERNAME', 'postgres') %>
-  password: <%= ENV.fetch('POSTGRES_PASSWORD', '') %>
+  database: "<%= ENV.fetch('POSTGRES_DATABASE', 'chatwoot_test') %>"
+  username: "<%= ENV.fetch('POSTGRES_USERNAME', 'postgres') %>"
+  password: "<%= ENV.fetch('POSTGRES_PASSWORD', '') %>"
 
 production:
   <<: *default
-  database: <%= ENV.fetch('POSTGRES_DATABASE', 'chatwoot_production') %>
-  username: <%= ENV.fetch('POSTGRES_USERNAME', 'chatwoot_prod') %>
-  password: <%= ENV.fetch('POSTGRES_PASSWORD', 'chatwoot_prod') %>
+  database: "<%= ENV.fetch('POSTGRES_DATABASE', 'chatwoot_production') %>"
+  username: "<%= ENV.fetch('POSTGRES_USERNAME', 'chatwoot_prod') %>"
+  password: "<%= ENV.fetch('POSTGRES_PASSWORD', 'chatwoot_prod') %>"

From 9203b097d232e192576574ee8860102da6741c90 Mon Sep 17 00:00:00 2001
From: TOMMY <memorycancel@gmail.com>
Date: Mon, 5 Jun 2023 20:02:21 +0800
Subject: [PATCH 54/93] chore: Show chatwoot_edition in Instance details
 (#7200)

- Displays the chatwoot edition in the instance details
---
 .../super_admin/instance_statuses_controller.rb       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/controllers/super_admin/instance_statuses_controller.rb b/app/controllers/super_admin/instance_statuses_controller.rb
index e7b037099..7f43e63ca 100644
--- a/app/controllers/super_admin/instance_statuses_controller.rb
+++ b/app/controllers/super_admin/instance_statuses_controller.rb
@@ -5,6 +5,17 @@ class SuperAdmin::InstanceStatusesController < SuperAdmin::ApplicationController
     sha
     postgres_status
     redis_metrics
+    chatwoot_edition
+  end
+
+  def chatwoot_edition
+    @metrics['Chatwoot edition'] = if ChatwootApp.enterprise?
+                                     'Enterprise'
+                                   elsif ChatwootApp.custom?
+                                     'Custom'
+                                   else
+                                     'Community'
+                                   end
   end
 
   def chatwoot_version

From 9f3d155822ef54b66cfdfc5adbe6dcde181ad9f5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 5 Jun 2023 18:56:15 +0530
Subject: [PATCH 55/93] feat: Add size limit action (#7253)

* chore: update browserlist

* feat: add size limit action

* feat: set limits

* feat: add size limit in CI

* chore: remove railsenv

* chore: update limits
---
 .github/workflows/size-limit.yml | 38 ++++++++++++++
 package.json                     | 15 +++++-
 yarn.lock                        | 90 ++++++++++++++++++++++++++++----
 3 files changed, 131 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/size-limit.yml

diff --git a/.github/workflows/size-limit.yml b/.github/workflows/size-limit.yml
new file mode 100644
index 000000000..efe497157
--- /dev/null
+++ b/.github/workflows/size-limit.yml
@@ -0,0 +1,38 @@
+name: Run Size Limit Check
+
+on:
+  pull_request:
+    branches:
+      - develop
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: yarn
+        run: yarn install
+
+      - name: Strip enterprise code
+        run: |
+          rm -rf enterprise
+          rm -rf spec/enterprise
+
+      - name: Run asset compile
+        run: bundle exec rake assets:precompile
+
+      - name: Size Check
+        run: yarn run size
diff --git a/package.json b/package.json
index ae1437df6..a5b927d3b 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,19 @@
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
     "ruby:prettier": "bundle exec rubocop -a",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "size": "size-limit"
   },
+  "size-limit": [
+    {
+      "path": "public/packs/js/widget-*.js",
+      "limit": "270 KB"
+    },
+    {
+      "path": "public/packs/js/sdk.js",
+      "limit": "40 KB"
+    }
+  ],
   "dependencies": {
     "@braid/vue-formulate": "^2.5.2",
     "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git",
@@ -87,6 +98,7 @@
     "@babel/core": "7.13.16",
     "@babel/plugin-proposal-class-properties": "7.13.0",
     "@babel/preset-env": "7.13.15",
+    "@size-limit/file": "^8.2.4",
     "@storybook/addon-actions": "6.5.9",
     "@storybook/addon-docs": "^6.5.9",
     "@storybook/addon-essentials": "6.5.9",
@@ -121,6 +133,7 @@
     "lint-staged": "10.5.4",
     "prettier": "^1.16.4",
     "rimraf": "^3.0.0",
+    "size-limit": "^8.2.4",
     "vue-jest": "4",
     "webpack-dev-server": "^3"
   },
diff --git a/yarn.lock b/yarn.lock
index 323c690c7..69a4c7108 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2917,6 +2917,13 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@size-limit/file@^8.2.4":
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/@size-limit/file/-/file-8.2.4.tgz#3624527cc9644c700697322d533e157b4a809a2b"
+  integrity sha512-xLuF97W7m7lxrRJvqXRlxO/4t7cpXtfxOnjml/t4aRVUCMXLdyvebRr9OM4jjoK8Fmiz8jomCbETUCI3jVhLzA==
+  dependencies:
+    semver "7.3.8"
+
 "@stdlib/array-float32@^0.0.x":
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/@stdlib/array-float32/-/array-float32-0.0.6.tgz#7a1c89db3c911183ec249fa32455abd9328cfa27"
@@ -5604,6 +5611,14 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 app-root-dir@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/app-root-dir/-/app-root-dir-1.0.2.tgz#38187ec2dea7577fff033ffcb12172692ff6e118"
@@ -6509,6 +6524,11 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
+bytes-iec@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/bytes-iec/-/bytes-iec-3.1.1.tgz#94cd36bf95c2c22a82002c247df8772d1d591083"
+  integrity sha512-fey6+4jDK7TFtFg/klGSvNKJctyU7n2aQdnM+CO0ruLPbqqMOM8Tio0Pc+deqUeVKX1tL5DQep1zQ7+37aTAsA==
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -6676,15 +6696,10 @@ 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.30001214:
-  version "1.0.30001271"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz"
-  integrity sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==
-
-caniuse-lite@^1.0.30001449:
-  version "1.0.30001481"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912"
-  integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001214, caniuse-lite@^1.0.30001449:
+  version "1.0.30001494"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001494.tgz"
+  integrity sha512-sY2B5Qyl46ZzfYDegrl8GBCzdawSLT4ThM9b9F+aDYUrAG2zCOyMbd2Tq34mS1g4ZKBfjRlzOohQMxx28x6wJg==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -6843,6 +6858,21 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -9474,7 +9504,7 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@^2.1.2, fsevents@~2.3.1:
+fsevents@^2.1.2, fsevents@~2.3.1, fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -9620,7 +9650,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -11853,6 +11883,11 @@ libphonenumber-js@^1.10.24:
   resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.24.tgz#a1744cf29df86d5a587562ea28dde12320eb6ab6"
   integrity sha512-3Dk8f5AmrcWqg+oHhmm9hwSTqpWHBdSqsHmjCJGroULFubi0+x7JEIGmRZCuL3TI8Tx39xaKqfnhsDQ4ALa/Nw==
 
+lilconfig@^2.0.6:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
+  integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -12781,6 +12816,13 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+nanospinner@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/nanospinner/-/nanospinner-1.1.0.tgz#d17ff621cb1784b0a206b400da88a0ef6db39b97"
+  integrity sha512-yFvNYMig4AthKYfHFl1sLj7B2nkHL4lzdig4osvl9/LdGbXwrdFRoqBS98gsEsOakr0yH+r5NZ/1Y9gdVB8trA==
+  dependencies:
+    picocolors "^1.0.0"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -15209,6 +15251,13 @@ readdirp@~3.5.0:
   dependencies:
     picomatch "^2.2.1"
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 realistic-structured-clone@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/realistic-structured-clone/-/realistic-structured-clone-3.0.0.tgz#7b518049ce2dad41ac32b421cd297075b00e3e35"
@@ -15906,6 +15955,13 @@ semver@7.3.5, semver@^7.3.2, semver@^7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -16102,6 +16158,18 @@ sisteransi@^1.0.5:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
+size-limit@^8.2.4:
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/size-limit/-/size-limit-8.2.4.tgz#0ab0df7cbc89007d544a50b451f5fb4d110694ca"
+  integrity sha512-Un16nSreD1v2CYwSorattiJcHuAWqXvg4TsGgzpjnoByqQwsSfCIEQHuaD14HNStzredR8cdsO9oGH91ibypTA==
+  dependencies:
+    bytes-iec "^3.1.1"
+    chokidar "^3.5.3"
+    globby "^11.1.0"
+    lilconfig "^2.0.6"
+    nanospinner "^1.1.0"
+    picocolors "^1.0.0"
+
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"

From b333d0c986b375fab8d75787c928c359bc4eb9c9 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 5 Jun 2023 19:21:47 +0530
Subject: [PATCH 56/93] feat: Attachments view (#7156)

* feat: Attachments view with key shortcuts and dynamically updates when user delete or sent new attachments

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../dashboard/api/inbox/conversation.js       |   4 +
 .../api/specs/inbox/conversation.spec.js      |   7 +
 .../scss/widgets/_conversation-view.scss      |  19 +-
 .../widgets/conversation/Message.vue          |  26 +--
 .../widgets/conversation/MessagesView.vue     |   5 +
 .../conversation/bubble/ImageAudioVideo.vue   | 106 +++++++++
 .../conversation/components/GalleryView.vue   | 201 ++++++++++++++++++
 .../store/modules/conversations/actions.js    |  18 ++
 .../store/modules/conversations/getters.js    |   5 +
 .../store/modules/conversations/index.js      |  46 ++++
 .../specs/conversations/actions.spec.js       |  43 +++-
 .../specs/conversations/getters.spec.js       |  30 +++
 .../specs/conversations/mutations.spec.js     | 117 ++++++++++
 .../dashboard/store/mutation-types.js         |   4 +
 .../shared/helpers/KeyboardHelpers.js         |   8 +
 15 files changed, 607 insertions(+), 32 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue

diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index bee3cd23b..94cc81354 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -127,6 +127,10 @@ class ConversationApi extends ApiClient {
       user_ids: userIds,
     });
   }
+
+  getAllAttachments(conversationId) {
+    return axios.get(`${this.url}/${conversationId}/attachments`);
+  }
 }
 
 export default new ConversationApi();
diff --git a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
index d276b8053..08343b69c 100644
--- a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
+++ b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
@@ -210,5 +210,12 @@ describe('#ConversationAPI', () => {
         { params: { page: payload.page } }
       );
     });
+
+    it('#getAllAttachments', () => {
+      conversationAPI.getAllAttachments(1);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/conversations/1/attachments'
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 6c37e5677..f95ee8a65 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -29,13 +29,13 @@
     }
 
     .modal-image {
-      max-height: 90%;
-      max-width: 90%;
+      max-height: 80vh;
+      max-width: 80vw;
     }
 
     .modal-video {
-      max-height: 75vh;
-      max-width: 100%;
+      max-height: 80vh;
+      max-width: 80vw;
     }
 
     &::before {
@@ -53,16 +53,6 @@
       width: 100%;
     }
   }
-
-  .video {
-    .modal-container {
-      width: auto;
-
-      .modal--close {
-        z-index: var(--z-index-low);
-      }
-    }
-  }
 }
 
 .conversations-list-wrap {
@@ -400,4 +390,3 @@
     margin-bottom: 0;
   }
 }
-
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index dd51ea838..4df910cde 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -53,22 +53,11 @@
         </span>
         <div v-if="!isPending && hasAttachments">
           <div v-for="attachment in data.attachments" :key="attachment.id">
-            <bubble-image
-              v-if="attachment.file_type === 'image' && !hasImageError"
-              :url="attachment.data_url"
+            <bubble-image-audio-video
+              v-if="isAttachmentImageVideoAudio(attachment.file_type)"
+              :attachment="attachment"
               @error="onImageLoadError"
             />
-            <audio
-              v-else-if="attachment.file_type === 'audio'"
-              controls
-              class="skip-context-menu"
-            >
-              <source :src="`${attachment.data_url}?t=${Date.now()}`" />
-            </audio>
-            <bubble-video
-              v-else-if="attachment.file_type === 'video'"
-              :url="attachment.data_url"
-            />
             <bubble-location
               v-else-if="attachment.file_type === 'location'"
               :latitude="attachment.coordinates_lat"
@@ -144,11 +133,12 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import BubbleActions from './bubble/Actions';
 import BubbleFile from './bubble/File';
 import BubbleImage from './bubble/Image';
+import BubbleVideo from './bubble/Video';
+import BubbleImageAudioVideo from './bubble/ImageAudioVideo';
 import BubbleIntegration from './bubble/Integration.vue';
 import BubbleLocation from './bubble/Location';
 import BubbleMailHead from './bubble/MailHead';
 import BubbleText from './bubble/Text';
-import BubbleVideo from './bubble/Video.vue';
 import BubbleContact from './bubble/Contact';
 import Spinner from 'shared/components/Spinner';
 import ContextMenu from 'dashboard/modules/conversations/components/MessageContextMenu';
@@ -165,11 +155,12 @@ export default {
     BubbleActions,
     BubbleFile,
     BubbleImage,
+    BubbleVideo,
+    BubbleImageAudioVideo,
     BubbleIntegration,
     BubbleLocation,
     BubbleMailHead,
     BubbleText,
-    BubbleVideo,
     BubbleContact,
     ContextMenu,
     Spinner,
@@ -447,6 +438,9 @@ export default {
     clearTimeout(this.higlightTimeout);
   },
   methods: {
+    isAttachmentImageVideoAudio(fileType) {
+      return ['image', 'audio', 'video'].includes(fileType);
+    },
     hasMediaAttachment(type) {
       if (this.hasAttachments && this.data.attachments.length > 0) {
         const { attachments = [{}] } = this.data;
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 23ebdc23e..5bac4a631 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -279,6 +279,7 @@ export default {
       if (newChat.id === oldChat.id) {
         return;
       }
+      this.fetchAllAttachmentsFromCurrentChat();
       this.selectedTweetId = null;
     },
   },
@@ -290,6 +291,7 @@ export default {
 
   mounted() {
     this.addScrollListener();
+    this.fetchAllAttachmentsFromCurrentChat();
   },
 
   beforeDestroy() {
@@ -298,6 +300,9 @@ export default {
   },
 
   methods: {
+    fetchAllAttachmentsFromCurrentChat() {
+      this.$store.dispatch('fetchAllAttachments', this.currentChat.id);
+    },
     removeBusListeners() {
       bus.$off(BUS_EVENTS.SCROLL_TO_MESSAGE, this.onScrollToMessage);
       bus.$off(BUS_EVENTS.SET_TWEET_REPLY, this.setSelectedTweet);
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
new file mode 100644
index 000000000..f703fefe2
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="message-text__wrap" :class="attachmentTypeClasses">
+    <img
+      v-if="isImage && !isImageError"
+      :src="attachment.data_url"
+      @click="onClick"
+      @error="onImgError()"
+    />
+    <video
+      v-if="isVideo"
+      :src="attachment.data_url"
+      muted
+      playsInline
+      @click="onClick"
+    />
+    <audio v-else-if="isAudio" controls class="skip-context-menu">
+      <source :src="`${attachment.data_url}?t=${Date.now()}`" />
+    </audio>
+    <gallery-view
+      v-if="show"
+      :show.sync="show"
+      :attachment="attachment"
+      :all-attachments="filteredCurrentChatAttachments"
+      @error="onImgError()"
+      @close="onClose"
+    />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { hasPressedCommand } from 'shared/helpers/KeyboardHelpers';
+
+import GalleryView from '../components/GalleryView';
+
+const ALLOWED_FILE_TYPES = {
+  IMAGE: 'image',
+  VIDEO: 'video',
+  AUDIO: 'audio',
+};
+
+export default {
+  components: {
+    GalleryView,
+  },
+  props: {
+    attachment: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      show: false,
+      isImageError: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      currentChatAttachments: 'getSelectedChatAttachments',
+    }),
+    isImage() {
+      return this.attachment.file_type === ALLOWED_FILE_TYPES.IMAGE;
+    },
+    isVideo() {
+      return this.attachment.file_type === ALLOWED_FILE_TYPES.VIDEO;
+    },
+    isAudio() {
+      return this.attachment.file_type === ALLOWED_FILE_TYPES.AUDIO;
+    },
+    attachmentTypeClasses() {
+      return {
+        image: this.isImage,
+        video: this.isVideo,
+      };
+    },
+    filteredCurrentChatAttachments() {
+      const attachments = this.currentChatAttachments.filter(attachment =>
+        ['image', 'video', 'audio'].includes(attachment.file_type)
+      );
+      return attachments;
+    },
+  },
+  watch: {
+    attachment() {
+      this.isImageError = false;
+    },
+  },
+  methods: {
+    onClose() {
+      this.show = false;
+    },
+    onClick(e) {
+      if (hasPressedCommand(e)) {
+        window.open(this.attachment.data_url, '_blank');
+        return;
+      }
+      this.show = true;
+    },
+    onImgError() {
+      this.isImageError = true;
+      this.$emit('error');
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
new file mode 100644
index 000000000..0f04c1d07
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
@@ -0,0 +1,201 @@
+<template>
+  <woot-modal full-width :show.sync="show" :on-close="onClose">
+    <div v-on-clickaway="onClose" class="gallery-modal--wrap" @click="onClose">
+      <div class="attachment-toggle--button">
+        <woot-button
+          v-if="hasMoreThanOneAttachment"
+          size="large"
+          variant="smooth"
+          color-scheme="secondary"
+          icon="chevron-left"
+          :disabled="activeImageIndex === 0"
+          @click.stop="
+            onClickChangeAttachment(
+              allAttachments[activeImageIndex - 1],
+              activeImageIndex - 1
+            )
+          "
+        />
+      </div>
+      <div class="attachments-viewer">
+        <div class="attachment-view">
+          <img
+            v-if="isImage"
+            :key="attachmentSrc"
+            :src="attachmentSrc"
+            class="modal-image skip-context-menu"
+            @click.stop
+          />
+          <video
+            v-if="isVideo"
+            :key="attachmentSrc"
+            :src="attachmentSrc"
+            controls
+            playsInline
+            class="modal-video skip-context-menu"
+            @click.stop
+          />
+          <audio
+            v-if="isAudio"
+            :key="attachmentSrc"
+            controls
+            class="skip-context-menu"
+            @click.stop
+          >
+            <source :src="`${attachmentSrc}?t=${Date.now()}`" />
+          </audio>
+        </div>
+      </div>
+      <div class="attachment-toggle--button">
+        <woot-button
+          v-if="hasMoreThanOneAttachment"
+          size="large"
+          variant="smooth"
+          color-scheme="secondary"
+          :disabled="activeImageIndex === allAttachments.length - 1"
+          icon="chevron-right"
+          @click.stop="
+            onClickChangeAttachment(
+              allAttachments[activeImageIndex + 1],
+              activeImageIndex + 1
+            )
+          "
+        />
+      </div>
+    </div>
+  </woot-modal>
+</template>
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+
+import {
+  isEscape,
+  hasPressedArrowLeftKey,
+  hasPressedArrowRightKey,
+} from 'shared/helpers/KeyboardHelpers';
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+
+const ALLOWED_FILE_TYPES = {
+  IMAGE: 'image',
+  VIDEO: 'video',
+  AUDIO: 'audio',
+};
+
+export default {
+  mixins: [eventListenerMixins, clickaway],
+  props: {
+    show: {
+      type: Boolean,
+      required: true,
+    },
+    attachment: {
+      type: Object,
+      required: true,
+    },
+    allAttachments: {
+      type: Array,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      attachmentSrc: '',
+      activeFileType: '',
+      activeImageIndex:
+        this.allAttachments.findIndex(
+          attachment => attachment.id === this.attachment.id
+        ) || 0,
+    };
+  },
+  computed: {
+    hasMoreThanOneAttachment() {
+      return this.allAttachments.length > 1;
+    },
+    isImage() {
+      return this.activeFileType === ALLOWED_FILE_TYPES.IMAGE;
+    },
+    isVideo() {
+      return this.activeFileType === ALLOWED_FILE_TYPES.VIDEO;
+    },
+    isAudio() {
+      return this.activeFileType === ALLOWED_FILE_TYPES.AUDIO;
+    },
+  },
+  mounted() {
+    this.setImageAndVideoSrc(this.attachment);
+  },
+  methods: {
+    onClose() {
+      this.$emit('close');
+    },
+    onClickChangeAttachment(attachment, index) {
+      if (!attachment) {
+        return;
+      }
+      this.activeImageIndex = index;
+      this.setImageAndVideoSrc(attachment);
+    },
+    setImageAndVideoSrc(attachment) {
+      const { file_type: type } = attachment;
+      if (!Object.values(ALLOWED_FILE_TYPES).includes(type)) {
+        return;
+      }
+      this.attachmentSrc = attachment.data_url;
+      this.activeFileType = type;
+    },
+    onKeyDownHandler(e) {
+      if (isEscape(e)) {
+        this.onClose();
+      } else if (hasPressedArrowLeftKey(e)) {
+        this.onClickChangeAttachment(
+          this.allAttachments[this.activeImageIndex - 1],
+          this.activeImageIndex - 1
+        );
+      } else if (hasPressedArrowRightKey(e)) {
+        this.onClickChangeAttachment(
+          this.allAttachments[this.activeImageIndex + 1],
+          this.activeImageIndex + 1
+        );
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.gallery-modal--wrap {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  width: inherit;
+  height: inherit;
+
+  .attachments-viewer {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+
+    .attachment-view {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      img {
+        margin: 0 auto;
+      }
+
+      video {
+        margin: 0 auto;
+      }
+    }
+  }
+
+  .attachment-toggle--button {
+    width: var(--space-mega);
+    min-width: var(--space-mega);
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index a5d4a25df..8db97fc88 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -86,6 +86,18 @@ const actions = {
     }
   },
 
+  fetchAllAttachments: async ({ commit }, conversationId) => {
+    try {
+      const { data } = await ConversationApi.getAllAttachments(conversationId);
+      commit(types.SET_ALL_ATTACHMENTS, {
+        id: conversationId,
+        data: data.payload,
+      });
+    } catch (error) {
+      // Handle error
+    }
+  },
+
   syncActiveConversationMessages: async (
     { commit, state, dispatch },
     { conversationId }
@@ -247,6 +259,10 @@ const actions = {
         ...response.data,
         status: MESSAGE_STATUS.SENT,
       });
+      commit(types.ADD_CONVERSATION_ATTACHMENTS, {
+        ...response.data,
+        status: MESSAGE_STATUS.SENT,
+      });
     } catch (error) {
       const errorMessage = error.response
         ? error.response.data.error
@@ -269,6 +285,7 @@ const actions = {
         conversationId: message.conversation_id,
         canReply: true,
       });
+      commit(types.ADD_CONVERSATION_ATTACHMENTS, message);
     }
   },
 
@@ -283,6 +300,7 @@ const actions = {
     try {
       const { data } = await MessageApi.delete(conversationId, messageId);
       commit(types.ADD_MESSAGE, data);
+      commit(types.DELETE_CONVERSATION_ATTACHMENTS, data);
     } catch (error) {
       throw new Error(error);
     }
diff --git a/app/javascript/dashboard/store/modules/conversations/getters.js b/app/javascript/dashboard/store/modules/conversations/getters.js
index b5b38da0f..0b1ca73d3 100644
--- a/app/javascript/dashboard/store/modules/conversations/getters.js
+++ b/app/javascript/dashboard/store/modules/conversations/getters.js
@@ -32,6 +32,11 @@ const getters = {
     );
     return selectedChat || {};
   },
+  getSelectedChatAttachments: (_state, _getters) => {
+    const selectedChat = _getters.getSelectedChat;
+    const { attachments } = selectedChat;
+    return attachments;
+  },
   getLastEmailInSelectedChat: (stage, _getters) => {
     const selectedChat = _getters.getSelectedChat;
     const { messages = [] } = selectedChat;
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 04db1fddf..2062b07da 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -3,6 +3,7 @@ import types from '../../mutation-types';
 import getters, { getSelectedChatConversation } from './getters';
 import actions from './actions';
 import { findPendingMessageIndex } from './helpers';
+import { MESSAGE_STATUS } from 'shared/constants/messages';
 import wootConstants from 'dashboard/constants/globals';
 import { BUS_EVENTS } from '../../../../shared/constants/busEvents';
 
@@ -56,6 +57,13 @@ export const mutations = {
       chat.messages.unshift(...data);
     }
   },
+  [types.SET_ALL_ATTACHMENTS](_state, { id, data }) {
+    if (data.length) {
+      const [chat] = _state.allConversations.filter(c => c.id === id);
+      Vue.set(chat, 'attachments', []);
+      chat.attachments.push(...data);
+    }
+  },
   [types.SET_MISSING_MESSAGES](_state, { id, data }) {
     const [chat] = _state.allConversations.filter(c => c.id === id);
     if (!chat) return;
@@ -115,6 +123,44 @@ export const mutations = {
     Vue.set(chat, 'muted', false);
   },
 
+  [types.ADD_CONVERSATION_ATTACHMENTS]({ allConversations }, message) {
+    const { conversation_id: conversationId } = message;
+    const [chat] = getSelectedChatConversation({
+      allConversations,
+      selectedChatId: conversationId,
+    });
+
+    if (!chat) return;
+
+    const isMessageSent =
+      message.status === MESSAGE_STATUS.SENT && message.attachments;
+    if (isMessageSent) {
+      message.attachments.forEach(attachment => {
+        if (!chat.attachments.some(a => a.id === attachment.id)) {
+          chat.attachments.push(attachment);
+        }
+      });
+    }
+  },
+
+  [types.DELETE_CONVERSATION_ATTACHMENTS]({ allConversations }, message) {
+    const { conversation_id: conversationId } = message;
+    const [chat] = getSelectedChatConversation({
+      allConversations,
+      selectedChatId: conversationId,
+    });
+
+    if (!chat) return;
+
+    const isMessageSent = message.status === MESSAGE_STATUS.SENT;
+    if (isMessageSent) {
+      const attachmentIndex = chat.attachments.findIndex(
+        a => a.message_id === message.id
+      );
+      if (attachmentIndex !== -1) chat.attachments.splice(attachmentIndex, 1);
+    }
+  },
+
   [types.ADD_MESSAGE]({ allConversations, selectedChatId }, message) {
     const { conversation_id: conversationId } = message;
     const [chat] = getSelectedChatConversation({
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
index b2d68c94f..5ff27c03e 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -204,6 +204,7 @@ describe('#actions', () => {
       ]);
     });
   });
+
   describe('#addMessage', () => {
     it('sends correct mutations if message is incoming', () => {
       const message = {
@@ -218,6 +219,7 @@ describe('#actions', () => {
           types.SET_CONVERSATION_CAN_REPLY,
           { conversationId: 1, canReply: true },
         ],
+        [types.ADD_CONVERSATION_ATTACHMENTS, message],
       ]);
     });
     it('sends correct mutations if message is not an incoming message', () => {
@@ -436,10 +438,13 @@ describe('#actions', () => {
 describe('#deleteMessage', () => {
   it('sends correct actions if API is success', async () => {
     const [conversationId, messageId] = [1, 1];
-    axios.delete.mockResolvedValue({ data: { id: 1, content: 'deleted' } });
+    axios.delete.mockResolvedValue({
+      data: { id: 1, content: 'deleted' },
+    });
     await actions.deleteMessage({ commit }, { conversationId, messageId });
     expect(commit.mock.calls).toEqual([
       [types.ADD_MESSAGE, { id: 1, content: 'deleted' }],
+      [types.DELETE_CONVERSATION_ATTACHMENTS, { id: 1, content: 'deleted' }],
     ]);
   });
   it('sends no actions if API is error', async () => {
@@ -554,4 +559,40 @@ describe('#addMentions', () => {
       ],
     ]);
   });
+
+  describe('#fetchAllAttachments', () => {
+    it('fetches all attachments', async () => {
+      axios.get.mockResolvedValue({
+        data: {
+          payload: [
+            {
+              id: 1,
+              message_id: 1,
+              file_type: 'image',
+              data_url: '',
+              thumb_url: '',
+            },
+          ],
+        },
+      });
+      await actions.fetchAllAttachments({ commit }, 1);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.SET_ALL_ATTACHMENTS,
+          {
+            id: 1,
+            data: [
+              {
+                id: 1,
+                message_id: 1,
+                file_type: 'image',
+                data_url: '',
+                thumb_url: '',
+              },
+            ],
+          },
+        ],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
index 2a012fd53..e874b05ec 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
@@ -305,4 +305,34 @@ describe('#getters', () => {
       });
     });
   });
+
+  describe('#getSelectedChatAttachments', () => {
+    it('Returns attachments in selected chat', () => {
+      const state = {};
+      const getSelectedChat = {
+        attachments: [
+          {
+            id: 1,
+            file_name: 'test1',
+          },
+          {
+            id: 2,
+            file_name: 'test2',
+          },
+        ],
+      };
+      expect(
+        getters.getSelectedChatAttachments(state, { getSelectedChat })
+      ).toEqual([
+        {
+          id: 1,
+          file_name: 'test1',
+        },
+        {
+          id: 2,
+          file_name: 'test2',
+        },
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
index 2c4bdb2cc..c7280c6f9 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
@@ -278,4 +278,121 @@ describe('#mutations', () => {
       expect(state.appliedFilters).toEqual([]);
     });
   });
+
+  describe('#SET_ALL_ATTACHMENTS', () => {
+    it('set all attachments', () => {
+      const state = {
+        allConversations: [{ id: 1 }],
+      };
+      const data = [{ id: 1, name: 'test' }];
+      mutations[types.SET_ALL_ATTACHMENTS](state, { id: 1, data });
+      expect(state.allConversations[0].attachments).toEqual(data);
+    });
+  });
+
+  describe('#ADD_CONVERSATION_ATTACHMENTS', () => {
+    it('add conversation attachments', () => {
+      const state = {
+        allConversations: [{ id: 1, attachments: [] }],
+      };
+      const message = {
+        conversation_id: 1,
+        status: 'sent',
+        attachments: [{ id: 1, name: 'test' }],
+      };
+
+      mutations[types.ADD_CONVERSATION_ATTACHMENTS](state, message);
+      expect(state.allConversations[0].attachments).toEqual(
+        message.attachments
+      );
+    });
+
+    it('should not add duplicate attachments', () => {
+      const state = {
+        allConversations: [
+          {
+            id: 1,
+            attachments: [{ id: 1, name: 'existing' }],
+          },
+        ],
+      };
+      const message = {
+        conversation_id: 1,
+        status: 'sent',
+        attachments: [
+          { id: 1, name: 'existing' },
+          { id: 2, name: 'new' },
+        ],
+      };
+
+      mutations[types.ADD_CONVERSATION_ATTACHMENTS](state, message);
+      expect(state.allConversations[0].attachments).toHaveLength(2);
+      expect(state.allConversations[0].attachments).toContainEqual({
+        id: 1,
+        name: 'existing',
+      });
+      expect(state.allConversations[0].attachments).toContainEqual({
+        id: 2,
+        name: 'new',
+      });
+    });
+
+    it('should not add attachments if chat not found', () => {
+      const state = {
+        allConversations: [{ id: 1, attachments: [] }],
+      };
+      const message = {
+        conversation_id: 2,
+        status: 'sent',
+        attachments: [{ id: 1, name: 'test' }],
+      };
+
+      mutations[types.ADD_CONVERSATION_ATTACHMENTS](state, message);
+      expect(state.allConversations[0].attachments).toHaveLength(0);
+    });
+  });
+
+  describe('#DELETE_CONVERSATION_ATTACHMENTS', () => {
+    it('delete conversation attachments', () => {
+      const state = {
+        allConversations: [{ id: 1, attachments: [{ id: 1, message_id: 1 }] }],
+      };
+      const message = {
+        conversation_id: 1,
+        status: 'sent',
+        id: 1,
+      };
+
+      mutations[types.DELETE_CONVERSATION_ATTACHMENTS](state, message);
+      expect(state.allConversations[0].attachments).toHaveLength(0);
+    });
+
+    it('should not delete attachments for non-matching message id', () => {
+      const state = {
+        allConversations: [{ id: 1, attachments: [{ id: 1, message_id: 1 }] }],
+      };
+      const message = {
+        conversation_id: 1,
+        status: 'sent',
+        id: 2,
+      };
+
+      mutations[types.DELETE_CONVERSATION_ATTACHMENTS](state, message);
+      expect(state.allConversations[0].attachments).toHaveLength(1);
+    });
+
+    it('should not delete attachments if chat not found', () => {
+      const state = {
+        allConversations: [{ id: 1, attachments: [{ id: 1, message_id: 1 }] }],
+      };
+      const message = {
+        conversation_id: 2,
+        status: 'sent',
+        id: 1,
+      };
+
+      mutations[types.DELETE_CONVERSATION_ATTACHMENTS](state, message);
+      expect(state.allConversations[0].attachments).toHaveLength(1);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index ae15ff572..2f73080d3 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -49,6 +49,10 @@ export default {
   UPDATE_CONVERSATION_LAST_ACTIVITY: 'UPDATE_CONVERSATION_LAST_ACTIVITY',
   SET_MISSING_MESSAGES: 'SET_MISSING_MESSAGES',
 
+  SET_ALL_ATTACHMENTS: 'SET_ALL_ATTACHMENTS',
+  ADD_CONVERSATION_ATTACHMENTS: 'ADD_CONVERSATION_ATTACHMENTS',
+  DELETE_CONVERSATION_ATTACHMENTS: 'DELETE_CONVERSATION_ATTACHMENTS',
+
   SET_CONVERSATION_CAN_REPLY: 'SET_CONVERSATION_CAN_REPLY',
 
   // Inboxes
diff --git a/app/javascript/shared/helpers/KeyboardHelpers.js b/app/javascript/shared/helpers/KeyboardHelpers.js
index 5ef9d9f6a..11e5af598 100644
--- a/app/javascript/shared/helpers/KeyboardHelpers.js
+++ b/app/javascript/shared/helpers/KeyboardHelpers.js
@@ -94,6 +94,14 @@ export const hasPressedArrowDownKey = e => {
   return e.keyCode === 40;
 };
 
+export const hasPressedArrowLeftKey = e => {
+  return e.keyCode === 37;
+};
+
+export const hasPressedArrowRightKey = e => {
+  return e.keyCode === 39;
+};
+
 export const hasPressedCommandPlusKKey = e => {
   return e.metaKey && e.keyCode === 75;
 };

From d03924b84670de2b7c9000cd59697e591e1bc89a Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 5 Jun 2023 20:27:28 +0530
Subject: [PATCH 57/93] feat: Enable sending template messages in webhooks
 (#7252)

fixes: https://github.com/chatwoot/chatwoot/issues/5291
---
 app/models/concerns/message_filter_helpers.rb |  2 +-
 spec/models/message_spec.rb                   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/message_filter_helpers.rb b/app/models/concerns/message_filter_helpers.rb
index 6f5a758f0..38124f347 100644
--- a/app/models/concerns/message_filter_helpers.rb
+++ b/app/models/concerns/message_filter_helpers.rb
@@ -6,7 +6,7 @@ module MessageFilterHelpers
   end
 
   def webhook_sendable?
-    incoming? || outgoing?
+    incoming? || outgoing? || template?
   end
 
   def slack_hook_sendable?
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index e44627666..f7dbc9cf8 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -31,6 +31,22 @@ RSpec.describe Message do
     it_behaves_like 'liqudable'
   end
 
+  describe 'message_filter_helpers' do
+    context 'when webhook_sendable?' do
+      [
+        { type: :incoming, expected: true },
+        { type: :outgoing, expected: true },
+        { type: :template, expected: true },
+        { type: :activity, expected: false }
+      ].each do |scenario|
+        it "returns #{scenario[:expected]} for #{scenario[:type]} message" do
+          message = create(:message, message_type: scenario[:type])
+          expect(message.webhook_sendable?).to eq(scenario[:expected])
+        end
+      end
+    end
+  end
+
   describe 'Check if message is a valid first reply' do
     it 'is valid if it is outgoing' do
       outgoing_message = create(:message, message_type: :outgoing)

From aae6081d7383e195f7df093b6d31861b12082cc2 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 5 Jun 2023 20:28:32 +0530
Subject: [PATCH 58/93] fix: check content disposition, for inline messages in
 mail (#7231)

---
 app/mailboxes/mailbox_helper.rb               | 50 +++++++++++++++++--
 app/presenters/mail_presenter.rb              |  2 +
 spec/fixtures/files/forwarder_email.eml       |  4 +-
 spec/fixtures/files/group_sender_support.eml  |  4 +-
 spec/fixtures/files/in_reply_to.eml           |  4 +-
 .../files/mail_with_inline_images.eml         | 47 +++++++++++++++++
 .../mail_with_plain_text_and_inline_image.eml | 33 ++++++++++++
 spec/fixtures/files/reply.eml                 |  4 +-
 .../files/reply_mail_without_uuid.eml         |  4 +-
 spec/fixtures/files/reply_to.eml              |  4 +-
 spec/fixtures/files/support.eml               |  6 +--
 spec/fixtures/files/support_in_reply_to.eml   |  4 +-
 spec/fixtures/files/support_uppercase.eml     |  6 +--
 .../files/support_without_sender_name.eml     |  4 +-
 spec/mailboxes/reply_mailbox_spec.rb          | 46 ++++++++++++++++-
 15 files changed, 194 insertions(+), 28 deletions(-)
 create mode 100644 spec/fixtures/files/mail_with_inline_images.eml
 create mode 100644 spec/fixtures/files/mail_with_plain_text_and_inline_image.eml

diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index fd812d7d4..f96266713 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -24,15 +24,55 @@ module MailboxHelper
     return if @message.blank?
 
     processed_mail.attachments.last(Message::NUMBER_OF_PERMITTED_ATTACHMENTS).each do |mail_attachment|
-      attachment = @message.attachments.new(
-        account_id: @conversation.account_id,
-        file_type: 'file'
-      )
-      attachment.file.attach(mail_attachment[:blob])
+      if inline_attachment?(mail_attachment)
+        embed_inline_image_source(mail_attachment)
+      else
+        attachment = @message.attachments.new(
+          account_id: @conversation.account_id,
+          file_type: 'file'
+        )
+        attachment.file.attach(mail_attachment[:blob])
+      end
     end
     @message.save!
   end
 
+  def embed_inline_image_source(mail_attachment)
+    current_mail = processed_mail.mail
+
+    if current_mail.html_part.present?
+      upload_inline_image(mail_attachment)
+    elsif current_mail.text_part.present?
+      embed_plain_text_email_with_inline_image(mail_attachment)
+    end
+  end
+
+  def upload_inline_image(mail_attachment)
+    content_id = mail_attachment[:original].cid
+
+    @message.content_attributes[:email][:html_content][:full] = processed_mail.serialized_data[:html_content][:full].gsub(
+      "cid:#{content_id}", inline_image_url(mail_attachment[:blob]).to_s
+    )
+    @message.save!
+  end
+
+  def inline_attachment?(mail_attachment)
+    mail_attachment[:original].inline?
+  end
+
+  def embed_plain_text_email_with_inline_image(mail_attachment)
+    attachment_name = mail_attachment[:original].filename
+
+    @message.content_attributes[:email][:text_content][:full] = processed_mail.serialized_data[:text_content][:reply].gsub(
+      "[image: #{attachment_name}]", "<img src=\"#{inline_image_url(mail_attachment[:blob])}\" alt=\"#{attachment_name}>\""
+    )
+    @message.save!
+  end
+
+  def inline_image_url(blob)
+    Rails.application.routes.url_helpers.url_for(blob)
+  end
+
   def create_contact
     @contact_inbox = ::ContactInboxWithContactBuilder.new(
       source_id: processed_mail.original_sender,
diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index 92676b0d6..98915c07f 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -70,6 +70,8 @@ class MailPresenter < SimpleDelegator
     }
   end
 
+  # check content disposition check
+  # if inline, upload to AWS and and take the URL
   def attachments
     # ref : https://github.com/gorails-screencasts/action-mailbox-action-text/blob/master/app/mailboxes/posts_mailbox.rb
     mail.attachments.map do |attachment|
diff --git a/spec/fixtures/files/forwarder_email.eml b/spec/fixtures/files/forwarder_email.eml
index fb6d427f9..c75d062c7 100644
--- a/spec/fixtures/files/forwarder_email.eml
+++ b/spec/fixtures/files/forwarder_email.eml
@@ -25,7 +25,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -395,7 +395,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
diff --git a/spec/fixtures/files/group_sender_support.eml b/spec/fixtures/files/group_sender_support.eml
index f13956104..9353718e0 100644
--- a/spec/fixtures/files/group_sender_support.eml
+++ b/spec/fixtures/files/group_sender_support.eml
@@ -26,7 +26,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -396,7 +396,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
diff --git a/spec/fixtures/files/in_reply_to.eml b/spec/fixtures/files/in_reply_to.eml
index 3a565ea9e..084009929 100644
--- a/spec/fixtures/files/in_reply_to.eml
+++ b/spec/fixtures/files/in_reply_to.eml
@@ -24,7 +24,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -394,7 +394,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
diff --git a/spec/fixtures/files/mail_with_inline_images.eml b/spec/fixtures/files/mail_with_inline_images.eml
new file mode 100644
index 000000000..2a7792ed1
--- /dev/null
+++ b/spec/fixtures/files/mail_with_inline_images.eml
@@ -0,0 +1,47 @@
+MIME-Version: 1.0
+Date: Wed, 31 May 2023 15:27:36 +0530
+Message-ID: <CAFkiBVzURp=z2g5nAevAtdQvFfxkLrpvTeDFcwFaGQhdo_-Mkg@mail.gmail.com>
+Subject: New inline image test email conversation
+From: Sony Mathew <sony@chatwoot.com>
+To: "Replies" <reply+6bdc3f4d-0bed-4515-a284-5d916fdde489@example.com>
+Content-Type: multipart/related; boundary="0000000000007a538405fcfa5967"
+
+--0000000000007a538405fcfa5967
+Content-Type: multipart/alternative; boundary="0000000000007a538205fcfa5966"
+
+--0000000000007a538205fcfa5966
+Content-Type: text/plain; charset="UTF-8"
+
+[image: ptrol.jpeg]
+
+HTML content and inline images
+
+--
+*Tejaswini Chile.*
+Software developer
+*Mob:8485827731 | *@tejaswini_chile <https://twitter.com/tejaswini_chile>
+
+--0000000000007a538205fcfa5966
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr"><img src=3D"cid:ii_libj9tsr0" alt=3D"ptrol.jpeg" width=3D"=
+286" height=3D"508"><div><br></div><div>Let&#39;s add no HTML content here,=
+ just plain text and images<br><div><br></div><span class=3D"gmail_signatur=
+e_prefix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature" data-sma=
+rtmail=3D"gmail_signature"><div dir=3D"ltr"><div><div dir=3D"ltr"><div><div=
+><b>Tejaswini Chile.</b><br></div><span style=3D"font-family:times new roma=
+n,serif"><span></span><span></span>Software developer</span><br></div><b>Mo=
+b:8485827731 |=C2=A0</b><a href=3D"https://twitter.com/tejaswini_chile" tar=
+get=3D"_blank">@tejaswini_chile</a></div></div></div></div></div></div>
+
+--0000000000007a538205fcfa5966--
+--0000000000007a538405fcfa5967
+Content-Type: image/jpeg; name="ptrol.jpeg"
+Content-Disposition: inline; filename="ptrol.jpeg"
+Content-Transfer-Encoding: base64
+X-Attachment-Id: ii_libj9tsr0
+Content-ID: <ii_libj9tsr0>
+
+
+--0000000000007a538405fcfa5967--
diff --git a/spec/fixtures/files/mail_with_plain_text_and_inline_image.eml b/spec/fixtures/files/mail_with_plain_text_and_inline_image.eml
new file mode 100644
index 000000000..b4ea01175
--- /dev/null
+++ b/spec/fixtures/files/mail_with_plain_text_and_inline_image.eml
@@ -0,0 +1,33 @@
+MIME-Version: 1.0
+Date: Wed, 31 May 2023 15:27:36 +0530
+Message-ID: <CAFkiBVzURp=z2g5nAevAtdQvFfxkLrpvTeDFcwFaGQhdo_-Mkg@mail.gmail.com>
+Subject: New inline image test email conversation
+From: Sony Mathew <sony@chatwoot.com>
+To: "Replies" <reply+6bdc3f4d-0bed-4515-a284-5d916fdde489@example.com>
+Content-Type: multipart/related; boundary="0000000000007a538405fcfa5967"
+
+--0000000000007a538405fcfa5967
+Content-Type: multipart/alternative; boundary="0000000000007a538205fcfa5966"
+
+--0000000000007a538205fcfa5966
+Content-Type: text/plain; charset="UTF-8"
+
+[image: ptrol.jpeg]
+
+Let's add no HTML content here, just plain text and images
+
+--
+*Tejaswini Chile.*
+Software developer
+*Mob:8485827731 | *@tejaswini_chile <https://twitter.com/tejaswini_chile>
+
+
+--0000000000007a538405fcfa5967
+Content-Type: image/jpeg; name="ptrol.jpeg"
+Content-Disposition: inline; filename="ptrol.jpeg"
+Content-Transfer-Encoding: base64
+X-Attachment-Id: ii_libj9tsr0
+Content-ID: <ii_libj9tsr0>
+
+
+--0000000000007a538405fcfa5967--
diff --git a/spec/fixtures/files/reply.eml b/spec/fixtures/files/reply.eml
index 1ab026aca..13f92cc90 100644
--- a/spec/fixtures/files/reply.eml
+++ b/spec/fixtures/files/reply.eml
@@ -25,7 +25,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -395,7 +395,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
diff --git a/spec/fixtures/files/reply_mail_without_uuid.eml b/spec/fixtures/files/reply_mail_without_uuid.eml
index c5ab3187b..790979734 100644
--- a/spec/fixtures/files/reply_mail_without_uuid.eml
+++ b/spec/fixtures/files/reply_mail_without_uuid.eml
@@ -25,7 +25,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -395,7 +395,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
diff --git a/spec/fixtures/files/reply_to.eml b/spec/fixtures/files/reply_to.eml
index 03ab4f87c..eae762d78 100644
--- a/spec/fixtures/files/reply_to.eml
+++ b/spec/fixtures/files/reply_to.eml
@@ -26,7 +26,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -396,7 +396,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
diff --git a/spec/fixtures/files/support.eml b/spec/fixtures/files/support.eml
index 5eee2ea12..68ea7d00b 100644
--- a/spec/fixtures/files/support.eml
+++ b/spec/fixtures/files/support.eml
@@ -25,7 +25,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -395,7 +395,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
@@ -628,4 +628,4 @@ r/Fxp3Y0d2/4tvsR95f/AAH7Gvwmn9rUHsOgUCg//9k=
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1--
 
---Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74--
\ No newline at end of file
+--Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74--
diff --git a/spec/fixtures/files/support_in_reply_to.eml b/spec/fixtures/files/support_in_reply_to.eml
index 7d90f37ee..3d005a957 100644
--- a/spec/fixtures/files/support_in_reply_to.eml
+++ b/spec/fixtures/files/support_in_reply_to.eml
@@ -26,7 +26,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -396,7 +396,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
diff --git a/spec/fixtures/files/support_uppercase.eml b/spec/fixtures/files/support_uppercase.eml
index 9354312ee..01a02262f 100644
--- a/spec/fixtures/files/support_uppercase.eml
+++ b/spec/fixtures/files/support_uppercase.eml
@@ -26,7 +26,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -396,7 +396,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
@@ -629,4 +629,4 @@ r/Fxp3Y0d2/4tvsR95f/AAH7Gvwmn9rUHsOgUCg//9k=
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1--
 
---Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74--
\ No newline at end of file
+--Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74--
diff --git a/spec/fixtures/files/support_without_sender_name.eml b/spec/fixtures/files/support_without_sender_name.eml
index c8d3f1829..a5da87454 100644
--- a/spec/fixtures/files/support_without_sender_name.eml
+++ b/spec/fixtures/files/support_without_sender_name.eml
@@ -25,7 +25,7 @@ Content-Type: multipart/related;
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar1.jpeg
 Content-Type: image/jpg;
   name="avatar1.jpeg"
@@ -395,7 +395,7 @@ mk8VWW5WRGJGAOaAP//Z
 
 --Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
 Content-Transfer-Encoding: base64
-Content-Disposition: inline;
+Content-Disposition: attachment;
   filename=avatar2.jpg
 Content-Type: image/jpg;
   x-unix-mode=0700;
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index 72fbd317d..d8d0991a8 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -62,7 +62,51 @@ RSpec.describe ReplyMailbox do
 
       it 'find channel with in-reply-to mail' do
         described_subject
-        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
+        expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
+      end
+    end
+
+    context 'with inline attachments' do
+      let(:mail_with_inline_images) { create_inbound_email_from_fixture('mail_with_inline_images.eml') }
+      let(:described_subject) { described_class.receive mail_with_inline_images }
+
+      before do
+        conversation.uuid = '6bdc3f4d-0bed-4515-a284-5d916fdde489'
+        conversation.save!
+
+        described_subject
+      end
+
+      it 'mail content contains img source' do
+        expect(conversation.messages.last.content).to include('HTML content and inline images')
+      end
+
+      it 'will not add the attachments' do
+        expect(conversation.messages.last.attachments.count).to eq(0)
+
+        html_full_content = conversation.messages.last.content_attributes[:email][:html_content][:full]
+        expect(html_full_content).to include('img')
+      end
+    end
+
+    context 'with inline attachments and plain text' do
+      let(:mail_with_plain_text_and_inline_image) { create_inbound_email_from_fixture('mail_with_plain_text_and_inline_image.eml') }
+      let(:described_subject) { described_class.receive mail_with_plain_text_and_inline_image }
+
+      before do
+        conversation.uuid = '6bdc3f4d-0bed-4515-a284-5d916fdde489'
+        conversation.save!
+
+        described_subject
+      end
+
+      it 'will not add the attachments' do
+        described_class.receive mail_with_plain_text_and_inline_image
+        text_full_content = conversation.messages.last.content_attributes[:email][:text_content][:full]
+
+        expect(text_full_content).to include('img')
+        expect(conversation.messages.last.content).to include("Let's add no HTML content here, just plain text and images")
+        expect(conversation.messages.last.attachments.count).to eq(0)
       end
     end
 

From 117d5301b4afdb1fde0bb407562ef314348f7bf7 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 5 Jun 2023 21:14:01 +0530
Subject: [PATCH 59/93] chore: API documentation updates for CSAT surveys
 (#7255)

- Expose conversation uuid in APIs
- swagger documentation for cast survey update via public/message/update endpoints
- swagger documentation for survey/responses/conversation_uuid endpoint

Fixes: #6328
---
 .../partials/_conversation.json.jbuilder      |  1 +
 .../api/v1/models/_conversation.json.jbuilder |  1 +
 .../api/v1/models/_conversation.json.jbuilder |  1 +
 .../accounts/conversations_controller_spec.rb |  1 +
 .../v1/inbox/conversations_controller_spec.rb |  1 +
 .../request/public/message/update_payload.yml | 20 ++++--
 swagger/index.yml                             |  3 +
 swagger/parameters/conversation_uuid.yml      |  5 ++
 swagger/parameters/index.yml                  |  3 +
 swagger/paths/index.yml                       | 10 +++
 swagger/paths/survey/show.yml                 |  9 +++
 swagger/swagger.json                          | 62 ++++++++++++++++++-
 12 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100644 swagger/parameters/conversation_uuid.yml
 create mode 100644 swagger/paths/survey/show.yml

diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 82b9caacf..84aa6dcff 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -26,6 +26,7 @@ else
 end
 
 json.account_id conversation.account_id
+json.uuid conversation.uuid
 json.additional_attributes conversation.additional_attributes
 json.agent_last_seen_at conversation.agent_last_seen_at.to_i
 json.assignee_last_seen_at conversation.assignee_last_seen_at.to_i
diff --git a/app/views/api/v1/models/_conversation.json.jbuilder b/app/views/api/v1/models/_conversation.json.jbuilder
index 0951892a6..3fa54bcd9 100644
--- a/app/views/api/v1/models/_conversation.json.jbuilder
+++ b/app/views/api/v1/models/_conversation.json.jbuilder
@@ -1,4 +1,5 @@
 json.id conversation.display_id
+json.uuid conversation.uuid
 json.created_at conversation.created_at.to_i
 json.contact do
   json.id conversation.contact.id
diff --git a/app/views/public/api/v1/models/_conversation.json.jbuilder b/app/views/public/api/v1/models/_conversation.json.jbuilder
index 29ec89e28..b0a464795 100644
--- a/app/views/public/api/v1/models/_conversation.json.jbuilder
+++ b/app/views/public/api/v1/models/_conversation.json.jbuilder
@@ -1,4 +1,5 @@
 json.id resource.display_id
+json.uuid resource.uuid
 json.inbox_id resource.inbox_id
 json.contact_last_seen_at resource.contact_last_seen_at.to_i
 json.status resource.status
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index f98dfba65..d4929fea1 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe 'Conversations API', type: :request do
         body = JSON.parse(response.body, symbolize_names: true)
         expect(body[:data][:meta][:all_count]).to eq(1)
         expect(body[:data][:meta].keys).to include(:all_count, :mine_count, :assigned_count, :unassigned_count)
+        expect(body[:data][:payload].first[:uuid]).to eq(conversation.uuid)
         expect(body[:data][:payload].first[:messages].first[:id]).to eq(message.id)
       end
 
diff --git a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
index 72b0bfc81..5c00b0543 100644
--- a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
       expect(response).to have_http_status(:success)
       data = response.parsed_body
       expect(data.length).to eq 1
+      expect(data.first['uuid']).to eq contact_inbox.conversations.first.uuid
     end
 
     it 'does not return any private or activity message' do
diff --git a/swagger/definitions/request/public/message/update_payload.yml b/swagger/definitions/request/public/message/update_payload.yml
index 8e17ff840..b581d7171 100644
--- a/swagger/definitions/request/public/message/update_payload.yml
+++ b/swagger/definitions/request/public/message/update_payload.yml
@@ -2,7 +2,19 @@
 type: object
 properties:
   submitted_values:
-    type: object
-    description: Replies to the Bot Message Types
-
-  
\ No newline at end of file
+    oneOf:
+      - type: object
+        description: Replies to the Bot Message Types
+        properties:
+          csat_survey_response:
+            type: object
+            description: CSAT Survey Response if original message is CSAT Survey
+            properties:
+              rating:
+                type: integer
+                description: CSAT Rating
+                example: 5
+              feedback_message:
+                type: string
+                description: CSAT Comment
+                example: 'Great'
diff --git a/swagger/index.yml b/swagger/index.yml
index bddaf934c..3cf8dd708 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -75,3 +75,6 @@ x-tagGroups:
       - Contacts API
       - Conversations API
       - Messages API
+  - name: Others
+    tags:
+      - CSAT Survey Page
\ No newline at end of file
diff --git a/swagger/parameters/conversation_uuid.yml b/swagger/parameters/conversation_uuid.yml
new file mode 100644
index 000000000..b2bff7f39
--- /dev/null
+++ b/swagger/parameters/conversation_uuid.yml
@@ -0,0 +1,5 @@
+in: path
+name: conversation_uuid
+type: integer
+required: true
+description: The uuid of the conversation
diff --git a/swagger/parameters/index.yml b/swagger/parameters/index.yml
index 2c61a6a01..5dcc1f418 100644
--- a/swagger/parameters/index.yml
+++ b/swagger/parameters/index.yml
@@ -22,6 +22,9 @@ contact_sort_param:
 conversation_id:
   $ref: ./conversation_id.yml
 
+conversation_uuid:
+  $ref: ./conversation_uuid.yml
+
 custom_filter_id:
   $ref: ./custom_filter_id.yml
 
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 3f208c2c9..bad24b218 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -124,6 +124,16 @@
 
 # ---------------- end of public api routes-----------#
 
+# ------------ Other routes  ------------#
+
+/survey/responses/{conversation_uuid}:
+  parameters:
+    - $ref: '#/parameters/conversation_uuid'
+  get:
+    $ref: ./survey/show.yml
+
+# ----------- end of other routes -----------#
+
 # ------------  Application API routes  ------------#
 
 
diff --git a/swagger/paths/survey/show.yml b/swagger/paths/survey/show.yml
new file mode 100644
index 000000000..c2bd1e8e8
--- /dev/null
+++ b/swagger/paths/survey/show.yml
@@ -0,0 +1,9 @@
+tags:
+  - CSAT Survey Page
+operationId: get-csat-survey-page
+summary: Get CSAT survey page
+description: You can redirect the client to this URL, instead of implementing the CSAT survey component yourself.
+security: []
+responses:
+  200:
+    description: Success
diff --git a/swagger/swagger.json b/swagger/swagger.json
index bf39397a6..70a4d5904 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1000,6 +1000,29 @@
         }
       }
     },
+    "/survey/responses/{conversation_uuid}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/conversation_uuid"
+        }
+      ],
+      "get": {
+        "tags": [
+          "CSAT Survey Page"
+        ],
+        "operationId": "get-csat-survey-page",
+        "summary": "Get CSAT survey page",
+        "description": "You can redirect the client to this URL, instead of implementing the CSAT survey component yourself.",
+        "security": [
+
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/agent_bots": {
       "parameters": [
         {
@@ -6567,8 +6590,30 @@
       "type": "object",
       "properties": {
         "submitted_values": {
-          "type": "object",
-          "description": "Replies to the Bot Message Types"
+          "oneOf": [
+            {
+              "type": "object",
+              "description": "Replies to the Bot Message Types",
+              "properties": {
+                "csat_survey_response": {
+                  "type": "object",
+                  "description": "CSAT Survey Response if original message is CSAT Survey",
+                  "properties": {
+                    "rating": {
+                      "type": "integer",
+                      "description": "CSAT Rating",
+                      "example": 5
+                    },
+                    "feedback_message": {
+                      "type": "string",
+                      "description": "CSAT Comment",
+                      "example": "Great"
+                    }
+                  }
+                }
+              }
+            }
+          ]
         }
       }
     },
@@ -6973,6 +7018,13 @@
       "required": true,
       "description": "The numeric ID of the conversation"
     },
+    "conversation_uuid": {
+      "in": "path",
+      "name": "conversation_uuid",
+      "type": "integer",
+      "required": true,
+      "description": "The uuid of the conversation"
+    },
     "custom_filter_id": {
       "in": "path",
       "name": "custom_filter_id",
@@ -7093,6 +7145,12 @@
         "Conversations API",
         "Messages API"
       ]
+    },
+    {
+      "name": "Others",
+      "tags": [
+        "CSAT Survey Page"
+      ]
     }
   ]
 }
\ No newline at end of file

From a01d81a7e168f3eae6c2601eb46f63e4949b11cd Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Tue, 6 Jun 2023 01:21:45 +0530
Subject: [PATCH 60/93] feat: Update display text for auditlog entries (#7226)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/auditLogs.json   | 26 ++++++++----
 .../dashboard/settings/auditlogs/Index.vue    | 40 ++++++++++---------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/auditLogs.json b/app/javascript/dashboard/i18n/locale/en/auditLogs.json
index a2bb40135..b1653e027 100644
--- a/app/javascript/dashboard/i18n/locale/en/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/en/auditLogs.json
@@ -19,13 +19,25 @@
       "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
       "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
-    "ACTION": {
-      "ADD": "created",
-      "EDIT": "updated",
-      "DELETE": "deleted",
-      "SIGN_IN": "signed in",
-      "SIGN_OUT": "signed out",
-      "SYSTEM": "System"
+    "DEFAULT_USER": "System",
+    "AUTOMATION_RULE": {
+      "ADD": "%{agentName} created a new automation rule (#%{id})",
+      "EDIT": "%{agentName} updated an automation rule (#%{id})",
+      "DELETE": "%{agentName} deleted an automation rule (#%{id})"
+    },
+    "INBOX": {
+      "ADD": "%{agentName} created a new inbox (#%{id})",
+      "EDIT": "%{agentName} updated an inbox (#%{id})",
+      "DELETE": "%{agentName} deleted an inbox (#%{id})"
+    },
+    "WEBHOOK": {
+      "ADD": "%{agentName} created a new webhook (#%{id})",
+      "EDIT": "%{agentName} updated a webhook (#%{id})",
+      "DELETE": "%{agentName} deleted a webhook (#%{id})"
+    },
+    "USER_ACTION": {
+      "SIGN_IN": "%{agentName} signed in",
+      "SIGN_OUT": "%{agentName} signed out"
     }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
index f11bbb6f4..d7d94f2e8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
@@ -96,7 +96,7 @@ export default {
   methods: {
     getAgentName(email) {
       if (email === null) {
-        return this.$t('AUDIT_LOGS.ACTION.SYSTEM');
+        return this.$t('AUDIT_LOGS.DEFAULT_USER');
       }
       const agentName = this.agentList.find(agent => agent.email === email)
         ?.name;
@@ -104,28 +104,32 @@ export default {
       return agentName || email;
     },
     generateLogText(auditLogItem) {
-      const username = this.getAgentName(auditLogItem.username);
+      const agentName = this.getAgentName(auditLogItem.username);
       const auditableType = auditLogItem.auditable_type.toLowerCase();
       const action = auditLogItem.action.toLowerCase();
+      const auditId = auditLogItem.auditable_id;
+      const logActionKey = `${auditableType}:${action}`;
 
-      const logActions = {
-        create: this.$t('AUDIT_LOGS.ACTION.ADD'),
-        destroy: this.$t('AUDIT_LOGS.ACTION.DELETE'),
-        update: this.$t('AUDIT_LOGS.ACTION.EDIT'),
-        sign_in: this.$t('AUDIT_LOGS.ACTION.SIGN_IN'),
-        sign_out: this.$t('AUDIT_LOGS.ACTION.SIGN_OUT'),
+      const translationPayload = {
+        agentName,
+        id: auditId,
       };
 
-      // detect if the action is custom user action, which involves
-      // only the user, such as signing in, signing out etc.
-      // if it is, then do not show the auditable type
-      const userActions = this.getUserActions(action);
-      return `${username} ${logActions[action] || action} ${
-        userActions ? '' : auditableType
-      }`;
-    },
-    getUserActions(action) {
-      return ['sign_in', 'sign_out'].includes(action);
+      const translationKeys = {
+        'automationrule:create': `AUDIT_LOGS.AUTOMATION_RULE.ADD`,
+        'automationrule:update': `AUDIT_LOGS.AUTOMATION_RULE.EDIT`,
+        'automationrule:destroy': `AUDIT_LOGS.AUTOMATION_RULE.DELETE`,
+        'webhook:create': `AUDIT_LOGS.WEBHOOK.ADD`,
+        'webhook:update': `AUDIT_LOGS.WEBHOOK.EDIT`,
+        'webhook:destroy': `AUDIT_LOGS.WEBHOOK.DELETE`,
+        'inbox:create': `AUDIT_LOGS.INBOX.ADD`,
+        'inbox:update': `AUDIT_LOGS.INBOX.EDIT`,
+        'inbox:destroy': `AUDIT_LOGS.INBOX.DELETE`,
+        'user:sign_in': `AUDIT_LOGS.USER_ACTION.SIGN_IN`,
+        'user:sign_out': `AUDIT_LOGS.USER_ACTION.SIGN_OUT`,
+      };
+
+      return this.$t(translationKeys[logActionKey] || '', translationPayload);
     },
     onPageChange(page) {
       window.history.pushState({}, null, `${this.$route.path}?page=${page}`);

From b1a4907ede30e401188f3ddd5bef4c17eb82ada8 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 6 Jun 2023 14:55:08 -0700
Subject: [PATCH 61/93] fix: around_action not yielding is params are present
 (#7259)

---
 app/controllers/public/api/v1/portals/base_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/public/api/v1/portals/base_controller.rb b/app/controllers/public/api/v1/portals/base_controller.rb
index 21b605396..c5297e6e4 100644
--- a/app/controllers/public/api/v1/portals/base_controller.rb
+++ b/app/controllers/public/api/v1/portals/base_controller.rb
@@ -6,6 +6,8 @@ class Public::Api::V1::Portals::BaseController < PublicController
   def set_locale(&)
     switch_locale_with_portal(&) if params[:locale].present?
     switch_locale_with_article(&) if params[:article_slug].present?
+
+    yield
   end
 
   def switch_locale_with_portal(&)

From 39eaed7766e0f949d5692f3dfeb9a63e8f4b80f9 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 6 Jun 2023 15:16:25 -0700
Subject: [PATCH 62/93] fix: Cannot read properties of undefined (reading
 'always_play_audio_alert') (#7260)

---
 app/javascript/dashboard/helper/scriptHelpers.js | 6 +++---
 app/views/api/v1/accounts/create.json.jbuilder   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/helper/scriptHelpers.js b/app/javascript/dashboard/helper/scriptHelpers.js
index 7807f2b45..1169f2ee8 100644
--- a/app/javascript/dashboard/helper/scriptHelpers.js
+++ b/app/javascript/dashboard/helper/scriptHelpers.js
@@ -18,18 +18,18 @@ export const initializeAnalyticsEvents = () => {
       });
     }
   });
-  window.bus.$on(ANALYTICS_RESET, () => {});
 };
 
 const initializeAudioAlerts = user => {
-  // InitializeAudioNotifications
   const { ui_settings: uiSettings } = user || {};
   const {
     always_play_audio_alert: alwaysPlayAudioAlert,
     enable_audio_alerts: audioAlertType,
     alert_if_unread_assigned_conversation_exist: alertIfUnreadConversationExist,
     notification_tone: audioAlertTone,
-  } = uiSettings;
+    // UI Settings can be undefined initally as we don't send the
+    // entire payload for the user during the signup process.
+  } = uiSettings || {};
 
   DashboardAudioNotificationHelper.setInstanceValues({
     currentUserId: user.id,
diff --git a/app/views/api/v1/accounts/create.json.jbuilder b/app/views/api/v1/accounts/create.json.jbuilder
index 240e04ae1..b423b534d 100644
--- a/app/views/api/v1/accounts/create.json.jbuilder
+++ b/app/views/api/v1/accounts/create.json.jbuilder
@@ -6,6 +6,7 @@ json.data do
   json.display_name resource.display_name
   json.email resource.email
   json.account_id @account.id
+  json.created_at resource.created_at
   json.pubsub_token resource.pubsub_token
   json.role resource.active_account_user&.role
   json.inviter_id resource.active_account_user&.inviter_id

From 7e89e3a34a8df7dde09d46cf926b51eef7ec93f3 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 7 Jun 2023 17:18:24 +0530
Subject: [PATCH 63/93] chore: Ensure template_sync timestamp is updated
 (#7265)

Fix for the cases where there are multiple channels with invalid provider config, which results in the templates sync scheduler failing to schedule jobs for valid channels.

fixes: https://linear.app/chatwoot/issue/CW-2032/bug-whatsapp-template-sync-failing-in-cloud
---
 app/models/channel/whatsapp.rb                              | 6 ++++++
 .../whatsapp/providers/whatsapp_360_dialog_service.rb       | 5 +++--
 app/services/whatsapp/providers/whatsapp_cloud_service.rb   | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 140538a54..f95c2c30a 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -50,6 +50,12 @@ class Channel::Whatsapp < ApplicationRecord
     true
   end
 
+  def mark_message_templates_updated
+    # rubocop:disable Rails/SkipsModelValidations
+    update_column(:message_templates_last_updated, Time.zone.now)
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
   delegate :send_message, to: :provider_service
   delegate :send_template, to: :provider_service
   delegate :sync_templates, to: :provider_service
diff --git a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
index 94f4dc370..3f09f2467 100644
--- a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
@@ -22,9 +22,10 @@ class Whatsapp::Providers::Whatsapp360DialogService < Whatsapp::Providers::BaseS
   end
 
   def sync_templates
+    # ensuring that channels with wrong provider config wouldn't keep trying to sync templates
+    whatsapp_channel.mark_message_templates_updated
     response = HTTParty.get("#{api_base_path}/configs/templates", headers: api_headers)
-    whatsapp_channel[:message_templates] = response['waba_templates'] if response.success?
-    whatsapp_channel.update(message_templates_last_updated: Time.now.utc)
+    whatsapp_channel.update(message_templates: response['waba_templates'], message_templates_last_updated: Time.now.utc) if response.success?
   end
 
   def validate_provider_config?
diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
index fc8f729a5..9fff873e5 100644
--- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
@@ -23,9 +23,10 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
   end
 
   def sync_templates
+    # ensuring that channels with wrong provider config wouldn't keep trying to sync templates
+    whatsapp_channel.mark_message_templates_updated
     templates = fetch_whatsapp_templates("#{business_account_path}/message_templates?access_token=#{whatsapp_channel.provider_config['api_key']}")
-    whatsapp_channel[:message_templates] = templates if templates.present?
-    whatsapp_channel.update(message_templates_last_updated: Time.now.utc)
+    whatsapp_channel.update(message_templates: templates, message_templates_last_updated: Time.now.utc) if templates.present?
   end
 
   def fetch_whatsapp_templates(url)

From d25e7fd54e5375ad0a4db1f1e51cf8e0b9b994b4 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 7 Jun 2023 18:24:37 +0530
Subject: [PATCH 64/93] fix: add email logging  for source-id email-id and
 message-id (#7262)

* fix: mail logger for source-id email-id and message-id

* added mail provided to the tracking

* change the logger verb from info to error

* app/jobs/inboxes/fetch_imap_emails_job.rb

* codeclimate fix

* remove extra filter

* fixes: specs
---
 app/jobs/inboxes/fetch_imap_emails_job.rb | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 8ffea6c18..5173e478b 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -40,14 +40,16 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     received_mails(imap_inbox).each do |message_id|
       inbound_mail = Mail.read_from_string imap_inbox.fetch(message_id, 'RFC822')[0].attr['RFC822']
 
+      mail_info_logger(channel, inbound_mail, message_id)
+
       next if email_already_present?(channel, inbound_mail, last_email_time)
 
       process_mail(inbound_mail, channel)
     end
   end
 
-  def email_already_present?(channel, inbound_mail, last_email_time)
-    processed_email?(inbound_mail, last_email_time) || channel.inbox.messages.find_by(source_id: inbound_mail.message_id).present?
+  def email_already_present?(channel, inbound_mail, _last_email_time)
+    channel.inbox.messages.find_by(source_id: inbound_mail.message_id).present?
   end
 
   def received_mails(imap_inbox)
@@ -76,12 +78,21 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     received_mails(imap_inbox).each do |message_id|
       inbound_mail = Mail.read_from_string imap_inbox.fetch(message_id, 'RFC822')[0].attr['RFC822']
 
+      mail_info_logger(channel, inbound_mail, message_id)
+
       next if channel.inbox.messages.find_by(source_id: inbound_mail.message_id).present?
 
       process_mail(inbound_mail, channel)
     end
   end
 
+  def mail_info_logger(channel, inbound_mail, message_id)
+    return if Rails.env.test?
+
+    Rails.logger.info("
+      #{channel.provider} Email id: #{inbound_mail.from} and message_source_id: #{inbound_mail.message_id}, message_id: #{message_id}")
+  end
+
   def authenticated_imap_inbox(channel, access_token, auth_method)
     imap = Net::IMAP.new(channel.imap_address, channel.imap_port, true)
     imap.authenticate(auth_method, channel.imap_login, access_token)
@@ -113,6 +124,8 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     Imap::ImapMailbox.new.process(inbound_mail, channel)
   rescue StandardError => e
     ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
+    Rails.logger.error("
+      #{channel.provider} Email dropped: #{inbound_mail.from} and message_source_id: #{inbound_mail.message_id}, message_id: #{message_id}")
   end
 
   # Making sure the access token is valid for microsoft provider

From 1017903ee106e4a559d6c7dc0d18bfa5b4f27f2c Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 8 Jun 2023 14:27:49 +0530
Subject: [PATCH 65/93] fix: Adds domain option to user cookies set by SDK
 [CW-352] (#7070)

* fix: Adds domain option to user cookies set by SDK

* Adds domain to init event from chatwootSettings variable

* Testing multiple domains on heroku

* Updates with sdk from staging

* Removes sdk init code

* Testing why cookie is not getting set

* Cleans up testing code

* Refactors code to fix codeclimate issues

* Update app/javascript/sdk/cookieHelpers.js

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>

* Adds test cases for setCookieWithDomain

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 app/javascript/packs/sdk.js                   |  9 ++-
 app/javascript/sdk/IFrameHelper.js            | 21 +++--
 app/javascript/sdk/cookieHelpers.js           | 15 ++++
 .../sdk/specs/cookieHelpers.spec.js           | 77 +++++++++++++++++++
 app/views/widget_tests/index.html.erb         |  1 +
 5 files changed, 109 insertions(+), 14 deletions(-)

diff --git a/app/javascript/packs/sdk.js b/app/javascript/packs/sdk.js
index 912e7ca7e..9bb8314ca 100755
--- a/app/javascript/packs/sdk.js
+++ b/app/javascript/packs/sdk.js
@@ -11,6 +11,7 @@ import {
   hasUserKeys,
 } from '../sdk/cookieHelpers';
 import { addClasses, removeClasses } from '../sdk/DOMHelpers';
+import { setCookieWithDomain } from '../sdk/cookieHelpers';
 import { SDK_SET_BUBBLE_VISIBILITY } from 'shared/constants/sharedFrameEvents';
 const runSDK = ({ baseUrl, websiteToken }) => {
   if (window.$chatwoot) {
@@ -19,6 +20,7 @@ const runSDK = ({ baseUrl, websiteToken }) => {
 
   const chatwootSettings = window.chatwootSettings || {};
   let locale = chatwootSettings.locale;
+  let baseDomain = chatwootSettings.baseDomain;
 
   if (chatwootSettings.useBrowserLanguage) {
     locale = window.navigator.language.replace('-', '_');
@@ -26,6 +28,7 @@ const runSDK = ({ baseUrl, websiteToken }) => {
 
   window.$chatwoot = {
     baseUrl,
+    baseDomain,
     hasLoaded: false,
     hideMessageBubble: chatwootSettings.hideMessageBubble || false,
     isOpen: false,
@@ -90,9 +93,9 @@ const runSDK = ({ baseUrl, websiteToken }) => {
       window.$chatwoot.identifier = identifier;
       window.$chatwoot.user = user;
       IFrameHelper.sendMessage('set-user', { identifier, user });
-      Cookies.set(userCookieName, hashToBeStored, {
-        expires: 365,
-        sameSite: 'Lax',
+
+      setCookieWithDomain(userCookieName, hashToBeStored, {
+        baseDomain,
       });
     },
 
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 9ded2c9bf..9d51599b9 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -29,7 +29,7 @@ import {
   CHATWOOT_READY,
 } from '../widget/constants/sdkEvents';
 import { SET_USER_ERROR } from '../widget/constants/errorTypes';
-import { getUserCookieName } from './cookieHelpers';
+import { getUserCookieName, setCookieWithDomain } from './cookieHelpers';
 import {
   getAlertAudio,
   initOnEvents,
@@ -38,17 +38,16 @@ import { isFlatWidgetStyle } from './settingsHelper';
 import { popoutChatWindow } from '../widget/helpers/popoutHelper';
 import addHours from 'date-fns/addHours';
 
-const updateAuthCookie = cookieContent =>
-  Cookies.set('cw_conversation', cookieContent, {
-    expires: 365,
-    sameSite: 'Lax',
+const updateAuthCookie = (cookieContent, baseDomain = '') =>
+  setCookieWithDomain('cw_conversation', cookieContent, {
+    baseDomain,
   });
 
-const updateCampaignReadStatus = () => {
+const updateCampaignReadStatus = baseDomain => {
   const expireBy = addHours(new Date(), 1);
-  Cookies.set('cw_snooze_campaigns_till', Number(expireBy), {
+  setCookieWithDomain('cw_snooze_campaigns_till', Number(expireBy), {
     expires: expireBy,
-    sameSite: 'Lax',
+    baseDomain,
   });
 };
 
@@ -154,7 +153,7 @@ export const IFrameHelper = {
 
   events: {
     loaded: message => {
-      updateAuthCookie(message.config.authToken);
+      updateAuthCookie(message.config.authToken, window.$chatwoot.baseDomain);
       window.$chatwoot.hasLoaded = true;
       const campaignsSnoozedTill = Cookies.get('cw_snooze_campaigns_till');
       IFrameHelper.sendMessage('config-set', {
@@ -200,11 +199,11 @@ export const IFrameHelper = {
     },
 
     setAuthCookie({ data: { widgetAuthToken } }) {
-      updateAuthCookie(widgetAuthToken);
+      updateAuthCookie(widgetAuthToken, window.$chatwoot.baseDomain);
     },
 
     setCampaignReadOn() {
-      updateCampaignReadStatus();
+      updateCampaignReadStatus(window.$chatwoot.baseDomain);
     },
 
     toggleBubble: state => {
diff --git a/app/javascript/sdk/cookieHelpers.js b/app/javascript/sdk/cookieHelpers.js
index afdc12cc2..64a7afbf7 100644
--- a/app/javascript/sdk/cookieHelpers.js
+++ b/app/javascript/sdk/cookieHelpers.js
@@ -1,4 +1,5 @@
 import md5 from 'md5';
+import Cookies from 'js-cookie';
 
 const REQUIRED_USER_KEYS = ['avatar_url', 'email', 'name'];
 const ALLOWED_USER_ATTRIBUTES = [...REQUIRED_USER_KEYS, 'identifier_hash'];
@@ -21,3 +22,17 @@ export const computeHashForUserData = (...args) => md5(getUserString(...args));
 
 export const hasUserKeys = user =>
   REQUIRED_USER_KEYS.reduce((acc, key) => acc || !!user[key], false);
+
+export const setCookieWithDomain = (
+  name,
+  value,
+  { expires = 365, baseDomain = undefined } = {}
+) => {
+  const cookieOptions = {
+    expires,
+    sameSite: 'Lax',
+    domain: baseDomain,
+  };
+
+  Cookies.set(name, value, cookieOptions);
+};
diff --git a/app/javascript/sdk/specs/cookieHelpers.spec.js b/app/javascript/sdk/specs/cookieHelpers.spec.js
index 103224760..7da09315f 100644
--- a/app/javascript/sdk/specs/cookieHelpers.spec.js
+++ b/app/javascript/sdk/specs/cookieHelpers.spec.js
@@ -1,7 +1,9 @@
+import Cookies from 'js-cookie';
 import {
   getUserCookieName,
   getUserString,
   hasUserKeys,
+  setCookieWithDomain,
 } from '../cookieHelpers';
 
 describe('#getUserCookieName', () => {
@@ -47,3 +49,78 @@ describe('#hasUserKeys', () => {
     expect(hasUserKeys({ avatar_url: 'randomValue' })).toBe(true);
   });
 });
+
+// Mock the 'set' method of the 'Cookies' object
+jest.mock('js-cookie', () => ({
+  set: jest.fn(),
+}));
+
+describe('setCookieWithDomain', () => {
+  afterEach(() => {
+    // Clear mock calls after each test
+    Cookies.set.mockClear();
+  });
+
+  it('should set a cookie with default parameters', () => {
+    setCookieWithDomain('myCookie', 'cookieValue');
+
+    expect(Cookies.set).toHaveBeenCalledWith(
+      'myCookie',
+      'cookieValue',
+      expect.objectContaining({
+        expires: 365,
+        sameSite: 'Lax',
+        domain: undefined,
+      })
+    );
+  });
+
+  it('should set a cookie with custom expiration and sameSite attribute', () => {
+    setCookieWithDomain('myCookie', 'cookieValue', {
+      expires: 30,
+    });
+
+    expect(Cookies.set).toHaveBeenCalledWith(
+      'myCookie',
+      'cookieValue',
+      expect.objectContaining({
+        expires: 30,
+        sameSite: 'Lax',
+        domain: undefined,
+      })
+    );
+  });
+
+  it('should set a cookie with a specific base domain', () => {
+    setCookieWithDomain('myCookie', 'cookieValue', {
+      baseDomain: 'example.com',
+    });
+
+    expect(Cookies.set).toHaveBeenCalledWith(
+      'myCookie',
+      'cookieValue',
+      expect.objectContaining({
+        expires: 365,
+        sameSite: 'Lax',
+        domain: 'example.com',
+      })
+    );
+  });
+
+  it('should set a cookie with custom expiration, sameSite attribute, and specific base domain', () => {
+    setCookieWithDomain('myCookie', 'cookieValue', {
+      expires: 7,
+      baseDomain: 'example.com',
+    });
+
+    expect(Cookies.set).toHaveBeenCalledWith(
+      'myCookie',
+      'cookieValue',
+      expect.objectContaining({
+        expires: 7,
+        sameSite: 'Lax',
+        domain: 'example.com',
+      })
+    );
+  });
+});
diff --git a/app/views/widget_tests/index.html.erb b/app/views/widget_tests/index.html.erb
index 3c9b8624d..aa9415c69 100644
--- a/app/views/widget_tests/index.html.erb
+++ b/app/views/widget_tests/index.html.erb
@@ -14,6 +14,7 @@
 
 window.chatwootSettings = {
   hideMessageBubble: false,
+  // baseDomain: '.loca.lt',
   position: '<%= @widget_position %>',
   locale: 'en',
   useBrowserLanguage: true,

From d7314079c9f8a57e398d2c78a56a8ead4f4ac637 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 8 Jun 2023 14:58:57 +0530
Subject: [PATCH 66/93] feat: Ability to edit saved folders (#7236)

* feat: Ability to edit saved filters

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 .../dashboard/components/ChatList.vue         |  98 +++++-
 .../ConversationAdvancedFilter.vue            |  90 +++++-
 .../dashboard/helper/customViewsHelper.js     | 119 ++++++++
 .../dashboard/helper/filterQueryGenerator.js  |   5 +-
 .../helper/specs/customViewsHelper.spec.js    | 278 ++++++++++++++++++
 .../i18n/locale/en/advancedFilters.json       |   8 +
 .../i18n/locale/en/contactFilters.json        |  94 +++---
 .../dashboard/store/modules/customViews.js    |  13 +
 .../modules/specs/customViews/actions.spec.js |  26 +-
 .../modules/specs/customViews/fixtures.js     |  30 +-
 .../modules/specs/customViews/getters.spec.js |   2 +-
 .../specs/customViews/mutations.spec.js       |  10 +-
 .../dashboard/store/mutation-types.js         |   1 +
 13 files changed, 706 insertions(+), 68 deletions(-)
 create mode 100644 app/javascript/dashboard/helper/customViewsHelper.js
 create mode 100644 app/javascript/dashboard/helper/specs/customViewsHelper.spec.js

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 7995c91fd..f4ba84ead 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -47,6 +47,14 @@
           />
         </div>
         <div v-if="hasActiveFolders">
+          <woot-button
+            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.EDIT.EDIT_BUTTON')"
+            size="tiny"
+            variant="smooth"
+            color-scheme="secondary"
+            icon="edit"
+            @click="onToggleAdvanceFiltersModal"
+          />
           <woot-button
             v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.DELETE.DELETE_BUTTON')"
             size="tiny"
@@ -168,8 +176,11 @@
         v-if="showAdvancedFilters"
         :initial-filter-types="advancedFilterTypes"
         :initial-applied-filters="appliedFilter"
+        :active-folder-name="activeFolderName"
         :on-close="closeAdvanceFiltersModal"
+        :is-folder-view="hasActiveFolders"
         @applyFilter="onApplyFilter"
+        @updateFolder="onUpdateSavedFilter"
       />
     </woot-modal>
   </div>
@@ -193,6 +204,9 @@ import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCust
 import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Index.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import filterMixin from 'shared/mixins/filterMixin';
+import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
+import countries from 'shared/constants/countries';
+import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';
 
 import {
   hasPressedAltAndJKey,
@@ -289,6 +303,11 @@ export default {
       appliedFilters: 'getAppliedConversationFilters',
       folders: 'customViews/getCustomViews',
       inboxes: 'inboxes/getInboxes',
+      agentList: 'agents/getAgents',
+      teamsList: 'teams/getTeams',
+      inboxesList: 'inboxes/getInboxes',
+      campaigns: 'campaigns/getAllCampaigns',
+      labels: 'labels/getLabels',
     }),
     hasAppliedFilters() {
       return this.appliedFilters.length !== 0;
@@ -451,6 +470,9 @@ export default {
       }
       return undefined;
     },
+    activeFolderName() {
+      return this.activeFolder?.name;
+    },
     activeTeam() {
       if (this.teamId) {
         return this.$store.getters['teams/getTeam'](this.teamId);
@@ -483,9 +505,7 @@ export default {
       this.resetAndFetchData();
     },
     activeFolder() {
-      if (!this.hasAppliedFilters) {
-        this.resetAndFetchData();
-      }
+      this.resetAndFetchData();
     },
     chatLists() {
       this.chatsOnView = this.conversationList;
@@ -496,6 +516,10 @@ export default {
     this.$store.dispatch('setChatSortFilter', this.activeSortBy);
     this.resetAndFetchData();
 
+    if (this.hasActiveFolders) {
+      this.$store.dispatch('campaigns/get');
+    }
+
     bus.$on('fetch_conversation_stats', () => {
       this.$store.dispatch('conversationStats/get', this.conversationFilters);
     });
@@ -508,6 +532,15 @@ export default {
       this.$store.dispatch('emptyAllConversations');
       this.fetchFilteredConversations(payload);
     },
+    onUpdateSavedFilter(payload, folderName) {
+      const payloadData = {
+        ...this.activeFolder,
+        name: folderName,
+        query: filterQueryGenerator(payload),
+      };
+      this.$store.dispatch('customViews/update', payloadData);
+      this.closeAdvanceFiltersModal();
+    },
     onClickOpenAddFoldersModal() {
       this.showAddFoldersModal = true;
     },
@@ -521,15 +554,70 @@ export default {
       this.showDeleteFoldersModal = false;
     },
     onToggleAdvanceFiltersModal() {
-      if (!this.hasAppliedFilters) {
+      if (!this.hasAppliedFilters && !this.hasActiveFolders) {
         this.initializeExistingFilterToModal();
       }
+      if (this.hasActiveFolders) {
+        this.initializeFolderToFilterModal(this.activeFolder);
+      }
       this.showAdvancedFilters = true;
     },
     closeAdvanceFiltersModal() {
       this.showAdvancedFilters = false;
       this.appliedFilter = [];
     },
+    setParamsForEditFolderModal() {
+      // Here we are setting the params for edit folder modal to show the existing values.
+
+      // For agent, team, inboxes,and campaigns we get only the id's from the query.
+      // So we are mapping the id's to the actual values.
+
+      // For labels we get the name of the label from the query.
+      // If we delete the label from the label list then we will not be able to show the label name.
+
+      // For custom attributes we get only attribute key.
+      // So we are mapping it to find the input type of the attribute to show in the edit folder modal.
+      const params = {
+        agents: this.agentList,
+        teams: this.teamsList,
+        inboxes: this.inboxesList,
+        labels: this.labels,
+        campaigns: this.campaigns,
+        languages: languages,
+        countries: countries,
+        filterTypes: advancedFilterTypes,
+        allCustomAttributes: this.$store.getters[
+          'attributes/getAttributesByModel'
+        ]('conversation_attribute'),
+      };
+      return params;
+    },
+    initializeFolderToFilterModal(activeFolder) {
+      // Here we are setting the params for edit folder modal.
+      //  To show the existing values. when we click on edit folder button.
+
+      // Here we get the query from the active folder.
+      // And we are mapping the query to the actual values.
+      // To show in the edit folder modal by the help of generateValuesForEditCustomViews helper.
+      const query = activeFolder?.query?.payload;
+      if (!Array.isArray(query)) return;
+
+      this.appliedFilter.push(
+        ...query.map(filter => ({
+          attribute_key: filter.attribute_key,
+          attribute_model: filter.attribute_model,
+          filter_operator: filter.filter_operator,
+          values: Array.isArray(filter.values)
+            ? generateValuesForEditCustomViews(
+                filter,
+                this.setParamsForEditFolderModal()
+              )
+            : [],
+          query_operator: filter.query_operator,
+          custom_attribute_type: filter.custom_attribute_type,
+        }))
+      );
+    },
     getKeyboardListenerParams() {
       const allConversations = this.$refs.activeConversation.querySelectorAll(
         'div.conversations-list div.conversation'
@@ -575,6 +663,7 @@ export default {
       }
     },
     resetAndFetchData() {
+      this.appliedFilter = [];
       this.resetBulkActions();
       this.$store.dispatch('conversationPage/reset');
       this.$store.dispatch('emptyAllConversations');
@@ -587,7 +676,6 @@ export default {
         return;
       }
       this.fetchConversations();
-      this.appliedFilter = [];
     },
     fetchConversations() {
       this.$store
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
index 9caa11084..ead78f643 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
@@ -1,9 +1,21 @@
 <template>
   <div class="column">
-    <woot-modal-header :header-title="$t('FILTER.TITLE')">
-      <p>{{ $t('FILTER.SUBTITLE') }}</p>
+    <woot-modal-header :header-title="filterModalHeaderTitle">
+      <p>{{ filterModalSubTitle }}</p>
     </woot-modal-header>
-    <div class="row modal-content">
+    <div class="column modal-content">
+      <div v-if="isFolderView" class="columns">
+        <label class="input-label" :class="{ error: !activeFolderNewName }">
+          {{ $t('FILTER.FOLDER_LABEL') }}
+          <input v-model="activeFolderNewName" type="text" class="name-input" />
+          <span v-if="!activeFolderNewName" class="message">
+            {{ $t('FILTER.EMPTY_VALUE_ERROR') }}
+          </span>
+        </label>
+        <label class="input-label">
+          {{ $t('FILTER.FOLDER_QUERY_LABEL') }}
+        </label>
+      </div>
       <div class="medium-12 columns filters-wrap">
         <filter-input-box
           v-for="(filter, i) in appliedFilters"
@@ -42,7 +54,14 @@
           <woot-button class="button clear" @click.prevent="onClose">
             {{ $t('FILTER.CANCEL_BUTTON_LABEL') }}
           </woot-button>
-          <woot-button @click="submitFilterQuery">
+          <woot-button
+            v-if="isFolderView"
+            :disabled="!activeFolderNewName"
+            @click="updateSavedCustomViews"
+          >
+            {{ $t('FILTER.UPDATE_BUTTON_LABEL') }}
+          </woot-button>
+          <woot-button v-else @click="submitFilterQuery">
             {{ $t('FILTER.SUBMIT_BUTTON_LABEL') }}
           </woot-button>
         </div>
@@ -81,6 +100,14 @@ export default {
       type: Array,
       default: () => [],
     },
+    activeFolderName: {
+      type: String,
+      default: '',
+    },
+    isFolderView: {
+      type: Boolean,
+      default: false,
+    },
   },
   validations: {
     appliedFilters: {
@@ -107,6 +134,7 @@ export default {
     return {
       show: true,
       appliedFilters: this.initialAppliedFilters,
+      activeFolderNewName: this.activeFolderName,
       filterTypes: this.initialFilterTypes,
       filterAttributeGroups,
       filterGroups: [],
@@ -119,6 +147,16 @@ export default {
     ...mapGetters({
       getAppliedConversationFilters: 'getAppliedConversationFilters',
     }),
+    filterModalHeaderTitle() {
+      return !this.isFolderView
+        ? this.$t('FILTER.TITLE')
+        : this.$t('FILTER.EDIT_CUSTOM_FILTER');
+    },
+    filterModalSubTitle() {
+      return !this.isFolderView
+        ? this.$t('FILTER.SUBTITLE')
+        : this.$t('FILTER.CUSTOM_VIEWS_SUBTITLE');
+    },
   },
   mounted() {
     this.setFilterAttributes();
@@ -126,7 +164,7 @@ export default {
     if (this.getAppliedConversationFilters.length) {
       this.appliedFilters = [];
       this.appliedFilters = [...this.getAppliedConversationFilters];
-    } else {
+    } else if (!this.isFolderView) {
       this.appliedFilters.push({
         attribute_key: 'status',
         filter_operator: 'equal_to',
@@ -177,11 +215,11 @@ export default {
       if (key === 'created_at' || key === 'last_activity_at')
         if (operator === 'days_before') return 'plain_text';
       const type = this.filterTypes.find(filter => filter.attributeKey === key);
-      return type.inputType;
+      return type?.inputType;
     },
     getOperators(key) {
       const type = this.filterTypes.find(filter => filter.attributeKey === key);
-      return type.filterOperators;
+      return type?.filterOperators;
     },
     getDropdownValues(type) {
       const statusFilters = this.$t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS');
@@ -267,11 +305,30 @@ export default {
       }
     },
     appendNewFilter() {
-      this.appliedFilters.push({
-        attribute_key: 'status',
-        filter_operator: 'equal_to',
-        values: '',
+      if (this.isFolderView) {
+        this.setQueryOperatorOnLastQuery();
+      } else {
+        this.appliedFilters.push({
+          attribute_key: 'status',
+          filter_operator: 'equal_to',
+          values: '',
+          query_operator: 'and',
+        });
+      }
+    },
+    setQueryOperatorOnLastQuery() {
+      const lastItemIndex = this.appliedFilters.length - 1;
+      this.appliedFilters[lastItemIndex] = {
+        ...this.appliedFilters[lastItemIndex],
         query_operator: 'and',
+      };
+      this.$nextTick(() => {
+        this.appliedFilters.push({
+          attribute_key: 'status',
+          filter_operator: 'equal_to',
+          values: '',
+          query_operator: 'and',
+        });
       });
     },
     removeFilter(index) {
@@ -296,6 +353,9 @@ export default {
         })),
       });
     },
+    updateSavedCustomViews() {
+      this.$emit('updateFolder', this.appliedFilters, this.activeFolderNewName);
+    },
     resetFilter(index, currentFilter) {
       this.appliedFilters[index].filter_operator = this.filterTypes.find(
         filter => filter.attributeKey === currentFilter.attribute_key
@@ -322,4 +382,12 @@ export default {
 .filter-actions {
   margin-top: var(--space-normal);
 }
+
+.input-label {
+  margin-bottom: var(--space-smaller);
+
+  .name-input {
+    width: 50%;
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/helper/customViewsHelper.js b/app/javascript/dashboard/helper/customViewsHelper.js
new file mode 100644
index 000000000..5e8b550ab
--- /dev/null
+++ b/app/javascript/dashboard/helper/customViewsHelper.js
@@ -0,0 +1,119 @@
+export const getInputType = (key, operator, filterTypes) => {
+  if (key === 'created_at' || key === 'last_activity_at')
+    if (operator === 'days_before') return 'plain_text';
+  const type = filterTypes.find(filter => filter.attributeKey === key);
+  return type?.inputType;
+};
+
+export const generateCustomAttributesInputType = type => {
+  const filterInputTypes = {
+    text: 'string',
+    number: 'string',
+    date: 'string',
+    checkbox: 'multi_select',
+    list: 'multi_select',
+    link: 'string',
+  };
+  return filterInputTypes[type];
+};
+
+export const getAttributeInputType = (key, allCustomAttributes) => {
+  const customAttribute = allCustomAttributes.find(
+    attr => attr.attribute_key === key
+  );
+  const { attribute_display_type } = customAttribute;
+  const filterInputTypes = generateCustomAttributesInputType(
+    attribute_display_type
+  );
+  return filterInputTypes;
+};
+
+export const getValuesName = (values, list, idKey, nameKey) => {
+  const item = list?.find(v => v[idKey] === values[0]);
+  return {
+    id: values[0],
+    name: item ? item[nameKey] : values[0],
+  };
+};
+
+const getValuesForLabels = (values, labels) => {
+  const selectedLabels = labels.filter(label => values.includes(label.title));
+  return selectedLabels.map(({ title }) => ({
+    id: title,
+    name: title,
+  }));
+};
+
+const getValuesForLanguages = (values, languages) => {
+  const selectedLanguages = languages.filter(language =>
+    values.includes(language.id)
+  );
+  return selectedLanguages.map(({ id, name }) => ({
+    id: id.toLowerCase(),
+    name: name,
+  }));
+};
+
+const getValuesForCountries = (values, countries) => {
+  const selectedCountries = countries.filter(country =>
+    values.includes(country.id)
+  );
+  return selectedCountries.map(({ id, name }) => ({
+    id: id,
+    name: name,
+  }));
+};
+
+export const getValuesForFilter = (filter, params) => {
+  const { attribute_key, values } = filter;
+  const {
+    languages,
+    countries,
+    agents,
+    inboxes,
+    teams,
+    campaigns,
+    labels,
+  } = params;
+  switch (attribute_key) {
+    case 'assignee_id':
+      return getValuesName(values, agents, 'id', 'name');
+    case 'inbox_id':
+      return getValuesName(values, inboxes, 'id', 'name');
+    case 'team_id':
+      return getValuesName(values, teams, 'id', 'name');
+    case 'campaign_id':
+      return getValuesName(values, campaigns, 'id', 'title');
+    case 'labels': {
+      return getValuesForLabels(values, labels);
+    }
+    case 'browser_language': {
+      return getValuesForLanguages(values, languages);
+    }
+    case 'country_code': {
+      return getValuesForCountries(values, countries);
+    }
+    default:
+      return { id: values[0], name: values[0] };
+  }
+};
+
+export const generateValuesForEditCustomViews = (filter, params) => {
+  const { attribute_key, filter_operator, values } = filter;
+  const { filterTypes, allCustomAttributes } = params;
+  const inboxType = getInputType(attribute_key, filter_operator, filterTypes);
+
+  if (inboxType === undefined) {
+    const filterInputTypes = getAttributeInputType(
+      attribute_key,
+      allCustomAttributes
+    );
+    return filterInputTypes === 'string'
+      ? values[0].toString()
+      : { id: values[0], name: values[0] };
+  }
+
+  return inboxType === 'multi_select' || inboxType === 'search_select'
+    ? getValuesForFilter(filter, params)
+    : values[0].toString();
+};
diff --git a/app/javascript/dashboard/helper/filterQueryGenerator.js b/app/javascript/dashboard/helper/filterQueryGenerator.js
index d519806bf..d70a30a6b 100644
--- a/app/javascript/dashboard/helper/filterQueryGenerator.js
+++ b/app/javascript/dashboard/helper/filterQueryGenerator.js
@@ -1,9 +1,12 @@
+const setArrayValues = item => {
+  return item.values[0]?.id ? item.values.map(val => val.id) : item.values;
+};
 const generatePayload = data => {
   // Make a copy of data to avoid vue data reactivity issues
   const filters = JSON.parse(JSON.stringify(data));
   let payload = filters.map(item => {
     if (Array.isArray(item.values)) {
-      item.values = item.values.map(val => val.id);
+      item.values = setArrayValues(item);
     } else if (typeof item.values === 'object') {
       item.values = [item.values.id];
     } else if (!item.values) {
diff --git a/app/javascript/dashboard/helper/specs/customViewsHelper.spec.js b/app/javascript/dashboard/helper/specs/customViewsHelper.spec.js
new file mode 100644
index 000000000..473f0bf01
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/customViewsHelper.spec.js
@@ -0,0 +1,278 @@
+import {
+  getAttributeInputType,
+  getInputType,
+  getValuesName,
+  getValuesForFilter,
+  generateValuesForEditCustomViews,
+  generateCustomAttributesInputType,
+} from '../customViewsHelper';
+import advancedFilterTypes from 'dashboard/components/widgets/conversation/advancedFilterItems/index';
+
+describe('customViewsHelper', () => {
+  describe('#getInputType', () => {
+    it('should return plain_text if key is created_at or last_activity_at and operator is days_before', () => {
+      const filterTypes = [
+        { attributeKey: 'created_at', inputType: 'date' },
+        { attributeKey: 'last_activity_at', inputType: 'date' },
+      ];
+      expect(getInputType('created_at', 'days_before', filterTypes)).toEqual(
+        'plain_text'
+      );
+      expect(
+        getInputType('last_activity_at', 'days_before', filterTypes)
+      ).toEqual('plain_text');
+    });
+
+    it('should return inputType if key is not created_at or last_activity_at', () => {
+      const filterTypes = [
+        { attributeKey: 'created_at', inputType: 'date' },
+        { attributeKey: 'last_activity_at', inputType: 'date' },
+        { attributeKey: 'test', inputType: 'string' },
+      ];
+      expect(getInputType('test', 'days_before', filterTypes)).toEqual(
+        'string'
+      );
+    });
+
+    it('should return undefined if key is not created_at or last_activity_at and inputType is not present', () => {
+      const filterTypes = [
+        { attributeKey: 'created_at', inputType: 'date' },
+        { attributeKey: 'last_activity_at', inputType: 'date' },
+        { attributeKey: 'test', inputType: 'string' },
+      ];
+      expect(getInputType('test', 'days_before', filterTypes)).toEqual(
+        'string'
+      );
+    });
+  });
+
+  describe('#getAttributeInputType', () => {
+    it('should return multi_select if attribute_display_type is checkbox or list', () => {
+      const allCustomAttributes = [
+        { attribute_key: 'test', attribute_display_type: 'checkbox' },
+        { attribute_key: 'test2', attribute_display_type: 'list' },
+      ];
+      expect(getAttributeInputType('test', allCustomAttributes)).toEqual(
+        'multi_select'
+      );
+      expect(getAttributeInputType('test2', allCustomAttributes)).toEqual(
+        'multi_select'
+      );
+    });
+
+    it('should return string if attribute_display_type is text, number, date or link', () => {
+      const allCustomAttributes = [
+        { attribute_key: 'test', attribute_display_type: 'text' },
+        { attribute_key: 'test2', attribute_display_type: 'number' },
+        { attribute_key: 'test3', attribute_display_type: 'date' },
+        { attribute_key: 'test4', attribute_display_type: 'link' },
+      ];
+      expect(getAttributeInputType('test', allCustomAttributes)).toEqual(
+        'string'
+      );
+      expect(getAttributeInputType('test2', allCustomAttributes)).toEqual(
+        'string'
+      );
+      expect(getAttributeInputType('test3', allCustomAttributes)).toEqual(
+        'string'
+      );
+      expect(getAttributeInputType('test4', allCustomAttributes)).toEqual(
+        'string'
+      );
+    });
+  });
+
+  describe('#getValuesName', () => {
+    it('should return id and name if item is present', () => {
+      const list = [{ id: 1, name: 'test' }];
+      const idKey = 'id';
+      const nameKey = 'name';
+      const values = [1];
+      expect(getValuesName(values, list, idKey, nameKey)).toEqual({
+        id: 1,
+        name: 'test',
+      });
+    });
+
+    it('should return id and value if item is not present', () => {
+      const list = [{ id: 1, name: 'test' }];
+      const idKey = 'id';
+      const nameKey = 'name';
+      const values = [2];
+      expect(getValuesName(values, list, idKey, nameKey)).toEqual({
+        id: 2,
+        name: 2,
+      });
+    });
+  });
+
+  describe('#getValuesForFilter', () => {
+    it('should return id and name if attribute_key is assignee_id', () => {
+      const filter = { attribute_key: 'assignee_id', values: [1] };
+      const params = { agents: [{ id: 1, name: 'test' }] };
+      expect(getValuesForFilter(filter, params)).toEqual({
+        id: 1,
+        name: 'test',
+      });
+    });
+
+    it('should return id and name if attribute_key is inbox_id', () => {
+      const filter = { attribute_key: 'inbox_id', values: [1] };
+      const params = { inboxes: [{ id: 1, name: 'test' }] };
+      expect(getValuesForFilter(filter, params)).toEqual({
+        id: 1,
+        name: 'test',
+      });
+    });
+
+    it('should return id and name if attribute_key is team_id', () => {
+      const filter = { attribute_key: 'team_id', values: [1] };
+      const params = { teams: [{ id: 1, name: 'test' }] };
+      expect(getValuesForFilter(filter, params)).toEqual({
+        id: 1,
+        name: 'test',
+      });
+    });
+
+    it('should return id and title if attribute_key is campaign_id', () => {
+      const filter = { attribute_key: 'campaign_id', values: [1] };
+      const params = { campaigns: [{ id: 1, title: 'test' }] };
+      expect(getValuesForFilter(filter, params)).toEqual({
+        id: 1,
+        name: 'test',
+      });
+    });
+
+    it('should return id and title if attribute_key is labels', () => {
+      const filter = { attribute_key: 'labels', values: ['test'] };
+      const params = { labels: [{ title: 'test' }] };
+      expect(getValuesForFilter(filter, params)).toEqual([
+        { id: 'test', name: 'test' },
+      ]);
+    });
+
+    it('should return id and name if attribute_key is browser_language', () => {
+      const filter = { attribute_key: 'browser_language', values: ['en'] };
+      const params = { languages: [{ id: 'en', name: 'English' }] };
+      expect(getValuesForFilter(filter, params)).toEqual([
+        { id: 'en', name: 'English' },
+      ]);
+    });
+
+    it('should return id and name if attribute_key is country_code', () => {
+      const filter = { attribute_key: 'country_code', values: ['IN'] };
+      const params = { countries: [{ id: 'IN', name: 'India' }] };
+      expect(getValuesForFilter(filter, params)).toEqual([
+        { id: 'IN', name: 'India' },
+      ]);
+    });
+
+    it('should return id and name if attribute_key is not present', () => {
+      const filter = { attribute_key: 'test', values: [1] };
+      const params = {};
+      expect(getValuesForFilter(filter, params)).toEqual({
+        id: 1,
+        name: 1,
+      });
+    });
+  });
+
+  describe('#generateValuesForEditCustomViews', () => {
+    it('should return id and name if inboxType is multi_select or search_select', () => {
+      const filter = {
+        attribute_key: 'assignee_id',
+        filter_operator: 'and',
+        values: [1],
+      };
+      const params = {
+        filterTypes: advancedFilterTypes,
+        allCustomAttributes: [],
+        agents: [{ id: 1, name: 'test' }],
+      };
+      expect(generateValuesForEditCustomViews(filter, params)).toEqual({
+        id: 1,
+        name: 'test',
+      });
+    });
+
+    it('should return id and name if inboxType is not multi_select or search_select', () => {
+      const filter = {
+        attribute_key: 'assignee_id',
+        filter_operator: 'and',
+        values: [1],
+      };
+      const params = {
+        filterTypes: advancedFilterTypes,
+        allCustomAttributes: [],
+        agents: [{ id: 1, name: 'test' }],
+      };
+      expect(generateValuesForEditCustomViews(filter, params)).toEqual({
+        id: 1,
+        name: 'test',
+      });
+    });
+
+    it('should return id and name if inboxType is undefined', () => {
+      const filter = {
+        attribute_key: 'test2',
+        filter_operator: 'and',
+        values: [1],
+      };
+      const params = {
+        filterTypes: advancedFilterTypes,
+        allCustomAttributes: [
+          { attribute_key: 'test', attribute_display_type: 'checkbox' },
+          { attribute_key: 'test2', attribute_display_type: 'list' },
+        ],
+      };
+      expect(generateValuesForEditCustomViews(filter, params)).toEqual({
+        id: 1,
+        name: 1,
+      });
+    });
+
+    it('should return value as string if filterInputTypes is string', () => {
+      const filter = {
+        attribute_key: 'test',
+        filter_operator: 'and',
+        values: [1],
+      };
+      const params = {
+        filterTypes: advancedFilterTypes,
+        allCustomAttributes: [
+          { attribute_key: 'test', attribute_display_type: 'date' },
+          { attribute_key: 'test2', attribute_display_type: 'list' },
+        ],
+      };
+      expect(generateValuesForEditCustomViews(filter, params)).toEqual('1');
+    });
+  });
+
+  describe('#generateCustomAttributesInputType', () => {
+    it('should return string if type is text', () => {
+      expect(generateCustomAttributesInputType('text')).toEqual('string');
+    });
+
+    it('should return string if type is number', () => {
+      expect(generateCustomAttributesInputType('number')).toEqual('string');
+    });
+
+    it('should return string if type is date', () => {
+      expect(generateCustomAttributesInputType('date')).toEqual('string');
+    });
+
+    it('should return multi_select if type is checkbox', () => {
+      expect(generateCustomAttributesInputType('checkbox')).toEqual(
+        'multi_select'
+      );
+    });
+
+    it('should return multi_select if type is list', () => {
+      expect(generateCustomAttributesInputType('list')).toEqual('multi_select');
+    });
+
+    it('should return string if type is link', () => {
+      expect(generateCustomAttributesInputType('link')).toEqual('string');
+    });
+  });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
index 361c0c8ae..eae814131 100644
--- a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
@@ -2,12 +2,17 @@
   "FILTER": {
     "TITLE": "Filter Conversations",
     "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
+    "EDIT_CUSTOM_FILTER": "Edit Folder",
+    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your folder.",
     "ADD_NEW_FILTER": "Add Filter",
     "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
     "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "UPDATE_BUTTON_LABEL": "Update folder",
     "CANCEL_BUTTON_LABEL": "Cancel",
     "CLEAR_BUTTON_LABEL": "Clear Filters",
     "EMPTY_VALUE_ERROR": "Value is required",
+    "FOLDER_LABEL": "Folder Name",
+    "FOLDER_QUERY_LABEL": "Folder Query",
     "TOOLTIP_LABEL": "Filter conversations",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "AND",
@@ -71,6 +76,9 @@
           "ERROR_MESSAGE": "Error while creating segment"
         }
       },
+      "EDIT": {
+        "EDIT_BUTTON": "Edit folder"
+      },
       "DELETE": {
         "DELETE_BUTTON": "Delete filter",
         "MODAL": {
diff --git a/app/javascript/dashboard/i18n/locale/en/contactFilters.json b/app/javascript/dashboard/i18n/locale/en/contactFilters.json
index 3f84a8476..207381e12 100644
--- a/app/javascript/dashboard/i18n/locale/en/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/contactFilters.json
@@ -1,50 +1,50 @@
 {
-    "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-        "SUBMIT_BUTTON_LABEL": "Submit",
-        "CANCEL_BUTTON_LABEL": "Cancel",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
-        "TOOLTIP_LABEL": "Filter contacts",
-        "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
-        },
-        "OPERATOR_LABELS": {
-            "equal_to": "Equal to",
-            "not_equal_to": "Not equal to",
-            "contains": "Contains",
-            "does_not_contain": "Does not contain",
-            "is_present": "Is present",
-            "is_not_present": "Is not present",
-            "is_greater_than": "Is greater than",
-            "is_lesser_than": "Is lesser than",
-            "days_before": "Is x days before"
-        },
-        "ATTRIBUTES": {
-            "NAME": "Name",
-            "EMAIL": "Email",
-            "PHONE_NUMBER": "Phone number",
-            "IDENTIFIER": "Identifier",
-            "CITY": "City",
-            "COUNTRY": "Country",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
-            "CUSTOM_ATTRIBUTE_TEXT": "Text",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
-            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-            "CREATED_AT": "Created At",
-            "LAST_ACTIVITY": "Last Activity",
-            "REFERER_LINK": "Referrer link"
-        },
-        "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
-            "CUSTOM_ATTRIBUTES": "Custom Attributes"
-        }
+  "CONTACTS_FILTER": {
+    "TITLE": "Filter Contacts",
+    "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
+    "ADD_NEW_FILTER": "Add Filter",
+    "CLEAR_ALL_FILTERS": "Clear All Filters",
+    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+    "SUBMIT_BUTTON_LABEL": "Submit",
+    "CANCEL_BUTTON_LABEL": "Cancel",
+    "CLEAR_BUTTON_LABEL": "Clear Filters",
+    "EMPTY_VALUE_ERROR": "Value is required",
+    "TOOLTIP_LABEL": "Filter contacts",
+    "QUERY_DROPDOWN_LABELS": {
+      "AND": "AND",
+      "OR": "OR"
+    },
+    "OPERATOR_LABELS": {
+      "equal_to": "Equal to",
+      "not_equal_to": "Not equal to",
+      "contains": "Contains",
+      "does_not_contain": "Does not contain",
+      "is_present": "Is present",
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than",
+      "days_before": "Is x days before"
+    },
+    "ATTRIBUTES": {
+      "NAME": "Name",
+      "EMAIL": "Email",
+      "PHONE_NUMBER": "Phone number",
+      "IDENTIFIER": "Identifier",
+      "CITY": "City",
+      "COUNTRY": "Country",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+      "CREATED_AT": "Created At",
+      "LAST_ACTIVITY": "Last Activity",
+      "REFERER_LINK": "Referrer link"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Custom Attributes"
     }
+  }
 }
diff --git a/app/javascript/dashboard/store/modules/customViews.js b/app/javascript/dashboard/store/modules/customViews.js
index 40b126663..ba31dd815 100644
--- a/app/javascript/dashboard/store/modules/customViews.js
+++ b/app/javascript/dashboard/store/modules/customViews.js
@@ -49,6 +49,18 @@ export const actions = {
       commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: false });
     }
   },
+  update: async function updateCustomViews({ commit }, obj) {
+    commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: true });
+    try {
+      const response = await CustomViewsAPI.update(obj.id, obj);
+      commit(types.UPDATE_CUSTOM_VIEW, response.data);
+    } catch (error) {
+      const errorMessage = error?.response?.data?.message;
+      throw new Error(errorMessage);
+    } finally {
+      commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: false });
+    }
+  },
   delete: async ({ commit }, { id, filterType }) => {
     commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: true });
     try {
@@ -72,6 +84,7 @@ export const mutations = {
 
   [types.ADD_CUSTOM_VIEW]: MutationHelpers.create,
   [types.SET_CUSTOM_VIEW]: MutationHelpers.set,
+  [types.UPDATE_CUSTOM_VIEW]: MutationHelpers.update,
   [types.DELETE_CUSTOM_VIEW]: MutationHelpers.destroy,
 };
 
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
index 5de9732c6..23dca5f3b 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { actions } from '../../customViews';
 import * as types from '../../../mutation-types';
-import customViewList from './fixtures';
+import { customViewList, updateCustomViewList } from './fixtures';
 
 const commit = jest.fn();
 global.axios = axios;
@@ -67,4 +67,28 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#update', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.patch.mockResolvedValue({ data: updateCustomViewList[0] });
+      await actions.update(
+        { commit },
+        updateCustomViewList[0].id,
+        updateCustomViewList[0]
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: true }],
+        [types.default.UPDATE_CUSTOM_VIEW, updateCustomViewList[0]],
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.patch.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.update({ commit }, 1)).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: true }],
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js b/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
index 1a620add9..3cd57478e 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
@@ -1,4 +1,4 @@
-export default [
+export const customViewList = [
   {
     name: 'Custom view',
     filter_type: 0,
@@ -34,3 +34,31 @@ export default [
     },
   },
 ];
+
+export const updateCustomViewList = [
+  {
+    id: 1,
+    name: 'Open',
+    filter_type: 'conversation',
+    query: {
+      payload: [
+        {
+          attribute_key: 'status',
+          attribute_model: 'standard',
+          filter_operator: 'equal_to',
+          values: ['open'],
+          query_operator: 'and',
+          custom_attribute_type: '',
+        },
+        {
+          attribute_key: 'assignee_id',
+          filter_operator: 'equal_to',
+          values: [52],
+          custom_attribute_type: '',
+        },
+      ],
+    },
+    created_at: '2022-02-08T03:17:38.761Z',
+    updated_at: '2023-06-05T13:57:48.478Z',
+  },
+];
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
index ec50a7d5d..5428e4461 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
@@ -1,5 +1,5 @@
 import { getters } from '../../customViews';
-import customViewList from './fixtures';
+import { customViewList } from './fixtures';
 
 describe('#getters', () => {
   it('getCustomViews', () => {
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/mutations.spec.js
index 05da48b6d..d5eacb236 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/mutations.spec.js
@@ -1,6 +1,6 @@
 import types from '../../../mutation-types';
 import { mutations } from '../../customViews';
-import customViewList from './fixtures';
+import { customViewList, updateCustomViewList } from './fixtures';
 
 describe('#mutations', () => {
   describe('#SET_CUSTOM_VIEW', () => {
@@ -26,4 +26,12 @@ describe('#mutations', () => {
       expect(state.records).toEqual([customViewList[0]]);
     });
   });
+
+  describe('#UPDATE_CUSTOM_VIEW', () => {
+    it('update custom view record', () => {
+      const state = { records: [updateCustomViewList[0]] };
+      mutations[types.UPDATE_CUSTOM_VIEW](state, updateCustomViewList[0]);
+      expect(state.records).toEqual(updateCustomViewList);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 2f73080d3..905b62b2e 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -221,6 +221,7 @@ export default {
   SET_CUSTOM_VIEW_UI_FLAG: 'SET_CUSTOM_VIEW_UI_FLAG',
   SET_CUSTOM_VIEW: 'SET_CUSTOM_VIEW',
   ADD_CUSTOM_VIEW: 'ADD_CUSTOM_VIEW',
+  UPDATE_CUSTOM_VIEW: 'UPDATE_CUSTOM_VIEW',
   DELETE_CUSTOM_VIEW: 'DELETE_CUSTOM_VIEW',
 
   // Bulk Actions

From 2b7989f52b8e2e696c938b2c7c8e10c1c1b42b78 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 8 Jun 2023 17:07:08 +0530
Subject: [PATCH 67/93] fix: reply mailer with sender name (#7232)

---
 app/mailers/conversation_reply_mailer.rb      | 22 +++++++--------
 .../mailers/conversation_reply_mailer_spec.rb | 28 ++++++++++++++-----
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index b118df107..139be8d2b 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -79,8 +79,12 @@ class ConversationReplyMailer < ApplicationMailer
     @conversation.messages.chat.where.not(message_type: :incoming)&.last
   end
 
-  def assignee_name
-    @assignee_name ||= @agent&.available_name || 'Notifications'
+  def sender_name
+    @sender_name ||= current_message&.sender&.name || @agent&.available_name || 'Notifications'
+  end
+
+  def current_message
+    @message || @messages.last
   end
 
   def mail_subject
@@ -97,7 +101,7 @@ class ConversationReplyMailer < ApplicationMailer
 
   def reply_email
     if should_use_conversation_email_address?
-      I18n.t('conversations.reply.email.header.reply_with_name', assignee_name: assignee_name, inbox_name: @inbox.name,
+      I18n.t('conversations.reply.email.header.reply_with_name', assignee_name: sender_name, inbox_name: @inbox.name,
                                                                  reply_email: "#{@conversation.uuid}@#{@account.inbound_email_domain}")
     else
       @inbox.email_address || @agent&.email
@@ -106,21 +110,17 @@ class ConversationReplyMailer < ApplicationMailer
 
   def from_email_with_name
     if should_use_conversation_email_address?
-      I18n.t('conversations.reply.email.header.from_with_name', assignee_name: assignee_name, inbox_name: @inbox.name,
+      I18n.t('conversations.reply.email.header.from_with_name', assignee_name: sender_name, inbox_name: @inbox.name,
                                                                 from_email: parse_email(@account.support_email))
     else
-      I18n.t('conversations.reply.email.header.from_with_name', assignee_name: assignee_name, inbox_name: @inbox.name,
+      I18n.t('conversations.reply.email.header.from_with_name', assignee_name: sender_name, inbox_name: @inbox.name,
                                                                 from_email: parse_email(inbox_from_email_address))
     end
   end
 
   def channel_email_with_name
-    if @conversation.assignee.present?
-      I18n.t('conversations.reply.channel_email.header.reply_with_name', assignee_name: assignee_name, inbox_name: @inbox.name,
-                                                                         from_email: @channel.email)
-    else
-      I18n.t('conversations.reply.channel_email.header.reply_with_inbox_name', inbox_name: @inbox.name, from_email: @channel.email)
-    end
+    I18n.t('conversations.reply.channel_email.header.reply_with_name', assignee_name: sender_name, inbox_name: @inbox.name,
+                                                                       from_email: @channel.email)
   end
 
   def parse_email(email_string)
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index c10dfe2d5..8e65e9396 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -86,7 +86,7 @@ RSpec.describe ConversationReplyMailer do
       let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
 
       it 'has correct name' do
-        expect(mail[:from].display_names).to eq(['Notifications from Inbox'])
+        expect(mail[:from].display_names).to eq(["#{message.sender.name} from Inbox"])
       end
     end
 
@@ -169,15 +169,29 @@ RSpec.describe ConversationReplyMailer do
         expect(mail.delivery_method.settings[:port]).to eq 587
       end
 
-      it 'renders assignee name in the from address' do
+      it 'renders sender name in the from address' do
+        mail = described_class.email_reply(message)
+        expect(mail['from'].value).to eq "#{message.sender.name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
+      end
+
+      it 'renders sender name even when assignee is not present' do
+        conversation.update(assignee_id: nil)
+        mail = described_class.email_reply(message)
+        expect(mail['from'].value).to eq "#{message.sender.name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
+      end
+
+      it 'renders assignee name in the from address when sender_name not available' do
+        message.update(sender_id: nil)
         mail = described_class.email_reply(message)
         expect(mail['from'].value).to eq "#{conversation.assignee.available_name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
       end
 
-      it 'renders inbox name in the from address' do
-        conversation.update(assignee: nil)
+      it 'renders inbox name as sender and assignee not present' do
+        message.update(sender_id: nil)
+        conversation.update(assignee_id: nil)
+
         mail = described_class.email_reply(message)
-        expect(mail['from'].value).to eq "#{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
+        expect(mail['from'].value).to eq "Notifications from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
       end
     end
 
@@ -260,13 +274,13 @@ RSpec.describe ConversationReplyMailer do
 
       it 'sets reply to email to be based on the domain' do
         reply_to_email = "reply+#{message.conversation.uuid}@#{conversation.account.domain}"
-        reply_to = "#{agent.available_name} from #{conversation.inbox.name} <#{reply_to_email}>"
+        reply_to = "#{message.sender.name} from #{conversation.inbox.name} <#{reply_to_email}>"
         expect(mail['REPLY-TO'].value).to eq(reply_to)
         expect(mail.reply_to).to eq([reply_to_email])
       end
 
       it 'sets the from email to be the support email' do
-        expect(mail['FROM'].value).to eq("#{agent.available_name} from Inbox <#{conversation.account.support_email}>")
+        expect(mail['FROM'].value).to eq("#{conversation.messages.last.sender.name} from Inbox <#{conversation.account.support_email}>")
         expect(mail.from).to eq([conversation.account.support_email])
       end
 

From 2f2ae88cba41b3cf7bcd2262b1a77ac4a0d2fcc8 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 8 Jun 2023 17:58:13 +0530
Subject: [PATCH 68/93] fix: unattended count mismatch in report and list
 (#7263)

---
 app/builders/v2/report_builder.rb  | 3 +--
 app/finders/conversation_finder.rb | 2 +-
 app/models/conversation.rb         | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/builders/v2/report_builder.rb b/app/builders/v2/report_builder.rb
index b786ba25c..b5fb8045b 100644
--- a/app/builders/v2/report_builder.rb
+++ b/app/builders/v2/report_builder.rb
@@ -96,10 +96,9 @@ class V2::ReportBuilder
 
   def conversations
     @open_conversations = scope.conversations.where(account_id: @account.id).open
-    first_response_count = @account.reporting_events.where(name: 'first_response', conversation_id: @open_conversations.pluck('id')).count
     metric = {
       open: @open_conversations.count,
-      unattended: @open_conversations.count - first_response_count
+      unattended: @open_conversations.unattended.count
     }
     metric[:unassigned] = @open_conversations.unassigned.count if params[:type].equal?(:account)
     metric
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index cadbb4644..5ac056931 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -102,7 +102,7 @@ class ConversationFinder
     when 'participating'
       @conversations = current_user.participating_conversations.where(account_id: current_account.id)
     when 'unattended'
-      @conversations = @conversations.where(first_reply_created_at: nil)
+      @conversations = @conversations.unattended
     end
     @conversations
   end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 668d96d52..8bc23a174 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -69,6 +69,7 @@ class Conversation < ApplicationRecord
   scope :unassigned, -> { where(assignee_id: nil) }
   scope :assigned, -> { where.not(assignee_id: nil) }
   scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
+  scope :unattended, -> { where(first_reply_created_at: nil) }
   scope :resolvable, lambda { |auto_resolve_duration|
     return none if auto_resolve_duration.to_i.zero?
 

From b3b76d00ff866cae49f919c4ed835855c2437263 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 8 Jun 2023 08:22:10 -0700
Subject: [PATCH 69/93] fix: Do not use the default value if the out of office
 message is empty (#7268)

---
 app/javascript/dashboard/i18n/locale/en/inboxMgmt.json    | 1 -
 .../settings/inbox/components/WeeklyAvailability.vue      | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 776dd101f..5280c7e1a 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -535,7 +535,6 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
       "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
index 5eee329b4..533a514f7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
@@ -102,9 +102,7 @@ export default {
   data() {
     return {
       isBusinessHoursEnabled: false,
-      unavailableMessage: this.$t(
-        'INBOX_MGMT.BUSINESS_HOURS.UNAVAILABLE_MESSAGE_DEFAULT'
-      ),
+      unavailableMessage: '',
       timeZone: DEFAULT_TIMEZONE,
       dayNames: {
         0: 'Sunday',
@@ -157,9 +155,7 @@ export default {
         ? timeSlotParse(timeSlots)
         : defaultTimeSlot;
       this.isBusinessHoursEnabled = isEnabled;
-      this.unavailableMessage =
-        unavailableMessage ||
-        this.$t('INBOX_MGMT.BUSINESS_HOURS.UNAVAILABLE_MESSAGE_DEFAULT');
+      this.unavailableMessage = unavailableMessage || '';
       this.timeSlots = slots;
       this.timeZone =
         this.timeZones.find(item => timeZone === item.value) ||

From 7fd220c177ea32435c020fd55f5cbba50a889d0e Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 8 Jun 2023 21:25:51 +0530
Subject: [PATCH 70/93] feat: Adds the ability to edit saved segments (#7254)

* feat: Ability to edit saved filters

* chore: Adds edit contact segment

* chore: Minor fixes

* fix: code climate

* chore: Minor fixes

* chore: Adds ability to custom view name

* chore: Minor fixes

* chore: Adds spec for helper

* chore: Revert contact filter to split to new PR

* Delete editSegmentMixin.js

* chore: Revert fixes

* Update app/javascript/dashboard/i18n/locale/en/advancedFilters.json

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>

* Update app/javascript/dashboard/i18n/locale/en/advancedFilters.json

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>

* chore: Moved from mixin to helper for reusing in segments

* Delete editFolderMixin.js

* chore: Fix specs and added new specs

* chore: review comment fixes

* chore: Minor fixes

* fix: Not resetting applied filter

* feat: Adds the ability to edit saved segments

* feat: Adds specs for API part

---------

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 .../dashboard/i18n/locale/en/contact.json     |  1 +
 .../i18n/locale/en/contactFilters.json        |  5 +
 .../components/ContactsAdvancedFilters.vue    | 98 ++++++++++++++++---
 .../contacts/components/ContactsView.vue      | 77 ++++++++++++++-
 .../dashboard/contacts/components/Header.vue  | 30 ++++--
 5 files changed, 184 insertions(+), 27 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 4d1736ed0..042a1c1fc 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -211,6 +211,7 @@
     "FILTER_CONTACTS": "Filter",
     "FILTER_CONTACTS_SAVE": "Save filter",
     "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS_EDIT": "Edit segment",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/en/contactFilters.json b/app/javascript/dashboard/i18n/locale/en/contactFilters.json
index 207381e12..09a543984 100644
--- a/app/javascript/dashboard/i18n/locale/en/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/contactFilters.json
@@ -2,13 +2,18 @@
   "CONTACTS_FILTER": {
     "TITLE": "Filter Contacts",
     "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
+    "EDIT_CUSTOM_SEGMENT": "Edit Segment",
+    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your segment.",
     "ADD_NEW_FILTER": "Add Filter",
     "CLEAR_ALL_FILTERS": "Clear All Filters",
     "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
     "SUBMIT_BUTTON_LABEL": "Submit",
+    "UPDATE_BUTTON_LABEL": "Update Segment",
     "CANCEL_BUTTON_LABEL": "Cancel",
     "CLEAR_BUTTON_LABEL": "Clear Filters",
     "EMPTY_VALUE_ERROR": "Value is required",
+    "SEGMENT_LABEL": "Segment Name",
+    "SEGMENT_QUERY_LABEL": "Segment Query",
     "TOOLTIP_LABEL": "Filter contacts",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "AND",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
index 3e988e0a4..d214a7b01 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
@@ -1,9 +1,25 @@
 <template>
   <div class="column">
-    <woot-modal-header :header-title="$t('CONTACTS_FILTER.TITLE')">
-      <p>{{ $t('CONTACTS_FILTER.SUBTITLE') }}</p>
+    <woot-modal-header :header-title="filterModalHeaderTitle">
+      <p>{{ filterModalSubTitle }}</p>
     </woot-modal-header>
-    <div class="row modal-content">
+    <div class="column modal-content">
+      <div v-if="isSegmentsView" class="columns">
+        <label class="input-label" :class="{ error: !activeSegmentNewName }">
+          {{ $t('CONTACTS_FILTER.SEGMENT_LABEL') }}
+          <input
+            v-model="activeSegmentNewName"
+            type="text"
+            class="name-input"
+          />
+          <span v-if="!activeSegmentNewName" class="message">
+            {{ $t('CONTACTS_FILTER.EMPTY_VALUE_ERROR') }}
+          </span>
+        </label>
+        <label class="input-label">
+          {{ $t('CONTACTS_FILTER.SEGMENT_QUERY_LABEL') }}
+        </label>
+      </div>
       <div class="medium-12 columns filters-wrap">
         <filter-input-box
           v-for="(filter, i) in appliedFilters"
@@ -36,7 +52,7 @@
             {{ $t('CONTACTS_FILTER.ADD_NEW_FILTER') }}
           </woot-button>
           <woot-button
-            v-if="hasAppliedFilters"
+            v-if="hasAppliedFilters && !isSegmentsView"
             icon="subtract"
             color-scheme="alert"
             variant="smooth"
@@ -52,7 +68,14 @@
           <woot-button class="button clear" @click.prevent="onClose">
             {{ $t('CONTACTS_FILTER.CANCEL_BUTTON_LABEL') }}
           </woot-button>
-          <woot-button @click="submitFilterQuery">
+          <woot-button
+            v-if="isSegmentsView"
+            :disabled="!activeSegmentNewName"
+            @click="updateSegment"
+          >
+            {{ $t('CONTACTS_FILTER.UPDATE_BUTTON_LABEL') }}
+          </woot-button>
+          <woot-button v-else @click="submitFilterQuery">
             {{ $t('CONTACTS_FILTER.SUBMIT_BUTTON_LABEL') }}
           </woot-button>
         </div>
@@ -85,6 +108,18 @@ export default {
       type: Array,
       default: () => [],
     },
+    initialAppliedFilters: {
+      type: Array,
+      default: () => [],
+    },
+    isSegmentsView: {
+      type: Boolean,
+      default: false,
+    },
+    activeSegmentName: {
+      type: String,
+      default: '',
+    },
   },
   validations: {
     appliedFilters: {
@@ -105,7 +140,8 @@ export default {
   data() {
     return {
       show: true,
-      appliedFilters: [],
+      appliedFilters: this.initialAppliedFilters,
+      activeSegmentNewName: this.activeSegmentName,
       filterTypes: this.initialFilterTypes,
       filterGroups: [],
       allCustomAttributes: [],
@@ -121,12 +157,22 @@ export default {
     hasAppliedFilters() {
       return this.getAppliedContactFilters.length;
     },
+    filterModalHeaderTitle() {
+      return !this.isSegmentsView
+        ? this.$t('CONTACTS_FILTER.TITLE')
+        : this.$t('CONTACTS_FILTER.EDIT_CUSTOM_SEGMENT');
+    },
+    filterModalSubTitle() {
+      return !this.isSegmentsView
+        ? this.$t('CONTACTS_FILTER.SUBTITLE')
+        : this.$t('CONTACTS_FILTER.CUSTOM_VIEWS_SUBTITLE');
+    },
   },
   mounted() {
     this.setFilterAttributes();
     if (this.getAppliedContactFilters.length) {
       this.appliedFilters = [...this.getAppliedContactFilters];
-    } else {
+    } else if (!this.isSegmentsView) {
       this.appliedFilters.push({
         attribute_key: 'name',
         filter_operator: 'equal_to',
@@ -177,11 +223,11 @@ export default {
       if (key === 'created_at' || key === 'last_activity_at')
         if (operator === 'days_before') return 'plain_text';
       const type = this.filterTypes.find(filter => filter.attributeKey === key);
-      return type.inputType;
+      return type?.inputType;
     },
     getOperators(key) {
       const type = this.filterTypes.find(filter => filter.attributeKey === key);
-      return type.filterOperators;
+      return type?.filterOperators;
     },
     getDropdownValues(type) {
       const allCustomAttributes = this.$store.getters[
@@ -230,11 +276,30 @@ export default {
       }
     },
     appendNewFilter() {
-      this.appliedFilters.push({
-        attribute_key: 'name',
-        filter_operator: 'equal_to',
-        values: '',
+      if (this.isSegmentsView) {
+        this.setQueryOperatorOnLastQuery();
+      } else {
+        this.appliedFilters.push({
+          attribute_key: 'name',
+          filter_operator: 'equal_to',
+          values: '',
+          query_operator: 'and',
+        });
+      }
+    },
+    setQueryOperatorOnLastQuery() {
+      const lastItemIndex = this.appliedFilters.length - 1;
+      this.appliedFilters[lastItemIndex] = {
+        ...this.appliedFilters[lastItemIndex],
         query_operator: 'and',
+      };
+      this.$nextTick(() => {
+        this.appliedFilters.push({
+          attribute_key: 'name',
+          filter_operator: 'equal_to',
+          values: '',
+          query_operator: 'and',
+        });
       });
     },
     removeFilter(index) {
@@ -259,6 +324,13 @@ export default {
         })),
       });
     },
+    updateSegment() {
+      this.$emit(
+        'updateSegment',
+        this.appliedFilters,
+        this.activeSegmentNewName
+      );
+    },
     resetFilter(index, currentFilter) {
       this.appliedFilters[index].filter_operator = this.filterTypes.find(
         filter => filter.attributeKey === currentFilter.attribute_key
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index afbcfd5a5..a7e2c3e29 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contacts-page row">
-    <div class="left-wrap" :class="wrapClas">
+    <div class="left-wrap" :class="wrapClass">
       <contacts-header
         :search-query="searchQuery"
         :segments-id="segmentsId"
@@ -13,6 +13,7 @@
         :header-title="pageTitle"
         @on-toggle-save-filter="onToggleSaveFilters"
         @on-toggle-delete-filter="onToggleDeleteFilters"
+        @on-toggle-edit-filter="onToggleFilters"
       />
       <contacts-table
         :contacts="records"
@@ -58,14 +59,18 @@
     </woot-modal>
     <woot-modal
       :show.sync="showFiltersModal"
-      :on-close="onToggleFilters"
+      :on-close="closeAdvanceFiltersModal"
       size="medium"
     >
       <contacts-advanced-filters
         v-if="showFiltersModal"
-        :on-close="onToggleFilters"
+        :on-close="closeAdvanceFiltersModal"
         :initial-filter-types="contactFilterItems"
+        :initial-applied-filters="appliedFilter"
+        :active-segment-name="activeSegmentName"
+        :is-segments-view="hasActiveSegments"
         @applyFilter="onApplyFilter"
+        @updateSegment="onUpdateSegment"
         @clearFilters="clearFilters"
       />
     </woot-modal>
@@ -87,6 +92,8 @@ import filterQueryGenerator from '../../../../helper/filterQueryGenerator';
 import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews';
 import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCustomViews';
 import { CONTACTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
+import countries from 'shared/constants/countries.js';
+import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';
 
 const DEFAULT_PAGE = 1;
 const FILTER_TYPE_CONTACT = 1;
@@ -128,6 +135,7 @@ export default {
       filterType: FILTER_TYPE_CONTACT,
       showAddSegmentsModal: false,
       showDeleteSegmentsModal: false,
+      appliedFilter: [],
     };
   },
   computed: {
@@ -175,7 +183,7 @@ export default {
     showContactViewPane() {
       return this.selectedContactId !== '';
     },
-    wrapClas() {
+    wrapClass() {
       return this.showContactViewPane ? 'medium-9' : 'medium-12';
     },
     pageParameter() {
@@ -194,6 +202,9 @@ export default {
       }
       return undefined;
     },
+    activeSegmentName() {
+      return this.activeSegment?.name;
+    },
   },
   watch: {
     label() {
@@ -345,7 +356,14 @@ export default {
       });
     },
     onToggleFilters() {
-      this.showFiltersModal = !this.showFiltersModal;
+      if (this.hasActiveSegments) {
+        this.initializeSegmentToFilterModal(this.activeSegment);
+      }
+      this.showFiltersModal = true;
+    },
+    closeAdvanceFiltersModal() {
+      this.showFiltersModal = false;
+      this.appliedFilter = [];
     },
     onApplyFilter(payload) {
       this.closeContactInfoPanel();
@@ -355,10 +373,59 @@ export default {
       });
       this.showFiltersModal = false;
     },
+    onUpdateSegment(payload, segmentName) {
+      const payloadData = {
+        ...this.activeSegment,
+        name: segmentName,
+        query: filterQueryGenerator(payload),
+      };
+      this.$store.dispatch('customViews/update', payloadData);
+      this.closeAdvanceFiltersModal();
+    },
     clearFilters() {
       this.$store.dispatch('contacts/clearContactFilters');
       this.fetchContacts(this.pageParameter);
     },
+    setParamsForEditSegmentModal() {
+      // Here we are setting the params for edit segment modal to show the existing values.
+
+      // For custom attributes we get only attribute key.
+      // So we are mapping it to find the input type of the attribute to show in the edit segment modal.
+      const params = {
+        countries: countries,
+        filterTypes: contactFilterItems,
+        allCustomAttributes: this.$store.getters[
+          'attributes/getAttributesByModel'
+        ]('contact_attribute'),
+      };
+      return params;
+    },
+    initializeSegmentToFilterModal(activeSegment) {
+      // Here we are setting the params for edit segment modal.
+      //  To show the existing values. when we click on edit segment button.
+
+      // Here we get the query from the active segment.
+      // And we are mapping the query to the actual values.
+      // To show in the edit segment modal by the help of generateValuesForEditCustomViews helper.
+      const query = activeSegment?.query?.payload;
+      if (!Array.isArray(query)) return;
+
+      this.appliedFilter.push(
+        ...query.map(filter => ({
+          attribute_key: filter.attribute_key,
+          attribute_model: filter.attribute_model,
+          filter_operator: filter.filter_operator,
+          values: Array.isArray(filter.values)
+            ? generateValuesForEditCustomViews(
+                filter,
+                this.setParamsForEditSegmentModal()
+              )
+            : [],
+          query_operator: filter.query_operator,
+          custom_attribute_type: filter.custom_attribute_type,
+        }))
+      );
+    },
     openSavedItemInSegment() {
       const lastItemInSegments = this.segments[this.segments.length - 1];
       const lastItemId = lastItemInSegments.id;
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 0aeddf162..fd6dc8d52 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -27,15 +27,24 @@
             {{ $t('CONTACTS_PAGE.SEARCH_BUTTON') }}
           </woot-button>
         </div>
-        <woot-button
-          v-if="hasActiveSegments"
-          class="margin-right-1 clear"
-          color-scheme="alert"
-          icon="delete"
-          @click="onToggleDeleteSegmentsModal"
-        >
-          {{ $t('CONTACTS_PAGE.FILTER_CONTACTS_DELETE') }}
-        </woot-button>
+        <div v-if="hasActiveSegments">
+          <woot-button
+            class="margin-right-1 clear"
+            color-scheme="secondary"
+            icon="edit"
+            @click="onToggleEditSegmentsModal"
+          >
+            {{ $t('CONTACTS_PAGE.FILTER_CONTACTS_EDIT') }}
+          </woot-button>
+          <woot-button
+            class="margin-right-1 clear"
+            color-scheme="alert"
+            icon="delete"
+            @click="onToggleDeleteSegmentsModal"
+          >
+            {{ $t('CONTACTS_PAGE.FILTER_CONTACTS_DELETE') }}
+          </woot-button>
+        </div>
         <div v-if="!hasActiveSegments" class="filters__button-wrap">
           <div v-if="hasAppliedFilters" class="filters__applied-indicator" />
           <woot-button
@@ -147,6 +156,9 @@ export default {
     onToggleSegmentsModal() {
       this.$emit('on-toggle-save-filter');
     },
+    onToggleEditSegmentsModal() {
+      this.$emit('on-toggle-edit-filter');
+    },
     onToggleDeleteSegmentsModal() {
       this.$emit('on-toggle-delete-filter');
     },

From c8fac08e0b0342c571ff5d1cc3e02220eb1a9894 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 8 Jun 2023 20:12:14 -0700
Subject: [PATCH 71/93] fix: Cannot read properties of undefined (reading
 'some') (#7278)

Fixes https://linear.app/chatwoot/issue/CW-2041/typeerror-cannot-read-properties-of-undefined-reading-some
Fixes https://linear.app/chatwoot/issue/CW-2042/typeerror-cannot-read-properties-of-undefined-reading-filter
---
 .../dashboard/store/modules/conversations/index.js       | 9 ++++-----
 .../store/modules/specs/conversations/mutations.spec.js  | 8 ++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 2062b07da..026d51d55 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -58,11 +58,10 @@ export const mutations = {
     }
   },
   [types.SET_ALL_ATTACHMENTS](_state, { id, data }) {
-    if (data.length) {
-      const [chat] = _state.allConversations.filter(c => c.id === id);
-      Vue.set(chat, 'attachments', []);
-      chat.attachments.push(...data);
-    }
+    const [chat] = _state.allConversations.filter(c => c.id === id);
+    if (!chat) return;
+    Vue.set(chat, 'attachments', []);
+    chat.attachments.push(...data);
   },
   [types.SET_MISSING_MESSAGES](_state, { id, data }) {
     const [chat] = _state.allConversations.filter(c => c.id === id);
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
index c7280c6f9..279b36872 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
@@ -288,6 +288,14 @@ describe('#mutations', () => {
       mutations[types.SET_ALL_ATTACHMENTS](state, { id: 1, data });
       expect(state.allConversations[0].attachments).toEqual(data);
     });
+    it('set attachments key even if the attachments are empty', () => {
+      const state = {
+        allConversations: [{ id: 1 }],
+      };
+      const data = [];
+      mutations[types.SET_ALL_ATTACHMENTS](state, { id: 1, data });
+      expect(state.allConversations[0].attachments).toEqual([]);
+    });
   });
 
   describe('#ADD_CONVERSATION_ATTACHMENTS', () => {

From c715e396f017f76bd84c899d7c022076616e80b1 Mon Sep 17 00:00:00 2001
From: "Chamath K.B. Attanayaka" <84182411+ChamathKB@users.noreply.github.com>
Date: Fri, 9 Jun 2023 15:20:45 +0530
Subject: [PATCH 72/93] feat: added input_select type message support for
 whatsapp (#6886)

- Added input_select message type support for Whatsapp Cloud API and Whatsapp 360dialog.

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../whatsapp/providers/base_service.rb        | 50 +++++++++++++++
 .../providers/whatsapp_360_dialog_service.rb  | 18 ++++++
 .../providers/whatsapp_cloud_service.rb       | 19 ++++++
 .../whatsapp360_dialog_service_spec.rb        | 63 ++++++++++++++++++-
 .../providers/whatsapp_cloud_service_spec.rb  | 59 +++++++++++++++++
 5 files changed, 208 insertions(+), 1 deletion(-)

diff --git a/app/services/whatsapp/providers/base_service.rb b/app/services/whatsapp/providers/base_service.rb
index 62401337e..9923017dd 100644
--- a/app/services/whatsapp/providers/base_service.rb
+++ b/app/services/whatsapp/providers/base_service.rb
@@ -26,4 +26,54 @@ class Whatsapp::Providers::BaseService
   def validate_provider_config
     raise 'Overwrite this method in child class'
   end
+
+  def create_buttons(items)
+    buttons = []
+    items.each do |item|
+      button = { :type => 'reply', 'reply' => { 'id' => item['value'], 'title' => item['title'] } }
+      buttons << button
+    end
+    buttons
+  end
+
+  def create_rows(items)
+    rows = []
+    items.each do |item|
+      row = { 'id' => item['value'], 'title' => item['title'] }
+      rows << row
+    end
+    rows
+  end
+
+  def create_payload(type, message_content, action)
+    {
+      'type': type,
+      'body': {
+        'text': message_content
+      },
+      'action': action
+    }
+  end
+
+  def create_payload_based_on_items(message)
+    if message.content_attributes['items'].length <= 3
+      create_button_payload(message)
+    else
+      create_list_payload(message)
+    end
+  end
+
+  def create_button_payload(message)
+    buttons = create_buttons(message.content_attributes['items'])
+    json_hash = { 'buttons' => buttons }
+    create_payload('button', message.content, JSON.generate(json_hash))
+  end
+
+  def create_list_payload(message)
+    rows = create_rows(message.content_attributes['items'])
+    section1 = { 'rows' => rows }
+    sections = [section1]
+    json_hash = { :button => 'Choose an item', 'sections' => sections }
+    create_payload('list', message.content, JSON.generate(json_hash))
+  end
 end
diff --git a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
index 3f09f2467..668162905 100644
--- a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
@@ -2,6 +2,8 @@ class Whatsapp::Providers::Whatsapp360DialogService < Whatsapp::Providers::BaseS
   def send_message(phone_number, message)
     if message.attachments.present?
       send_attachment_message(phone_number, message)
+    elsif message.content_type == 'input_select'
+      send_interactive_text_message(phone_number, message)
     else
       send_text_message(phone_number, message)
     end
@@ -112,4 +114,20 @@ class Whatsapp::Providers::Whatsapp360DialogService < Whatsapp::Providers::BaseS
       }]
     }
   end
+
+  def send_interactive_text_message(phone_number, message)
+    payload = create_payload_based_on_items(message)
+
+    response = HTTParty.post(
+      "#{api_base_path}/messages",
+      headers: api_headers,
+      body: {
+        to: phone_number,
+        interactive: payload,
+        type: 'interactive'
+      }.to_json
+    )
+
+    process_response(response)
+  end
 end
diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
index 9fff873e5..d1092e2ff 100644
--- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
@@ -2,6 +2,8 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
   def send_message(phone_number, message)
     if message.attachments.present?
       send_attachment_message(phone_number, message)
+    elsif message.content_type == 'input_select'
+      send_interactive_text_message(phone_number, message)
     else
       send_text_message(phone_number, message)
     end
@@ -129,4 +131,21 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
       }]
     }
   end
+
+  def send_interactive_text_message(phone_number, message)
+    payload = create_payload_based_on_items(message)
+
+    response = HTTParty.post(
+      "#{phone_id_path}/messages",
+      headers: api_headers,
+      body: {
+        messaging_product: 'whatsapp',
+        to: phone_number,
+        interactive: payload,
+        type: 'interactive'
+      }.to_json
+    )
+
+    process_response(response)
+  end
 end
diff --git a/spec/services/whatsapp/providers/whatsapp360_dialog_service_spec.rb b/spec/services/whatsapp/providers/whatsapp360_dialog_service_spec.rb
index 477674497..bba3f5914 100644
--- a/spec/services/whatsapp/providers/whatsapp360_dialog_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp360_dialog_service_spec.rb
@@ -1,10 +1,12 @@
-## the specs are covered in send in spec/services/whatsapp/send_on_whatsapp_service_spec.rb
+## the older specs are covered in send in spec/services/whatsapp/send_on_whatsapp_service_spec.rb
 require 'rails_helper'
 
 describe Whatsapp::Providers::Whatsapp360DialogService do
   subject(:service) { described_class.new(whatsapp_channel: whatsapp_channel) }
 
   let!(:whatsapp_channel) { create(:channel_whatsapp, sync_templates: false, validate_provider_config: false) }
+  let(:response_headers) { { 'Content-Type' => 'application/json' } }
+  let(:whatsapp_response) { { messages: [{ id: 'message_id' }] } }
 
   describe '#sync_templates' do
     context 'when called' do
@@ -18,4 +20,63 @@ describe Whatsapp::Providers::Whatsapp360DialogService do
       end
     end
   end
+
+  describe '#send_interactive message' do
+    context 'when called' do
+      it 'calls message endpoints with button payload when number of items is less than or equal to 3' do
+        message = create(:message, message_type: :outgoing, content: 'test',
+                                   inbox: whatsapp_channel.inbox, content_type: 'input_select',
+                                   content_attributes: {
+                                     items: [
+                                       { title: 'Burito', value: 'Burito' },
+                                       { title: 'Pasta', value: 'Pasta' },
+                                       { title: 'Sushi', value: 'Sushi' }
+                                     ]
+                                   })
+        stub_request(:post, 'https://waba.360dialog.io/v1/messages')
+          .with(
+            body: {
+              to: '+123456789',
+              interactive: {
+                type: 'button',
+                body: {
+                  text: 'test'
+                },
+                action: '{"buttons":[{"type":"reply","reply":{"id":"Burito","title":"Burito"}},{"type":"reply",' \
+                        '"reply":{"id":"Pasta","title":"Pasta"}},{"type":"reply","reply":{"id":"Sushi","title":"Sushi"}}]}'
+              }, type: 'interactive'
+            }.to_json
+          ).to_return(status: 200, body: whatsapp_response.to_json, headers: response_headers)
+        expect(service.send_message('+123456789', message)).to eq 'message_id'
+      end
+
+      it 'calls message endpoints with list payload when number of items is greater than 3' do
+        message = create(:message, message_type: :outgoing, content: 'test', inbox: whatsapp_channel.inbox,
+                                   content_type: 'input_select',
+                                   content_attributes: {
+                                     items: [
+                                       { title: 'Burito', value: 'Burito' },
+                                       { title: 'Pasta', value: 'Pasta' },
+                                       { title: 'Sushi', value: 'Sushi' },
+                                       { title: 'Salad', value: 'Salad' }
+                                     ]
+                                   })
+        stub_request(:post, 'https://waba.360dialog.io/v1/messages')
+          .with(
+            body: {
+              to: '+123456789',
+              interactive: {
+                type: 'list',
+                body: {
+                  text: 'test'
+                },
+                action: '{"button":"Choose an item","sections":[{"rows":[{"id":"Burito","title":"Burito"},' \
+                        '{"id":"Pasta","title":"Pasta"},{"id":"Sushi","title":"Sushi"},{"id":"Salad","title":"Salad"}]}]}'
+              }, type: 'interactive'
+            }.to_json
+          ).to_return(status: 200, body: whatsapp_response.to_json, headers: response_headers)
+        expect(service.send_message('+123456789', message)).to eq 'message_id'
+      end
+    end
+  end
 end
diff --git a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
index 32cd654ee..1bf115476 100644
--- a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
@@ -66,6 +66,65 @@ describe Whatsapp::Providers::WhatsappCloudService do
     end
   end
 
+  describe '#send_interactive message' do
+    context 'when called' do
+      it 'calls message endpoints with button payload when number of items is less than or equal to 3' do
+        message = create(:message, message_type: :outgoing, content: 'test',
+                                   inbox: whatsapp_channel.inbox, content_type: 'input_select',
+                                   content_attributes: {
+                                     items: [
+                                       { title: 'Burito', value: 'Burito' },
+                                       { title: 'Pasta', value: 'Pasta' },
+                                       { title: 'Sushi', value: 'Sushi' }
+                                     ]
+                                   })
+        stub_request(:post, 'https://graph.facebook.com/v13.0/123456789/messages')
+          .with(
+            body: {
+              messaging_product: 'whatsapp', to: '+123456789',
+              interactive: {
+                type: 'button',
+                body: {
+                  text: 'test'
+                },
+                action: '{"buttons":[{"type":"reply","reply":{"id":"Burito","title":"Burito"}},{"type":"reply",' \
+                        '"reply":{"id":"Pasta","title":"Pasta"}},{"type":"reply","reply":{"id":"Sushi","title":"Sushi"}}]}'
+              }, type: 'interactive'
+            }.to_json
+          ).to_return(status: 200, body: whatsapp_response.to_json, headers: response_headers)
+        expect(service.send_message('+123456789', message)).to eq 'message_id'
+      end
+
+      it 'calls message endpoints with list payload when number of items is greater than 3' do
+        message = create(:message, message_type: :outgoing, content: 'test', inbox: whatsapp_channel.inbox,
+                                   content_type: 'input_select',
+                                   content_attributes: {
+                                     items: [
+                                       { title: 'Burito', value: 'Burito' },
+                                       { title: 'Pasta', value: 'Pasta' },
+                                       { title: 'Sushi', value: 'Sushi' },
+                                       { title: 'Salad', value: 'Salad' }
+                                     ]
+                                   })
+        stub_request(:post, 'https://graph.facebook.com/v13.0/123456789/messages')
+          .with(
+            body: {
+              messaging_product: 'whatsapp', to: '+123456789',
+              interactive: {
+                type: 'list',
+                body: {
+                  text: 'test'
+                },
+                action: '{"button":"Choose an item","sections":[{"rows":[{"id":"Burito","title":"Burito"},' \
+                        '{"id":"Pasta","title":"Pasta"},{"id":"Sushi","title":"Sushi"},{"id":"Salad","title":"Salad"}]}]}'
+              }, type: 'interactive'
+            }.to_json
+          ).to_return(status: 200, body: whatsapp_response.to_json, headers: response_headers)
+        expect(service.send_message('+123456789', message)).to eq 'message_id'
+      end
+    end
+  end
+
   describe '#send_template' do
     let(:template_info) do
       {

From 48f2e58e595b9f4dc6887cdddaf9de0839ea8cdf Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 9 Jun 2023 15:32:24 +0530
Subject: [PATCH 73/93] feat: Ability to update avatars from super admin
 (#7264)

- Ability to update user avatars from super admin
- Ability to update bot avatars from super admin

fixes: #7060
---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  4 ++++
 app/assets/config/manifest.js                 |  1 +
 .../super_admin/agent_bots_controller.rb      | 10 +++++++++
 .../super_admin/users_controller.rb           | 11 ++++++++++
 app/dashboards/agent_bot_dashboard.rb         |  7 +++++++
 app/dashboards/user_dashboard.rb              |  6 ++++++
 config/routes.rb                              |  9 ++++++--
 .../super_admin/agent_bots_controller_spec.rb | 21 +++++++++++++++++++
 .../super_admin/users_controller_spec.rb      | 21 +++++++++++++++++++
 spec/factories/agent_bots.rb                  |  4 ++++
 spec/factories/users.rb                       |  2 +-
 12 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d635d3809..d49157502 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,6 +75,7 @@ gem 'jwt'
 gem 'pundit'
 # super admin
 gem 'administrate'
+gem 'administrate-field-active_storage'
 
 ##--- gems for pubsub service ---##
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
diff --git a/Gemfile.lock b/Gemfile.lock
index 990d14bfb..058176f5e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,6 +113,9 @@ GEM
       kaminari (>= 1.0)
       sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
+    administrate-field-active_storage (0.4.2)
+      administrate (>= 0.2.2)
+      rails (>= 7.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -798,6 +801,7 @@ DEPENDENCIES
   activerecord-import
   acts-as-taggable-on
   administrate
+  administrate-field-active_storage
   annotate
   attr_extras
   audited (~> 5.3)
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index 38da59e09..2cc9549bc 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -1,5 +1,6 @@
 //= link_tree ../images
 //= link administrate/application.css
 //= link administrate/application.js
+//= link administrate-field-active_storage/application.css
 //= link dashboardChart.js
 //= link secretField.js
diff --git a/app/controllers/super_admin/agent_bots_controller.rb b/app/controllers/super_admin/agent_bots_controller.rb
index 8e094e752..29a3021ee 100644
--- a/app/controllers/super_admin/agent_bots_controller.rb
+++ b/app/controllers/super_admin/agent_bots_controller.rb
@@ -41,4 +41,14 @@ class SuperAdmin::AgentBotsController < SuperAdmin::ApplicationController
 
   # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
   # for more information
+
+  def destroy_avatar
+    avatar = requested_resource.avatar
+    avatar.purge
+    redirect_back(fallback_location: super_admin_agent_bots_path)
+  end
+
+  def scoped_resource
+    resource_class.with_attached_avatar
+  end
 end
diff --git a/app/controllers/super_admin/users_controller.rb b/app/controllers/super_admin/users_controller.rb
index fec4fb790..ff242030a 100644
--- a/app/controllers/super_admin/users_controller.rb
+++ b/app/controllers/super_admin/users_controller.rb
@@ -45,6 +45,17 @@ class SuperAdmin::UsersController < SuperAdmin::ApplicationController
   # empty values into nil values. It uses other APIs such as `resource_class`
   # and `dashboard`:
   #
+
+  def destroy_avatar
+    avatar = requested_resource.avatar
+    avatar.purge
+    redirect_back(fallback_location: super_admin_users_path)
+  end
+
+  def scoped_resource
+    resource_class.with_attached_avatar
+  end
+
   def resource_params
     permitted_params = super
     permitted_params.delete(:password) if permitted_params[:password].blank?
diff --git a/app/dashboards/agent_bot_dashboard.rb b/app/dashboards/agent_bot_dashboard.rb
index e97a64de8..baeb6e814 100644
--- a/app/dashboards/agent_bot_dashboard.rb
+++ b/app/dashboards/agent_bot_dashboard.rb
@@ -10,6 +10,11 @@ class AgentBotDashboard < Administrate::BaseDashboard
   ATTRIBUTE_TYPES = {
     access_token: Field::HasOne,
     avatar_url: AvatarField,
+    avatar: Field::ActiveStorage.with_options(
+      destroy_url: proc do |_namespace, _resource, attachment|
+        [:avatar_super_admin_agent_bot, { attachment_id: attachment.id }]
+      end
+    ),
     id: Field::Number,
     name: Field::String,
     account: Field::BelongsTo.with_options(searchable: true, searchable_field: 'name', order: 'id DESC'),
@@ -36,6 +41,7 @@ class AgentBotDashboard < Administrate::BaseDashboard
   # an array of attributes that will be displayed on the model's show page.
   SHOW_PAGE_ATTRIBUTES = %i[
     id
+    avatar_url
     account
     name
     description
@@ -47,6 +53,7 @@ class AgentBotDashboard < Administrate::BaseDashboard
   # on the model's form (`new` and `edit`) pages.
   FORM_ATTRIBUTES = %i[
     name
+    avatar
     account
     description
     outgoing_url
diff --git a/app/dashboards/user_dashboard.rb b/app/dashboards/user_dashboard.rb
index 1d59525f2..9573d8447 100644
--- a/app/dashboards/user_dashboard.rb
+++ b/app/dashboards/user_dashboard.rb
@@ -11,6 +11,11 @@ class UserDashboard < Administrate::BaseDashboard
     account_users: Field::HasMany,
     id: Field::Number,
     avatar_url: AvatarField,
+    avatar: Field::ActiveStorage.with_options(
+      destroy_url: proc do |_namespace, _resource, attachment|
+        [:avatar_super_admin_user, { attachment_id: attachment.id }]
+      end
+    ),
     provider: Field::String,
     uid: Field::String,
     password: Field::Password,
@@ -69,6 +74,7 @@ class UserDashboard < Administrate::BaseDashboard
   # on the model's form (`new` and `edit`) pages.
   FORM_ATTRIBUTES = %i[
     name
+    avatar
     display_name
     email
     password
diff --git a/config/routes.rb b/config/routes.rb
index fe5196fde..73eccd3ee 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -399,10 +399,15 @@ Rails.application.routes.draw do
         post :seed, on: :member
         post :reset_cache, on: :member
       end
-      resources :users, only: [:index, :new, :create, :show, :edit, :update, :destroy]
+      resources :users, only: [:index, :new, :create, :show, :edit, :update, :destroy] do
+        delete :avatar, on: :member, action: :destroy_avatar
+      end
+
       resources :access_tokens, only: [:index, :show]
       resources :installation_configs, only: [:index, :new, :create, :show, :edit, :update]
-      resources :agent_bots, only: [:index, :new, :create, :show, :edit, :update]
+      resources :agent_bots, only: [:index, :new, :create, :show, :edit, :update] do
+        delete :avatar, on: :member, action: :destroy_avatar
+      end
       resources :platform_apps, only: [:index, :new, :create, :show, :edit, :update]
       resource :instance_status, only: [:show]
 
diff --git a/spec/controllers/super_admin/agent_bots_controller_spec.rb b/spec/controllers/super_admin/agent_bots_controller_spec.rb
index 63548e441..4c514c0f0 100644
--- a/spec/controllers/super_admin/agent_bots_controller_spec.rb
+++ b/spec/controllers/super_admin/agent_bots_controller_spec.rb
@@ -22,4 +22,25 @@ RSpec.describe 'Super Admin agent-bots API', type: :request do
       end
     end
   end
+
+  describe 'DELETE /super_admin/agent_bots/:id/destroy_avatar' do
+    let!(:agent_bot) { create(:agent_bot, :with_avatar) }
+
+    context 'when it is an unauthenticated super admin' do
+      it 'returns unauthorized' do
+        delete "/super_admin/agent_bots/#{agent_bot.id}/avatar", params: { attachment_id: agent_bot.avatar.id }
+        expect(response).to have_http_status(:redirect)
+        expect(agent_bot.reload.avatar).to be_attached
+      end
+    end
+
+    context 'when it is an authenticated super admin' do
+      it 'destroys the avatar' do
+        sign_in(super_admin, scope: :super_admin)
+        delete "/super_admin/agent_bots/#{agent_bot.id}/avatar", params: { attachment_id: agent_bot.avatar.id }
+        expect(response).to have_http_status(:redirect)
+        expect(agent_bot.reload.avatar).not_to be_attached
+      end
+    end
+  end
 end
diff --git a/spec/controllers/super_admin/users_controller_spec.rb b/spec/controllers/super_admin/users_controller_spec.rb
index 26e28bc15..12f1b69dc 100644
--- a/spec/controllers/super_admin/users_controller_spec.rb
+++ b/spec/controllers/super_admin/users_controller_spec.rb
@@ -45,4 +45,25 @@ RSpec.describe 'Super Admin Users API', type: :request do
       end
     end
   end
+
+  describe 'DELETE /super_admin/users/:id/avatar' do
+    let!(:user) { create(:user, :with_avatar) }
+
+    context 'when it is an unauthenticated super admin' do
+      it 'returns unauthorized' do
+        delete "/super_admin/users/#{user.id}/avatar", params: { attachment_id: user.avatar.id }
+        expect(response).to have_http_status(:redirect)
+        expect(user.reload.avatar).to be_attached
+      end
+    end
+
+    context 'when it is an authenticated super admin' do
+      it 'destroys the avatar' do
+        sign_in(super_admin, scope: :super_admin)
+        delete "/super_admin/users/#{user.id}/avatar", params: { attachment_id: user.avatar.id }
+        expect(response).to have_http_status(:redirect)
+        expect(user.reload.avatar).not_to be_attached
+      end
+    end
+  end
 end
diff --git a/spec/factories/agent_bots.rb b/spec/factories/agent_bots.rb
index 87556709b..8fc0a6bf4 100644
--- a/spec/factories/agent_bots.rb
+++ b/spec/factories/agent_bots.rb
@@ -9,5 +9,9 @@ FactoryBot.define do
     trait :skip_validate do
       to_create { |instance| instance.save(validate: false) }
     end
+
+    trait :with_avatar do
+      avatar { fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png') }
+    end
   end
 end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 9b613e5a1..89ee68069 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -26,7 +26,7 @@ FactoryBot.define do
     end
 
     trait :with_avatar do
-      avatar { Rack::Test::UploadedFile.new('spec/assets/avatar.png', 'image/png') }
+      avatar { fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png') }
     end
 
     trait :administrator do

From f64f2138dbbdf0a1cebd1f22bcce115ce5741212 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 9 Jun 2023 16:08:40 +0530
Subject: [PATCH 74/93] fix: Update mail check for html_part (#7273)

---
 app/jobs/inboxes/fetch_imap_emails_job.rb     |    2 +-
 app/mailboxes/mailbox_helper.rb               |    6 +-
 .../mail_with_html_part_no_html_content.eml   | 5985 +++++++++++++++++
 spec/mailboxes/reply_mailbox_spec.rb          |   23 +
 4 files changed, 6011 insertions(+), 5 deletions(-)
 create mode 100644 spec/fixtures/files/mail_with_html_part_no_html_content.eml

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 5173e478b..f2f1bd2e9 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -125,7 +125,7 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
   rescue StandardError => e
     ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
     Rails.logger.error("
-      #{channel.provider} Email dropped: #{inbound_mail.from} and message_source_id: #{inbound_mail.message_id}, message_id: #{message_id}")
+      #{channel.provider} Email dropped: #{inbound_mail.from} and message_source_id: #{inbound_mail.message_id}")
   end
 
   # Making sure the access token is valid for microsoft provider
diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index f96266713..ec3685cc3 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -38,11 +38,9 @@ module MailboxHelper
   end
 
   def embed_inline_image_source(mail_attachment)
-    current_mail = processed_mail.mail
-
-    if current_mail.html_part.present?
+    if processed_mail.serialized_data[:html_content].present?
       upload_inline_image(mail_attachment)
-    elsif current_mail.text_part.present?
+    elsif processed_mail.serialized_data[:text_content].present?
       embed_plain_text_email_with_inline_image(mail_attachment)
     end
   end
diff --git a/spec/fixtures/files/mail_with_html_part_no_html_content.eml b/spec/fixtures/files/mail_with_html_part_no_html_content.eml
new file mode 100644
index 000000000..1f64b7388
--- /dev/null
+++ b/spec/fixtures/files/mail_with_html_part_no_html_content.eml
@@ -0,0 +1,5985 @@
+Delivered-To: hello@chatwoot.com
+Received: by 2002:a05:7010:e38c:b0:354:f2b8:cc31 with SMTP id ma12csp1010920mdb;
+        Wed, 7 Jun 2023 19:48:08 -0700 (PDT)
+X-Google-Smtp-Source: ACHHUZ57LBzK2OVBP6udVBC9CbSsPHwJYC8okfkQWT8Q0m28WoFGG1VLohBJoHwQR2a6eqG7mvqi
+X-Received: by 2002:a05:6a21:32a2:b0:100:eb1e:3939 with SMTP id yt34-20020a056a2132a200b00100eb1e3939mr4073677pzb.1.1686192487801;
+        Wed, 07 Jun 2023 19:48:07 -0700 (PDT)
+ARC-Seal: i=2; a=rsa-sha256; t=1686192487; cv=pass;
+        d=google.com; s=arc-20160816;
+        b=gNCX3HZKz0nD1+rhJSWiDBq/1U7Ng8+1NHiTODRU0Qi2P+5MYwitJBckofu9T224wQ
+         WvuPgCnyOOYeVvROyFvy7r/aewAb8tiDUbpWUP5TC8zHeylH3rHiNICXYax7A4ZsOYM2
+         WlHBruR/2PH8pa7ukmPs8r3uJr7LrPRcDcPI/SzvtvtD5B9BWWlg+thvDrV1IKAA1S9E
+         guQ8oTEdL5+aMylzldb/Wp+WEPsq5eDHiLIngq00MKOtbOkx/oSDwOR5a4ex0fpeLf5f
+         2omGJiUV71El0U+x/uqZTwc2bMhw0ZKXD6p4hPAEdRAWWxvLtodXbGP18h8EEJBUleke
+         LvYQ==
+ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
+        h=user-agent:importance:mime-version:subject:message-id:to:from:date
+         :dkim-signature;
+        bh=c7IZAVOxMAePAqqcN/hReTJniMV6fL4PHunQIM8V12k=;
+        b=xjTumctRuw91odBSSUScU8fDrysl3EWdguMqnSFVVY4UDlVeRE4h/3eqnM0+1jYNOb
+         d+qQq4KMF2Q1KA4OZ2/Xz8qakc7ASZ503WYQ61Cd+qZJnyOXkdgyUwtPUteaoBHO792t
+         QTk0JGYIQ43CoQ+17veukiivv3MiDmnKzhIxkBbznQ51ahPfzUXLHpN4T1+fseATXuiU
+         3WOdnJbUwfRbAWy9+AciWIqZGTsHAmjt/WW/h/jOtpWu1rhyD4sdmjbskyJizqqS3Aqo
+         l4Zp/Sf8P8yK/4wPPKQF9qQ9W9iu2oZBPC8aAxWJuTOemKl3KzrOymdddb0SUYPBKAXs
+         X5pg==
+ARC-Authentication-Results: i=2; mx.google.com;
+       dkim=pass header.i=@example.com header.s=pl header.b=VKZIicfZ;
+       arc=pass (i=1 spf=pass spfdomain=example.com dkim=pass dkdomain=example.com dmarc=pass fromdomain=example.com>);
+       spf=pass (google.com: domain of test.w@example.com designates 136.143.188.115 as permitted sender) smtp.mailfrom=test.w@example.com
+Return-Path: <test.w@example.com>
+Received: from sender4-pp-f115.zoho.com (sender4-pp-f115.zoho.com. [136.143.188.115])
+        by mx.google.com with ESMTPS id q22-20020aa79836000000b006634c05d13csi86057pfl.172.2023.06.07.19.48.07
+        for <hello@chatwoot.com>
+        (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
+        Wed, 07 Jun 2023 19:48:07 -0700 (PDT)
+Received-SPF: pass (google.com: domain of test.w@example.com designates 136.143.188.115 as permitted sender) client-ip=136.143.188.115;
+Authentication-Results: mx.google.com;
+       dkim=pass header.i=@example.com header.s=pl header.b=VKZIicfZ;
+       arc=pass (i=1 spf=pass spfdomain=example.com dkim=pass dkdomain=example.com dmarc=pass fromdomain=example.com>);
+       spf=pass (google.com: domain of test.w@example.com designates 136.143.188.115 as permitted sender) smtp.mailfrom=test.w@example.com
+ARC-Seal: i=1; a=rsa-sha256; t=1686192485; cv=none; d=zohomail.com; s=zohoarc; b=QSgE7NI4tC9p/bfQw2/H0PgkCg+Fw7e22W6kpNTczkT4sQxX1+ju1CFF+/sN0K31/JuBKAfclr46/UxmjkXdRS2w4K+dlDSGCMpMdccjmnwwg4eGczfutcyhgL1o6vpUPH+NW7VrwjLNk95zD1l+TAVwgRaxt68Y9U04so25oTs=
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686192485; h=Content-Type:Date:From:MIME-Version:Message-ID:Subject:To; bh=c7IZAVOxMAePAqqcN/hReTJniMV6fL4PHunQIM8V12k=; b=lV34BJ1BkmRjvh7t5ZlOg5KsrEMoCZBHuyLv1tBzO1hqt1OTwT6vnVf8TUXVVqU5yI5qB+focsVqA+kFea/PttC5BRuAsww0iDm0XyfYCyY8QMyQ+RA51FvB6hYDnFyoC1D8ZliSHdcNsAEumuYmGyrbZBGxQH0vCMhs2+lnVXE=
+ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass
+  header.i=example.com; spf=pass
+  smtp.mailfrom=test.w@example.com; dmarc=pass header.from=<test.w@example.com>
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1686192485; s=pl; d=example.com; i=test.w@example.com; h=Date:Date:From:From:To:To:Message-Id:Message-Id:Subject:Subject:MIME-Version:Content-Type:Reply-To:Cc; bh=c7IZAVOxMAePAqqcN/hReTJniMV6fL4PHunQIM8V12k=; b=VKZIicfZCxaYdi5lACEiz8f0IJFFNn67BD5cfhMDaYaYHJigtN+14SjFWptKGcSx ho94gttv/VzPJzcwi+Py2vf1bVWE8jBXLf3rmEdfSMUP9Tp7XtxOK5PB9XDLpR+5K+G pGndsa3D7i/uVH1pZ7DmKQf3cx8NFogBDIUY66Ec=
+Received: from mail.zoho.com by mx.zohomail.com with SMTP id 1686192484329887.4815133280084; Wed, 7 Jun 2023 19:48:04 -0700 (PDT)
+Date: Wed, 07 Jun 2023 21:48:04 -0500
+Message-ID: <CAFkiBVzURp=z2g5nAevAtdQvFfxkLrpvTeDFcwFaGQhdo_-Mkg@mail.gmail.com>
+Subject: New inline image test email conversation
+From: Sony Mathew <sony@chatwoot.com>
+To: "Replies" <reply+6bdc3f4d-0bed-4515-a284-5d916fdde489@example.com>
+MIME-Version: 1.0
+Content-Type: multipart/alternative; boundary="----=_Part_737886_53803080.1686187550614"
+Importance: Medium
+User-Agent: Zoho Mail
+X-Mailer: Zoho Mail
+X-Zoho-Virus-Status: 1
+
+------=_Part_737886_53803080.1686187550614
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+Greetings!
+
+
+
+This is test message.
+
+
+=E2=80=8B
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+This is test message. =C2=A0 Thank you.
+
+
+
+Sincerely,
+
+
+Sales Associate
+
+example.com
+------=_Part_737886_53803080.1686187550614
+Content-Type: multipart/related; boundary="----=_Part_737887_1998664302.1686187550644"
+
+------=_Part_737887_1998664302.1686187550644
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>=
+<meta content=3D"text/html;charset=3DUTF-8" http-equiv=3D"Content-Type"></h=
+ead><body ><div style=3D"font-family: Verdana, Arial, Helvetica, sans-serif=
+; font-size: 10pt;"><div style=3D"font-family :  Verdana,  Arial,  Helvetic=
+a,  sans-serif; font-size :  10pt;"><div><div style=3D"font-family  :  Verd=
+ana,   Arial,   Helvetica,   sans-serif; font-size  :  10pt;"><div><div sty=
+le=3D"font-family   :  Verdana,    Arial,    Helvetica,    sans-serif; font=
+-size   :  10pt;"><div><div style=3D"font-family    :  Verdana,     Arial, =
+    Helvetica,     sans-serif; font-size    :  10pt;"><div><div style=3D"fo=
+nt-family     :  Verdana,      Arial,      Helvetica,      sans-serif; font=
+-size     :  10pt;"><div><div style=3D"font-family      :  Verdana,       A=
+rial,       Helvetica,       sans-serif; font-size      :  10pt;"><div><div=
+ style=3D"font-family       :  Verdana,        Arial,        Helvetica,    =
+    sans-serif; font-size       :  10pt;"><div><div style=3D"font-family   =
+     :  Verdana,         Arial,         Helvetica,         sans-serif; font=
+-size        :  10pt;"><div><div style=3D"font-family         :  Verdana,  =
+        Arial,          Helvetica,          sans-serif; font-size         :=
+  10pt;"><div><div style=3D"font-family          :  Verdana,           Aria=
+l,           Helvetica,           sans-serif; font-size          :  10pt;">=
+<div><div style=3D"font-family           :  Verdana,            Arial,     =
+       Helvetica,            sans-serif; font-size           :  10pt;"><div=
+><div style=3D"font-family            :  Verdana,             Arial,       =
+      Helvetica,             sans-serif; font-size            :  10pt;"><di=
+v><div style=3D"font-family             :  Verdana,              Arial,    =
+          Helvetica,              sans-serif; font-size             :  10pt=
+;"><div><div style=3D"font-family              :  Verdana,               Ar=
+ial,               Helvetica,               sans-serif; font-size          =
+    :  10pt;"><div><div style=3D"font-family               :  Verdana,     =
+           Arial,                Helvetica,                sans-serif; font=
+-size               :  10pt;"><div><div style=3D"font-family               =
+ :  Verdana,                 Arial,                 Helvetica,             =
+    sans-serif; font-size                :  10pt;"><div><div style=3D"font-=
+family                 :  Verdana,                  Arial,                 =
+ Helvetica,                  sans-serif; font-size                 :  10pt;=
+"><div><div style=3D"font-family                  :  Verdana,              =
+     Arial,                   Helvetica,                   sans-serif; font=
+-size                  :  10pt;"><div><div style=3D"font-family            =
+       :  Verdana,                    Arial,                    Helvetica, =
+                   sans-serif; font-size                   :  10pt;"><div><=
+div style=3D"font-family                    :  Verdana,                    =
+ Arial,                     Helvetica,                     sans-serif; font=
+-size                    :  10pt;"><div><div style=3D"font-family          =
+           :  Verdana,                      Arial,                      Hel=
+vetica,                      sans-serif; font-size                     :  1=
+0pt;"><div><div style=3D"font-family                      :  Verdana,      =
+                 Arial,                       Helvetica,                   =
+    sans-serif; font-size                      :  10pt;"><div><div style=3D=
+"font-family                       :  Verdana,                        Arial=
+,                        Helvetica,                        sans-serif; font=
+-size                       :  10pt;"><div><div style=3D"font-family       =
+                 :  Verdana,                         Arial,                =
+         Helvetica,                         sans-serif; font-size          =
+              :  10pt;"><div><div style=3D"font-family                     =
+    :  Verdana,                          Arial,                          He=
+lvetica,                          sans-serif; font-size                    =
+     :  10pt;"><div><div style=3D"font-family                          :  V=
+erdana,                           Arial,                           Helvetic=
+a,                           sans-serif; font-size                         =
+ :  10pt;"><div><div style=3D"font-family                           :  Verd=
+ana,                            Arial,                            Helvetica=
+,                            sans-serif; font-size                         =
+  :  10pt;"><div><div style=3D"font-family                            :  Ve=
+rdana,                             Arial,                             Helve=
+tica,                             sans-serif; font-size                    =
+        :  10pt;"><div><div style=3D"font-family                           =
+  :  Verdana,                              Arial,                          =
+    Helvetica,                              sans-serif; font-size          =
+                   :  10pt;"><div><div style=3D"font-family                =
+              :  Verdana,                               Arial,             =
+                  Helvetica,                               sans-serif; font=
+-size                              :  10pt;"><div><div style=3D"font-family=
+                               :  Verdana,                                A=
+rial,                                Helvetica,                            =
+    sans-serif; font-size                               :  10pt;"><div><div=
+ style=3D"font-family                                :  Verdana,           =
+                      Arial,                                 Helvetica,    =
+                             sans-serif; font-size                         =
+       :  10pt;"><div><div style=3D"font-family                            =
+     :  Verdana,                                  Arial,                   =
+               Helvetica,                                  sans-serif; font=
+-size                                 :  10pt;"><div><div style=3D"font-fam=
+ily                                  :  Verdana,                           =
+        Arial,                                   Helvetica,                =
+                   sans-serif; font-size                                  :=
+  10pt;"><div><div style=3D"font-family                                   :=
+  Verdana,                                    Arial,                       =
+             Helvetica,                                    sans-serif; font=
+-size                                   :  10pt;"><div><div style=3D"font-f=
+amily                                    :  Verdana,                       =
+              Arial,                                     Helvetica,        =
+                             sans-serif; font-size                         =
+           :  10pt;"><div><div style=3D"font-family                        =
+             :  Verdana,                                      Arial,       =
+                               Helvetica,                                  =
+    sans-serif; font-size                                     :  10pt;"><di=
+v><div style=3D"font-family                                      :  Verdana=
+,                                       Arial,                             =
+          Helvetica,                                       sans-serif; font=
+-size                                      :  10pt;"><div><div style=3D"fon=
+t-family                                       :  Verdana,                 =
+                       Arial,                                        Helvet=
+ica,                                        sans-serif; font-size          =
+                             :  10pt;"><div><div style=3D"font-family      =
+                                  :  Verdana,                              =
+           Arial,                                         Helvetica,       =
+                                  sans-serif; font-size                    =
+                    :  10pt;"><div><div style=3D"font-family               =
+                          :  Verdana,                                      =
+    Arial,                                          Helvetica,             =
+                             sans-serif; font-size                         =
+                :  10pt;"><div><div style=3D"font-family                   =
+                       :  Verdana,                                         =
+  Arial,                                           Helvetica,              =
+                             sans-serif; font-size                         =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                         :  Verdana,                                       =
+     Arial,                                            Helvetica,          =
+                                  sans-serif; font-size                    =
+                       :  10pt;"><div><div style=3D"font-family            =
+                                :  Verdana,                                =
+             Arial,                                             Helvetica, =
+                                            sans-serif; font-size          =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                            :  Verdana,                    =
+                          Arial,                                           =
+   Helvetica,                                              sans-serif; font=
+-size                                             :  10pt;"><div><div style=
+=3D"font-family                                              :  Verdana,   =
+                                            Arial,                         =
+                      Helvetica,                                           =
+    sans-serif; font-size                                              :  1=
+0pt;"><div><div style=3D"font-family                                       =
+        :  Verdana,                                                Arial,  =
+                                              Helvetica,                   =
+                             sans-serif; font-size                         =
+                      :  10pt;"><div><div style=3D"font-family             =
+                                   :  Verdana,                             =
+                    Arial,                                                 =
+Helvetica,                                                 sans-serif; font=
+-size                                                :  10pt;"><div><div st=
+yle=3D"font-family                                                 :  Verda=
+na,                                                  Arial,                =
+                                  Helvetica,                               =
+                   sans-serif; font-size                                   =
+              :  10pt;"><div><div style=3D"font-family                     =
+                             :  Verdana,                                   =
+                Arial,                                                   He=
+lvetica,                                                   sans-serif; font=
+-size                                                  :  10pt;"><div><div =
+style=3D"font-family                                                   :  V=
+erdana,                                                    Arial,          =
+                                          Helvetica,                       =
+                             sans-serif; font-size                         =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                           :  Verdana,                     =
+                                Arial,                                     =
+                Helvetica,                                                 =
+    sans-serif; font-size                                                  =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                    :  Verdana,                                            =
+          Arial,                                                      Helve=
+tica,                                                      sans-serif; font=
+-size                                                     :  10pt;"><div><d=
+iv style=3D"font-family                                                    =
+  :  Verdana,                                                       Arial, =
+                                                      Helvetica,           =
+                                            sans-serif; font-size          =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                       :  Verdana,=
+                                                        Arial,             =
+                                           Helvetica,                      =
+                                  sans-serif; font-size                    =
+                                   :  10pt;"><div><div style=3D"font-family=
+                                                        :  Verdana,        =
+                                                 Arial,                    =
+                                     Helvetica,                            =
+                             sans-serif; font-size                         =
+                               :  10pt;"><div><div style=3D"font-family    =
+                                                     :  Verdana,           =
+                                               Arial,                      =
+                                    Helvetica,                             =
+                             sans-serif; font-size                         =
+                                :  10pt;"><div><div style=3D"font-family   =
+                                                       :  Verdana,         =
+                                                  Arial,                   =
+                                        Helvetica,                         =
+                                  sans-serif; font-size                    =
+                                      :  10pt;"><div><div style=3D"font-fam=
+ily                                                           :  Verdana,  =
+                                                          Arial,           =
+                                                 Helvetica,                =
+                                            sans-serif; font-size          =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+:  Verdana,                                                             Ari=
+al,                                                             Helvetica, =
+                                                            sans-serif; fon=
+t-size                                                            :  10pt;"=
+><div><div style=3D"font-family                                            =
+                 :  Verdana,                                               =
+               Arial,                                                      =
+        Helvetica,                                                         =
+     sans-serif; font-size                                                 =
+            :  10pt;"><div><div style=3D"font-family                       =
+                                       :  Verdana,                         =
+                                      Arial,                               =
+                                Helvetica,                                 =
+                              sans-serif; font-size                        =
+                                      :  10pt;"><div style=3D"font-family  =
+                                                             :  Verdana,   =
+                                                             Arial,        =
+                                                        Helvetica,         =
+                                                       sans-serif; font-siz=
+e                                                               :  10pt;"><=
+div><div style=3D"font-family                                              =
+                  :  Verdana,                                              =
+                   Arial,                                                  =
+               Helvetica,                                                  =
+               sans-serif; font-size                                       =
+                         :  10pt;"><div><div style=3D"font-family          =
+                                                       :  Verdana,         =
+                                                         Arial,            =
+                                                      Helvetica,           =
+                                                       sans-serif; font-siz=
+e                                                                 :  10pt;"=
+><div><div style=3D"font-family                                            =
+                      :  Verdana,                                          =
+                         Arial,                                            =
+                       Helvetica,                                          =
+                         sans-serif; font-size                             =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                                                   :  Ver=
+dana,                                                                    Ar=
+ial,                                                                    Hel=
+vetica,                                                                    =
+sans-serif; font-size                                                      =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                              :  Verdana,                  =
+                                                   Arial,                  =
+                                                   Helvetica,              =
+                                                       sans-serif; font-siz=
+e                                                                    :  10p=
+t;"><div><div style=3D"font-family                                         =
+                            :  Verdana,                                    =
+                                  Arial,                                   =
+                                   Helvetica,                              =
+                                        sans-serif; font-size              =
+                                                       :  10pt;"><div><div =
+style=3D"font-family                                                       =
+               :  Verdana,                                                 =
+                      Arial,                                               =
+                        Helvetica,                                         =
+                              sans-serif; font-size                        =
+                                              :  10pt;"><div><div style=3D"=
+font-family                                                                =
+       :  Verdana,                                                         =
+               Arial,                                                      =
+                  Helvetica,                                               =
+                         sans-serif; font-size                             =
+                                          :  10pt;"><div><div style=3D"font=
+-family                                                                    =
+    :  Verdana,                                                            =
+             Arial,                                                        =
+                 Helvetica,                                                =
+                         sans-serif; font-size                             =
+                                           :  10pt;"><div><div style=3D"fon=
+t-family                                                                   =
+      :  Verdana,                                                          =
+                Arial,                                                     =
+                     Helvetica,                                            =
+                              sans-serif; font-size                        =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+              :  Verdana,                                                  =
+                         Arial,                                            =
+                               Helvetica,                                  =
+                                         sans-serif; font-size             =
+                                                             :  10pt;"><div=
+ style=3D"font-family                                                      =
+                     :  Verdana,                                           =
+                                 Arial,                                    =
+                                        Helvetica,                         =
+                                                   sans-serif; font-size   =
+                                                                        :  =
+10pt;"><div><div style=3D"font-family                                      =
+                                      :  Verdana,                          =
+                                                   Arial,                  =
+                                                           Helvetica,      =
+                                                                       sans=
+-serif; font-size                                                          =
+                  :  10pt;"><div><div style=3D"font-family                 =
+                                                            :  Verdana,    =
+                                                                          A=
+rial,                                                                      =
+        Helvetica,                                                         =
+                     sans-serif; font-size                                 =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+            :  Verdana,                                                    =
+                           Arial,                                          =
+                                     Helvetica,                            =
+                                                   sans-serif; font-size   =
+                                                                           =
+:  10pt;"><div><div style=3D"font-family                                   =
+                                            :  Verdana,                    =
+                                                            Arial,         =
+                                                                       Helv=
+etica,                                                                     =
+           sans-serif; font-size                                           =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+      :  Verdana,                                                          =
+                       Arial,                                              =
+                                   Helvetica,                              =
+                                                   sans-serif; font-size   =
+                                                                           =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                                                :  Verdana,                =
+                                                                  Arial,   =
+                                                                           =
+    Helvetica,                                                             =
+                     sans-serif; font-size                                 =
+                                                :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                      :  Verdana,                                          =
+                                         Arial,                            =
+                                                       Helvetica,          =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                                                          :=
+  Verdana,                                                                 =
+                   Arial,                                                  =
+                                  Helvetica,                               =
+                                                     sans-serif; font-size =
+                                                                           =
+       :  10pt;"><div><div style=3D"font-family                            =
+                                                        :  Verdana,        =
+                                                                           =
+  Arial,                                                                   =
+                  Helvetica,                                               =
+                                      sans-serif; font-size                =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                           :  Verdana,                     =
+                                                                 Arial,    =
+                                                                           =
+       Helvetica,                                                          =
+                            sans-serif; font-size                          =
+                                                           :  10pt;"><div><=
+div style=3D"font-family                                                   =
+                                   :  Verdana,                             =
+                                                          Arial,           =
+                                                                           =
+ Helvetica,                                                                =
+                       sans-serif; font-size                               =
+                                                       :  10pt;"><div><div =
+style=3D"font-family                                                       =
+                                :  Verdana,                                =
+                                                        Arial,             =
+                                                                           =
+Helvetica,                                                                 =
+                       sans-serif; font-size                               =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                  :  Verdana,                              =
+                                                           Arial,          =
+                                                                           =
+    Helvetica,                                                             =
+                            sans-serif; font-size                          =
+                                                              :  10pt;"><di=
+v><div style=3D"font-family                                                =
+                                         :  Verdana,                       =
+                                                                   Arial,  =
+                                                                           =
+             Helvetica,                                                    =
+                                      sans-serif; font-size                =
+                                                                         : =
+ 10pt;"><div><div style=3D"font-family                                     =
+                                                     :  Verdana,           =
+                                                                           =
+     Arial,                                                                =
+                           Helvetica,                                      =
+                                                     sans-serif; font-size =
+                                                                           =
+              :  10pt;"><div><div style=3D"font-family                     =
+                                                                      :  Ve=
+rdana,                                                                     =
+                       Arial,                                              =
+                                              Helvetica,                   =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                   :  10pt;"><div><div style=3D"font-family=
+                                                                           =
+                 :  Verdana,                                               =
+                                              Arial,                       =
+                                                                      Helve=
+tica,                                                                      =
+                       sans-serif; font-size                               =
+                                                             :  10pt;"><div=
+><div style=3D"font-family                                                 =
+                                            :  Verdana,                    =
+                                                                          A=
+rial,                                                                      =
+                        Helvetica,                                         =
+                                                     sans-serif; font-size =
+                                                                           =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                                                                           =
+ :  Verdana,                                                               =
+                                Arial,                                     =
+                                                          Helvetica,       =
+                                                                           =
+             sans-serif; font-size                                         =
+                                                     :  10pt;"><div><div st=
+yle=3D"font-family                                                         =
+                                      :  Verdana,                          =
+                                                                      Arial=
+,                                                                          =
+                      Helvetica,                                           =
+                                                     sans-serif; font-size =
+                                                                           =
+                   :  10pt;"><div><div style=3D"font-family                =
+                                                                           =
+     :  Verdana,                                                           =
+                                      Arial,                               =
+                                                                  Helvetica=
+,                                                                          =
+                       sans-serif; font-size                               =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                    :  Verdana,            =
+                                                                           =
+           Arial,                                                          =
+                                        Helvetica,                         =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                             :  Verdana,                                   =
+                                                                Arial,     =
+                                                                           =
+                   Helvetica,                                              =
+                                                     sans-serif; font-size =
+                                                                           =
+                      :  10pt;"><div><div style=3D"font-family             =
+                                                                           =
+           :  Verdana,                                                     =
+                                               Arial,                      =
+                                                                           =
+   Helvetica,                                                              =
+                                      sans-serif; font-size                =
+                                                                           =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                                                         : =
+ Verdana,                                                                  =
+                                   Arial,                                  =
+                                                                   Helvetic=
+a,                                                                         =
+                            sans-serif; font-size                          =
+                                                                          :=
+  10pt;"><div><div style=3D"font-family                                    =
+                                                                 :  Verdana=
+,                                                                          =
+                            Arial,                                         =
+                                                             Helvetica,    =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                      :  10=
+pt;"><div><div style=3D"font-family                                        =
+                                                              :  Verdana,  =
+                                                                           =
+                          Arial,                                           =
+                                                            Helvetica,     =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                       :  1=
+0pt;"><div><div style=3D"font-family                                       =
+                                                                :  Verdana,=
+                                                                           =
+                             Arial,                                        =
+                                                                Helvetica, =
+                                                                           =
+                            sans-serif; font-size                          =
+                                                                           =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                                                                       :  V=
+erdana,                                                                    =
+                                     Arial,                                =
+                                                                         He=
+lvetica,                                                                   =
+                                      sans-serif; font-size                =
+                                                                           =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                                                           =
+        :  Verdana,                                                        =
+                                                  Arial,                   =
+                                                                           =
+            Helvetica,                                                     =
+                                                     sans-serif; font-size =
+                                                                           =
+                             :  10pt;"><div><div style=3D"font-family      =
+                                                                           =
+                         :  Verdana,                                       =
+                                                                    Arial, =
+                                                                           =
+                               Helvetica,                                  =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                  :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                               :  Verdana,                 =
+                                                                           =
+                Arial,                                                     =
+                                                       Helvetica,          =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+ :  10pt;"><div><div style=3D"font-family                                  =
+                                                                          :=
+  Verdana,                                                                 =
+                                            Arial,                         =
+                                                                           =
+         Helvetica,                                                        =
+                                                     sans-serif; font-size =
+                                                                           =
+                                :  10pt;"><div><div style=3D"font-family   =
+                                                                           =
+                               :  Verdana,                                 =
+                                                                           =
+  Arial,                                                                   =
+                                           Helvetica,                      =
+                                                                           =
+             sans-serif; font-size                                         =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                                                    :  Verd=
+ana,                                                                       =
+                                        Arial,                             =
+                                                                           =
+       Helvetica,                                                          =
+                                                     sans-serif; font-size =
+                                                                           =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                                                           =
+                                   :  Verdana,                             =
+                                                                           =
+        Arial,                                                             =
+                                                   Helvetica,              =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+     :  10pt;"><div><div style=3D"font-family                              =
+                                                                           =
+       :  Verdana,                                                         =
+                                                        Arial,             =
+                                                                           =
+                         Helvetica,                                        =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                           :  Verdana,     =
+                                                                           =
+                                  Arial,                                   =
+                                                                           =
+    Helvetica,                                                             =
+                                                     sans-serif; font-size =
+                                                                           =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                                                         =
+                                         :  Verdana,                       =
+                                                                           =
+                 Arial,                                                    =
+                                                               Helvetica,  =
+                                                                           =
+                                      sans-serif; font-size                =
+                                                                           =
+                       :  10pt;"><div><div style=3D"font-family            =
+                                                                           =
+                            :  Verdana,                                    =
+                                                                           =
+     Arial,                                                                =
+                                                    Helvetica,             =
+                                                                           =
+                            sans-serif; font-size                          =
+                                                                           =
+              :  10pt;"><div><div style=3D"font-family                     =
+                                                                           =
+                    :  Verdana,                                            =
+                                                                         Ar=
+ial,                                                                       =
+                                              Helvetica,                   =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+          :  10pt;"><div><div style=3D"font-family                         =
+                                                                           =
+                 :  Verdana,                                               =
+                                                                       Aria=
+l,                                                                         =
+                                             Helvetica,                    =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+           :  10pt;"><div><div style=3D"font-family                        =
+                                                                           =
+                   :  Verdana,                                             =
+                                                                          A=
+rial,                                                                      =
+                                                 Helvetica,                =
+                                                                           =
+                            sans-serif; font-size                          =
+                                                                           =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                                                                           =
+                          :  Verdana,                                      =
+                                                                           =
+       Arial,                                                              =
+                                                          Helvetica,       =
+                                                                           =
+                                      sans-serif; font-size                =
+                                                                           =
+                            :  10pt;"><div><div style=3D"font-family       =
+                                                                           =
+                                      :  Verdana,                          =
+                                                                           =
+                    Arial,                                                 =
+                                                                        Hel=
+vetica,                                                                    =
+                                                     sans-serif; font-size =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                       :  Verdana,         =
+                                                                           =
+                                      Arial,                               =
+                                                                           =
+                Helvetica,                                                 =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                                           =
+  :  Verdana,                                                              =
+                                                             Arial,        =
+                                                                           =
+                                        Helvetica,                         =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                :  10pt;"><div><div style=3D"font-family                   =
+                                                                           =
+                             :  Verdana,                                   =
+                                                                           =
+              Arial,                                                       =
+                                                                     Helvet=
+ica,                                                                       =
+                                                     sans-serif; font-size =
+                                                                           =
+                                               :  10pt;"><div><div style=3D=
+"font-family                                                               =
+                                                             :  Verdana,   =
+                                                                           =
+                                               Arial,                      =
+                                                                           =
+                            Helvetica,                                     =
+                                                                           =
+             sans-serif; font-size                                         =
+                                                                           =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                                                           =
+                       :  Verdana,                                         =
+                                                                           =
+          Arial,                                                           =
+                                                                   Helvetic=
+a,                                                                         =
+                                                     sans-serif; font-size =
+                                                                           =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                  :  Verdan=
+a,                                                                         =
+                                                      Arial,               =
+                                                                           =
+                                     Helvetica,                            =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                     :  10pt;"><div><div style=3D"font-family              =
+                                                                           =
+                                      :  Verdana,                          =
+                                                                           =
+                           Arial,                                          =
+                                                                           =
+           Helvetica,                                                      =
+                                                                          s=
+ans-serif; font-size                                                       =
+                                                                        :  =
+10pt;"><div><div style=3D"font-family                                      =
+                                                                           =
+               :  Verdana,                                                 =
+                                                                           =
+     Arial,                                                                =
+                                                                 Helvetica,=
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                     :  10pt;"><div><div st=
+yle=3D"font-family                                                         =
+                                                                        :  =
+Verdana,                                                                   =
+                                                               Arial,      =
+                                                                           =
+                                                 Helvetica,                =
+                                                                           =
+                                       sans-serif; font-size               =
+                                                                           =
+                                       :  10pt;"><div><div style=3D"font-fa=
+mily                                                                       =
+                                                           :  Verdana,     =
+                                                                           =
+                                                   Arial,                  =
+                                                                           =
+                                      Helvetica,                           =
+                                                                           =
+                             sans-serif; font-size                         =
+                                                                           =
+                              :  10pt;"><div><div style=3D"font-family     =
+                                                                           =
+                                                   :  Verdana,             =
+                                                                           =
+                                            Arial,                         =
+                                                                           =
+                                Helvetica,                                 =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                                                           =
+                                                :  Verdana,                =
+                                                                           =
+                                          Arial,                           =
+                                                                           =
+                               Helvetica,                                  =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                           :  10pt;"><div><div style=3D"font-family        =
+                                                                           =
+                                                  :  Verdana,              =
+                                                                           =
+                                             Arial,                        =
+                                                                           =
+                                   Helvetica,                              =
+                                                                           =
+                             sans-serif; font-size                         =
+                                                                           =
+                                 :  10pt;"><div><div style=3D"font-family  =
+                                                                           =
+                                                         :  Verdana,       =
+                                                                           =
+                                                     Arial,                =
+                                                                           =
+                                            Helvetica,                     =
+                                                                           =
+                                       sans-serif; font-size               =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                                     :  Ver=
+dana,                                                                      =
+                                                                  Arial,   =
+                                                                           =
+                                                          Helvetica,       =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                            :  10pt;"><div>=
+<div style=3D"font-family                                                  =
+                                                                           =
+           :  Verdana,                                                     =
+                                                                           =
+         Arial,                                                            =
+                                                                           =
+  Helvetica,                                                               =
+                                                                          s=
+ans-serif; font-size                                                       =
+                                                                           =
+      :  10pt;"><div><div style=3D"font-family                             =
+                                                                           =
+                                 :  Verdana,                               =
+                                                                           =
+                                Arial,                                     =
+                                                                           =
+                          Helvetica,                                       =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                                :  10pt;"><div><div style=3D"font-family   =
+                                                                           =
+                                                            :  Verdana,    =
+                                                                           =
+                                                            Arial,         =
+                                                                           =
+                                                       Helvetica,          =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                               :  10pt;"><d=
+iv><div style=3D"font-family                                               =
+                                                                           =
+                 :  Verdana,                                               =
+                                                                           =
+                  Arial,                                                   =
+                                                                           =
+              Helvetica,                                                   =
+                                                                           =
+              sans-serif; font-size                                        =
+                                                                           =
+                        :  10pt;"><div><div style=3D"font-family           =
+                                                                           =
+                                                      :  Verdana,          =
+                                                                           =
+                                                        Arial,             =
+                                                                           =
+                                                     Helvetica,            =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                                           =
+                     :  Verdana,                                           =
+                                                                           =
+                        Arial,                                             =
+                                                                           =
+                      Helvetica,                                           =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                                        Ari=
+al,                                                                        =
+                                                                       Helv=
+etica,                                                                     =
+                                                                          s=
+ans-serif; font-size                                                       =
+                                                                           =
+            :  10pt;"><div><div style=3D"font-family                       =
+                                                                           =
+                                             :  Verdana,                   =
+                                                                           =
+                                                  Arial,                   =
+                                                                           =
+                                                  Helvetica,               =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                                    :  10pt=
+;"><div style=3D"font-family                                               =
+                                                                           =
+                      :  Verdana,                                          =
+                                                                           =
+                            Arial,                                         =
+                                                                           =
+                             Helvetica,                                    =
+                                                                           =
+                                  sans-serif; font-size                    =
+                                                                           =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+          :  Verdana,                                                      =
+                                                                           =
+                 Arial,                                                    =
+                                                                           =
+                   Helvetica,                                              =
+                                                                           =
+                         sans-serif; font-size                             =
+                                                                           =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                                           =
+  :  Verdana,                                                              =
+                                                                           =
+          Arial,                                                           =
+                                                                           =
+             Helvetica,                                                    =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                     :  10pt;"><div style=3D"font-family   =
+                                                                           =
+                                                                     :  Ver=
+dana,                                                                      =
+                                                                           =
+   Arial,                                                                  =
+                                                                           =
+       Helvetica,                                                          =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                 :  10pt;"><div style=3D"font-family       =
+                                                                           =
+                                                                  :  Verdan=
+a,                                                                         =
+                                                                           =
+ Arial,                                                                    =
+                                                                           =
+      Helvetica,                                                           =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                  :  10pt;"><div style=3D"font-family      =
+                                                                           =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                                           =
+    Arial,                                                                 =
+                                                                           =
+          Helvetica,                                                       =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                        :  10pt;"><div style=3D"font-family=
+                                                                           =
+                                                                           =
+:  Verdana,                                                                =
+                                                                           =
+            Arial,                                                         =
+                                                                           =
+                   Helvetica,                                              =
+                                                                           =
+                              sans-serif; font-size                        =
+                                                                           =
+                                                   :  10pt;"><div style=3D"=
+font-family                                                                =
+                                                                           =
+            :  Verdana,                                                    =
+                                                                           =
+                         Arial,                                            =
+                                                                           =
+                                 Helvetica,                                =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                   :  10pt;=
+"><div style=3D"font-family                                                =
+                                                                           =
+                             :  Verdana,                                   =
+                                                                           =
+                                           Arial,                          =
+                                                                           =
+                                                    Helvetica,             =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                                                           =
+                                                        :  Verdana,        =
+                                                                           =
+                                                                       Aria=
+l,                                                                         =
+                                                                           =
+      Helvetica,                                                           =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                                           =
+             :  Verdana,                                                   =
+                                                                           =
+                             Arial,                                        =
+                                                                           =
+                                        Helvetica,                         =
+                                                                           =
+                                                       sans-serif; font-siz=
+e                                                                          =
+                                                                           =
+     :  10pt;"><div><div style=3D"font-family                              =
+                                                                           =
+                                                  :  Verdana,              =
+                                                                           =
+                                                                   Arial,  =
+                                                                           =
+                                                                           =
+    Helvetica,                                                             =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                              :  10pt;"><div style=3D"font-=
+family                                                                     =
+                                                                           =
+            :  Verdana,                                                    =
+                                                                           =
+                              Arial,                                       =
+                                                                           =
+                                           Helvetica,                      =
+                                                                           =
+                                                            sans-serif; fon=
+t-size                                                                     =
+                                                                           =
+            :  10pt;"><div style=3D"font-family                            =
+                                                                           =
+                                                      :  Verdana,          =
+                                                                           =
+                                                                         Ar=
+ial,                                                                       =
+                                                                           =
+            Helvetica,                                                     =
+                                                                           =
+                              sans-serif; font-size                        =
+                                                                           =
+                                                          :  10pt;"><div st=
+yle=3D"font-family                                                         =
+                                                                           =
+                          :  Verdana,                                      =
+                                                                           =
+                                              Arial,                       =
+                                                                           =
+                                                             Helvetica,    =
+                                                                           =
+                                                                           =
+     sans-serif; font-size                                                 =
+                                                                           =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                                                           =
+                                                                           =
+        :  Verdana,                                                        =
+                                                                           =
+                             Arial,                                        =
+                                                                           =
+                                             Helvetica,                    =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                    :  10pt;"><div><div style=3D"font-family               =
+                                                                           =
+                                                                      :  Ve=
+rdana,                                                                     =
+                                                                           =
+                 Arial,                                                    =
+                                                                           =
+                                  Helvetica,                               =
+                                                                           =
+                                                       sans-serif; font-siz=
+e                                                                          =
+                                                                           =
+           :  10pt;"><div><div style=3D"font-family                        =
+                                                                           =
+                                                              :  Verdana,  =
+                                                                           =
+                                                                           =
+          Arial,                                                           =
+                                                                           =
+                            Helvetica,                                     =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+       :  10pt;"><div><div style=3D"font-family                            =
+                                                                           =
+                                                           :  Verdana,     =
+                                                                           =
+                                                                           =
+        Arial,                                                             =
+                                                                           =
+                           Helvetica,                                      =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+        :  10pt;"><div style=3D"font-family                                =
+                                                                           =
+                                                        :  Verdana,        =
+                                                                           =
+                                                                           =
+      Arial,                                                               =
+                                                                           =
+                          Helvetica,                                       =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+         :  10pt;"><div><div style=3D"font-family                          =
+                                                                           =
+                                                               :  Verdana, =
+                                                                           =
+                                                                           =
+              Arial,                                                       =
+                                                                           =
+                                   Helvetica,                              =
+                                                                           =
+                                                            sans-serif; fon=
+t-size                                                                     =
+                                                                           =
+                    :  10pt;"><div><div style=3D"font-family               =
+                                                                           =
+                                                                           =
+:  Verdana,                                                                =
+                                                                           =
+                           Arial,                                          =
+                                                                           =
+                                                 Helvetica,                =
+                                                                           =
+                                                                           =
+sans-serif; font-size                                                      =
+                                                                           =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+                                                                           =
+                 :  Verdana,                                               =
+                                                                           =
+                                             Arial,                        =
+                                                                           =
+                                                                    Helveti=
+ca,                                                                        =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                                         :  10pt;"><div><di=
+v style=3D"font-family                                                     =
+                                                                           =
+                                       :  Verdana,                         =
+                                                                           =
+                                                                    Arial, =
+                                                                           =
+                                                                           =
+                 Helvetica,                                                =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                           =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                                                           =
+                                                                  :  Verdan=
+a,                                                                         =
+                                                                           =
+                     Arial,                                                =
+                                                                           =
+                                              Helvetica,                   =
+                                                                           =
+                                                                           =
+sans-serif; font-size                                                      =
+                                                                           =
+                                       :  10pt;"><div><div style=3D"font-fa=
+mily                                                                       =
+                                                                           =
+                       :  Verdana,                                         =
+                                                                           =
+                                                      Arial,               =
+                                                                           =
+                                                                           =
+     Helvetica,                                                            =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+:  10pt;"><div><div style=3D"font-family                                   =
+                                                                           =
+                                                            :  Verdana,    =
+                                                                           =
+                                                                           =
+                 Arial,                                                    =
+                                                                           =
+                                            Helvetica,                     =
+                                                                           =
+                                                                           =
+sans-serif; font-size                                                      =
+                                                                           =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                                           =
+                           :  Verdana,                                     =
+                                                                           =
+                                                            Arial,         =
+                                                                           =
+                                                                           =
+             Helvetica,                                                    =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                           =
+            :  10pt;"><div><div style=3D"font-family                       =
+                                                                           =
+                                                                          :=
+  Verdana,                                                                 =
+                                                                           =
+                                 Arial,                                    =
+                                                                           =
+                                                              Helvetica,   =
+                                                                           =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                                               :  10pt;"><d=
+iv><div style=3D"font-family                                               =
+                                                                           =
+                                                   :  Verdana,             =
+                                                                           =
+                                                                           =
+           Arial,                                                          =
+                                                                           =
+                                         Helvetica,                        =
+                                                                           =
+                                                                           =
+sans-serif; font-size                                                      =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                                           =
+                                 :  Verdana,                               =
+                                                                           =
+                                                                     Arial,=
+                                                                           =
+                                                                           =
+                         Helvetica,                                        =
+                                                                           =
+                                                            sans-serif; fon=
+t-size                                                                     =
+                                                                           =
+                              :  10pt;"><div><div style=3D"font-family     =
+                                                                           =
+                                                                           =
+                    :  Verdana,                                            =
+                                                                           =
+                                                         Arial,            =
+                                                                           =
+                                                                           =
+              Helvetica,                                                   =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+                     :  10pt;"><div><div style=3D"font-family              =
+                                                                           =
+                                                                           =
+            :  Verdana,                                                    =
+                                                                           =
+                                                  Arial,                   =
+                                                                           =
+                                                                           =
+        Helvetica,                                                         =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                           =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                                                                           =
+                                                                           =
+         :  Verdana,                                                       =
+                                                                           =
+                                                Arial,                     =
+                                                                           =
+                                                                           =
+       Helvetica,                                                          =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                           =
+                  :  10pt;"><div><div style=3D"font-family                 =
+                                                                           =
+                                                                           =
+           :  Verdana,                                                     =
+                                                                           =
+                                                   Arial,                  =
+                                                                           =
+                                                                           =
+           Helvetica,                                                      =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+                        :  10pt;"><div><div style=3D"font-family           =
+                                                                           =
+                                                                           =
+                  :  Verdana,                                              =
+                                                                           =
+                                                           Arial,          =
+                                                                           =
+                                                                           =
+                    Helvetica,                                             =
+                                                                           =
+                                                            sans-serif; fon=
+t-size                                                                     =
+                                                                           =
+                                   :  10pt;"><div><div style=3D"font-family=
+                                                                           =
+                                                                           =
+                              :  Verdana,                                  =
+                                                                           =
+                                                                        Ari=
+al,                                                                        =
+                                                                           =
+                                  Helvetica,                               =
+                                                                           =
+                                                                           =
+sans-serif; font-size                                                      =
+                                                                           =
+                                                   :  10pt;"><div style=3D"=
+font-family                                                                =
+                                                                           =
+                                          :  Verdana,                      =
+                                                                           =
+                                                                           =
+          Arial,                                                           =
+                                                                           =
+                                                Helvetica,                 =
+                                                                           =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                                                   :  10pt;=
+"><div><div style=3D"font-family                                           =
+                                                                           =
+                                                                :  Verdana,=
+                                                                           =
+                                                                           =
+                                 Arial,                                    =
+                                                                           =
+                                                                        Hel=
+vetica,                                                                    =
+                                                                           =
+                                        sans-serif; font-size              =
+                                                                           =
+                                                                           =
+                  :  10pt;"><div><div style=3D"font-family                 =
+                                                                           =
+                                                                           =
+                :  Verdana,                                                =
+                                                                           =
+                                                             Arial,        =
+                                                                           =
+                                                                           =
+                          Helvetica,                                       =
+                                                                           =
+                                                                      sans-=
+serif; font-size                                                           =
+                                                                           =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                                                 :  Verdana,               =
+                                                                           =
+                                                                           =
+                    Arial,                                                 =
+                                                                           =
+                                                             Helvetica,    =
+                                                                           =
+                                                                           =
+                               sans-serif; font-size                       =
+                                                                           =
+                                                                           =
+           :  10pt;"><div style=3D"font-family                             =
+                                                                           =
+                                                                           =
+      :  Verdana,                                                          =
+                                                                           =
+                                                     Arial,                =
+                                                                           =
+                                                                           =
+                    Helvetica,                                             =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                               :  10pt;"><div><div style=3D=
+"font-family                                                               =
+                                                                           =
+                                                :  Verdana,                =
+                                                                           =
+                                                                           =
+                     Arial,                                                =
+                                                                           =
+                                                                Helvetica, =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                  :  10pt;"><div><div style=3D"font-family                 =
+                                                                           =
+                                                                           =
+                    :  Verdana,                                            =
+                                                                           =
+                                                                     Arial,=
+                                                                           =
+                                                                           =
+                                      Helvetica,                           =
+                                                                           =
+                                                                           =
+           sans-serif; font-size                                           =
+                                                                           =
+                                                                     :  10p=
+t;"><div><div style=3D"font-family                                         =
+                                                                           =
+                                                                        :  =
+Verdana,                                                                   =
+                                                                           =
+                                               Arial,                      =
+                                                                           =
+                                                                           =
+                 Helvetica,                                                =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                                  :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                                                      :  Verdana,          =
+                                                                           =
+                                                                           =
+                              Arial,                                       =
+                                                                           =
+                                                                           =
+ Helvetica,                                                                =
+                                                                           =
+                                                   sans-serif; font-size   =
+                                                                           =
+                                                                           =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+                                                                           =
+                                         :  Verdana,                       =
+                                                                           =
+                                                                           =
+                  Arial,                                                   =
+                                                                           =
+                                                                 Helvetica,=
+                                                                           =
+                                                                           =
+                                         sans-serif; font-size             =
+                                                                           =
+                                                                           =
+                           :  10pt;"><div><div style=3D"font-family        =
+                                                                           =
+                                                                           =
+                                 :  Verdana,                               =
+                                                                           =
+                                                                           =
+           Arial,                                                          =
+                                                                           =
+                                                           Helvetica,      =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                       :  10pt;"><div><div style=3D"font-family            =
+                                                                           =
+                                                                           =
+                              :  Verdana,                                  =
+                                                                           =
+                                                                           =
+         Arial,                                                            =
+                                                                           =
+                                                          Helvetica,       =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                        :  10pt;"><div><div style=3D"font-family           =
+                                                                           =
+                                                                           =
+                                :  Verdana,                                =
+                                                                           =
+                                                                           =
+            Arial,                                                         =
+                                                                           =
+                                                              Helvetica,   =
+                                                                           =
+                                                                           =
+                                         sans-serif; font-size             =
+                                                                           =
+                                                                           =
+                              :  10pt;"><div><div style=3D"font-family     =
+                                                                           =
+                                                                           =
+                                       :  Verdana,                         =
+                                                                           =
+                                                                           =
+                    Arial,                                                 =
+                                                                           =
+                                                                       Helv=
+etica,                                                                     =
+                                                                           =
+                                                   sans-serif; font-size   =
+                                                                           =
+                                                                           =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                                           =
+                                                   :  Verdana,             =
+                                                                           =
+                                                                           =
+                                 Arial,                                    =
+                                                                           =
+                                                                           =
+          Helvetica,                                                       =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                                         :  10pt;"><div><di=
+v style=3D"font-family                                                     =
+                                                                           =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                                           =
+                                                   Arial,                  =
+                                                                           =
+                                                                           =
+                             Helvetica,                                    =
+                                                                           =
+                                                                           =
+           sans-serif; font-size                                           =
+                                                                           =
+                                                                           =
+   :  10pt;"><div><div style=3D"font-family                                =
+                                                                           =
+                                                                           =
+               :  Verdana,                                                 =
+                                                                           =
+                                                                          A=
+rial,                                                                      =
+                                                                           =
+                                                     Helvetica,            =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                             :  10pt;"><div><div style=3D"font-family      =
+                                                                           =
+                                                                           =
+                                          :  Verdana,                      =
+                                                                           =
+                                                                           =
+                           Arial,                                          =
+                                                                           =
+                                                                           =
+       Helvetica,                                                          =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                                            :  10pt;"><div>=
+<div style=3D"font-family                                                  =
+                                                                           =
+                                                                          :=
+  Verdana,                                                                 =
+                                                                           =
+                                                            Arial,         =
+                                                                           =
+                                                                           =
+                                         Helvetica,                        =
+                                                                           =
+                                                                           =
+                          sans-serif; font-size                            =
+                                                                           =
+                                                                           =
+                     :  10pt;"><div><div style=3D"font-family              =
+                                                                           =
+                                                                           =
+                                    :  Verdana,                            =
+                                                                           =
+                                                                           =
+                       Arial,                                              =
+                                                                           =
+                                                                           =
+     Helvetica,                                                            =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                                              :  10pt;"><di=
+v><div style=3D"font-family                                                =
+                                                                           =
+                                                                           =
+   :  Verdana,                                                             =
+                                                                           =
+                                                                  Arial,   =
+                                                                           =
+                                                                           =
+                                                 Helvetica,                =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                                 :  10pt;"><div><div style=3D"font-family  =
+                                                                           =
+                                                                           =
+                                                  :  Verdana,              =
+                                                                           =
+                                                                           =
+                                       Arial,                              =
+                                                                           =
+                                                                           =
+                       Helvetica,                                          =
+                                                                           =
+                                                                           =
+           sans-serif; font-size                                           =
+                                                                           =
+                                                                           =
+         :  10pt;"><div><div style=3D"font-family                          =
+                                                                           =
+                                                                           =
+                           :  Verdana,                                     =
+                                                                           =
+                                                                           =
+                 Arial,                                                    =
+                                                                           =
+                                                                           =
+  Helvetica,                                                               =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                                           =
+                                                                           =
+         :  Verdana,                                                       =
+                                                                           =
+                                                                           =
+Arial,                                                                     =
+                                                                           =
+                                                             Helvetica,    =
+                                                                           =
+                                                                           =
+                                                   sans-serif; font-size   =
+                                                                           =
+                                                                           =
+                                                   :  10pt;"><div><div styl=
+e=3D"font-family                                                           =
+                                                                           =
+                                                                       :  V=
+erdana,                                                                    =
+                                                                           =
+                                                               Arial,      =
+                                                                           =
+                                                                           =
+                                                  Helvetica,               =
+                                                                           =
+                                                                           =
+                                         sans-serif; font-size             =
+                                                                           =
+                                                                           =
+                                          :  10pt;"><div><div style=3D"font=
+-family                                                                    =
+                                                                           =
+                                                               :  Verdana, =
+                                                                           =
+                                                                           =
+                                                        Arial,             =
+                                                                           =
+                                                                           =
+                                            Helvetica,                     =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                                      :  10pt;"><div><div style=3D"font-fam=
+ily                                                                        =
+                                                                           =
+                                                            :  Verdana,    =
+                                                                           =
+                                                                           =
+                                                      Arial,               =
+                                                                           =
+                                                                           =
+                                           Helvetica,                      =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                                       :  10pt;"><div><div style=3D"font-fa=
+mily                                                                       =
+                                                                           =
+                                                              :  Verdana,  =
+                                                                           =
+                                                                           =
+                                                         Arial,            =
+                                                                           =
+                                                                           =
+                                               Helvetica,                  =
+                                                                           =
+                                                                           =
+                                         sans-serif; font-size             =
+                                                                           =
+                                                                           =
+                                             :  10pt;"><div><div style=3D"f=
+ont-family                                                                 =
+                                                                           =
+                                                                     :  Ver=
+dana,                                                                      =
+                                                                           =
+                                                                 Arial,    =
+                                                                           =
+                                                                           =
+                                                        Helvetica,         =
+                                                                           =
+                                                                           =
+                                                   sans-serif; font-size   =
+                                                                           =
+                                                                           =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                                           =
+                                                                           =
+      :  Verdana,                                                          =
+                                                                           =
+                                                                           =
+   Arial,                                                                  =
+                                                                           =
+                                                                      Helve=
+tica,                                                                      =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                                                        :  =
+10pt;"><div><div style=3D"font-family                                      =
+                                                                           =
+                                                                           =
+                       :  Verdana,                                         =
+                                                                           =
+                                                                           =
+                     Arial,                                                =
+                                                                           =
+                                                                           =
+              Helvetica,                                                   =
+                                                                           =
+                                                                           =
+           sans-serif; font-size                                           =
+                                                                           =
+                                                                           =
+                  :  10pt;"><div><div style=3D"font-family                 =
+                                                                           =
+                                                                           =
+                                             :  Verdana,                   =
+                                                                           =
+                                                                           =
+                                            Arial,                         =
+                                                                           =
+                                                                           =
+                                      Helvetica,                           =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                                           =
+                                                                        :  =
+Verdana,                                                                   =
+                                                                           =
+                                                                        Ari=
+al,                                                                        =
+                                                                           =
+                                                                   Helvetic=
+a,                                                                         =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                                                           =
+:  10pt;"><div><div style=3D"font-family                                   =
+                                                                           =
+                                                                           =
+                             :  Verdana,                                   =
+                                                                           =
+                                                                           =
+                              Arial,                                       =
+                                                                           =
+                                                                           =
+                          Helvetica,                                       =
+                                                                           =
+                                                                           =
+                          sans-serif; font-size                            =
+                                                                           =
+                                                                           =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+                                                                           =
+                                                                  :  Verdan=
+a,                                                                         =
+                                                                           =
+                                                                    Arial, =
+                                                                           =
+                                                                           =
+                                                                 Helvetica,=
+                                                                           =
+                                                                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                                           =
+                                                                           =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                                                                           =
+                                                                           =
+                                 :  Verdana,                               =
+                                                                           =
+                                                                           =
+                                    Arial,                                 =
+                                                                           =
+                                                                           =
+                                  Helvetica,                               =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                                                :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                                                                           =
+       :  Verdana,                                                         =
+                                                                           =
+                                                                           =
+           Arial,                                                          =
+                                                                           =
+                                                                           =
+          Helvetica,                                                       =
+                                                                           =
+                                                                           =
+             sans-serif; font-size                                         =
+                                                                           =
+                                                                           =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                                                           =
+                                                                           =
+                                                           :  Verdana,     =
+                                                                           =
+                                                                           =
+                                                                Arial,     =
+                                                                           =
+                                                                           =
+                                                                Helvetica, =
+                                                                           =
+                                                                           =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                           =
+                                                                           =
+       :  10pt;"><div><div style=3D"font-family                            =
+                                                                           =
+                                                                           =
+                                         :  Verdana,                       =
+                                                                           =
+                                                                           =
+                                               Arial,                      =
+                                                                           =
+                                                                           =
+                                                Helvetica,                 =
+                                                                           =
+                                                                           =
+                                                     sans-serif; font-size =
+                                                                           =
+                                                                           =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                                                           =
+                                                                           =
+                            :  Verdana,                                    =
+                                                                           =
+                                                                           =
+                                   Arial,                                  =
+                                                                           =
+                                                                           =
+                                     Helvetica,                            =
+                                                                           =
+                                                                           =
+                                           sans-serif; font-size           =
+                                                                           =
+                                                                           =
+                                                           :  10pt;"><div><=
+div style=3D"font-family                                                   =
+                                                                           =
+                                                                           =
+                    :  Verdana,                                            =
+                                                                           =
+                                                                           =
+                            Arial,                                         =
+                                                                           =
+                                                                           =
+                               Helvetica,                                  =
+                                                                           =
+                                                                           =
+                                      sans-serif; font-size                =
+                                                                           =
+                                                                           =
+                                                       :  10pt;"><div><div =
+style=3D"font-family                                                       =
+                                                                           =
+                                                                           =
+                 :  Verdana,                                               =
+                                                                           =
+                                                                           =
+                          Arial,                                           =
+                                                                           =
+                                                                           =
+                              Helvetica,                                   =
+                                                                           =
+                                                                           =
+                                      sans-serif; font-size                =
+                                                                           =
+                                                                           =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                                           =
+                                                                           =
+                   :  Verdana,                                             =
+                                                                           =
+                                                                           =
+                             Arial,                                        =
+                                                                           =
+                                                                           =
+                                  Helvetica,                               =
+                                                                           =
+                                                                           =
+                                           sans-serif; font-size           =
+                                                                           =
+                                                                           =
+                                                              :  10pt;"><di=
+v style=3D"font-family                                                     =
+                                                                           =
+                                                                           =
+                     :  Verdana,                                           =
+                                                                           =
+                                                                           =
+                                Arial,                                     =
+                                                                           =
+                                                                           =
+                                      Helvetica,                           =
+                                                                           =
+                                                                           =
+                                                sans-serif; font-size      =
+                                                                           =
+                                                                           =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                                                           =
+                                                                           =
+                                 :  Verdana,                               =
+                                                                           =
+                                                                           =
+                                             Arial,                        =
+                                                                           =
+                                                                           =
+                                                    Helvetica,             =
+                                                                           =
+                                                                           =
+                                                               sans-serif; =
+font-size                                                                  =
+                                                                           =
+                                                                           =
+         :  10pt;"><div><div style=3D"font-family                          =
+                                                                           =
+                                                                           =
+                                                  :  Verdana,              =
+                                                                           =
+                                                                           =
+                                                               Arial,      =
+                                                                           =
+                                                                           =
+                                                                       Helv=
+etica,                                                                     =
+                                                                           =
+                                                                           =
+        sans-serif; font-size                                              =
+                                                                           =
+                                                                           =
+                              :  10pt;"><div><div style=3D"font-family     =
+                                                                           =
+                                                                           =
+                                                                        :  =
+Verdana,                                                                   =
+                                                                           =
+                                                                           =
+           Arial,                                                          =
+                                                                           =
+                                                                           =
+                    Helvetica,                                             =
+                                                                           =
+                                                                           =
+                                 sans-serif; font-size                     =
+                                                                           =
+                                                                           =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                                           =
+                                                                           =
+                        :  Verdana,                                        =
+                                                                           =
+                                                                           =
+                                       Arial,                              =
+                                                                           =
+                                                                           =
+                                                 Helvetica,                =
+                                                                           =
+                                                                           =
+                                                               sans-serif; =
+font-size                                                                  =
+                                                                           =
+                                                                           =
+            :  10pt;"><div><div style=3D"font-family                       =
+                                                                           =
+                                                                           =
+                                                        :  Verdana,        =
+                                                                           =
+                                                                           =
+                                                                        Ari=
+al,                                                                        =
+                                                                           =
+                                                                           =
+        Helvetica,                                                         =
+                                                                           =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                                                                           =
+                                                :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                                                                           =
+                    :  Verdana,                                            =
+                                                                           =
+                                                                           =
+                                     Arial,                                =
+                                                                           =
+                                                                           =
+                                                 Helvetica,                =
+                                                                           =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                                                           =
+                :  10pt;"><div><div style=3D"font-family                   =
+                                                                           =
+                                                                           =
+                                                              :  Verdana,  =
+                                                                           =
+                                                                           =
+                                                                           =
+     Arial,                                                                =
+                                                                           =
+                                                                           =
+                  Helvetica,                                               =
+                                                                           =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+                                                              :  10pt;"><di=
+v><div style=3D"font-family                                                =
+                                                                           =
+                                                                           =
+                                  :  Verdana,                              =
+                                                                           =
+                                                                           =
+                                                     Arial,                =
+                                                                           =
+                                                                           =
+                                                                   Helvetic=
+a,                                                                         =
+                                                                           =
+                                                                           =
+          sans-serif; font-size                                            =
+                                                                           =
+                                                                           =
+                                      :  10pt;"><div><div style=3D"font-fam=
+ily                                                                        =
+                                                                           =
+                                                                           =
+           :  Verdana,                                                     =
+                                                                           =
+                                                                           =
+                               Arial,                                      =
+                                                                           =
+                                                                           =
+                                              Helvetica,                   =
+                                                                           =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                                                           =
+                   :  10pt;"><div><div style=3D"font-family                =
+                                                                           =
+                                                                           =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                                           =
+                                                                           =
+              Arial,                                                       =
+                                                                           =
+                                                                           =
+                              Helvetica,                                   =
+                                                                           =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+                                                                           =
+     :  10pt;"><div><div style=3D"font-family                              =
+                                                                           =
+                                                                           =
+                                                       :  Verdana,         =
+                                                                           =
+                                                                           =
+                                                                           =
+  Arial,                                                                   =
+                                                                           =
+                                                                           =
+                   Helvetica,                                              =
+                                                                           =
+                                                                           =
+                                        sans-serif; font-size              =
+                                                                           =
+                                                                           =
+                                                                       :  1=
+0pt;"><div><div style=3D"font-family                                       =
+                                                                           =
+                                                                           =
+                                               :  Verdana,                 =
+                                                                           =
+                                                                           =
+                                                                      Arial=
+,                                                                          =
+                                                                           =
+                                                                           =
+             Helvetica,                                                    =
+                                                                           =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+                                                                   :  10pt;=
+"><div><div style=3D"font-family                                           =
+                                                                           =
+                                                                           =
+                                            :  Verdana,                    =
+                                                                           =
+                                                                           =
+                                                                    Arial, =
+                                                                           =
+                                                                           =
+                                                                           =
+            Helvetica,                                                     =
+                                                                           =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                                                           =
+                                                                           =
+                                              :  Verdana,                  =
+                                                                           =
+                                                                           =
+                                                                       Aria=
+l,                                                                         =
+                                                                           =
+                                                                           =
+                Helvetica,                                                 =
+                                                                           =
+                                                                           =
+                                        sans-serif; font-size              =
+                                                                           =
+                                                                           =
+                                                                          :=
+  10pt;"><div><div style=3D"font-family                                    =
+                                                                           =
+                                                                           =
+                                                     :  Verdana,           =
+                                                                           =
+                                                                           =
+                                                                           =
+    Arial,                                                                 =
+                                                                           =
+                                                                           =
+                         Helvetica,                                        =
+                                                                           =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+                                                                           =
+          :  10pt;"><div><div style=3D"font-family                         =
+                                                                           =
+                                                                           =
+                                                                 :  Verdana=
+,                                                                          =
+                                                                           =
+                                                                           =
+                 Arial,                                                    =
+                                                                           =
+                                                                           =
+                                       Helvetica,                          =
+                                                                           =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                                                           =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                                                           =
+                                                                           =
+                                                                           =
+       :  Verdana,                                                         =
+                                                                           =
+                                                                           =
+                                   Arial,                                  =
+                                                                           =
+                                                                           =
+                                                          Helvetica,       =
+                                                                           =
+                                                                           =
+                                                                           =
+          sans-serif; font-size                                            =
+                                                                           =
+                                                                           =
+                                               :  10pt;"><div><div style=3D=
+"font-family                                                               =
+                                                                           =
+                                                                           =
+                             :  Verdana,                                   =
+                                                                           =
+                                                                           =
+                                                          Arial,           =
+                                                                           =
+                                                                           =
+                                                                           =
+       Helvetica,                                                          =
+                                                                           =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+                                                                         : =
+ 10pt;"><div><div style=3D"font-family                                     =
+                                                                           =
+                                                                           =
+                                                        :  Verdana,        =
+                                                                           =
+                                                                           =
+                                                                           =
+           Arial,                                                          =
+                                                                           =
+                                                                           =
+                                    Helvetica,                             =
+                                                                           =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                                                           =
+                             :  10pt;"><div><div style=3D"font-family      =
+                                                                           =
+                                                                           =
+                                                                           =
+             :  Verdana,                                                   =
+                                                                           =
+                                                                           =
+                                            Arial,                         =
+                                                                           =
+                                                                           =
+                                                                      Helve=
+tica,                                                                      =
+                                                                           =
+                                                                           =
+                         sans-serif; font-size                             =
+                                                                           =
+                                                                           =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                                           =
+                                                                           =
+                                                  :  Verdana,              =
+                                                                           =
+                                                                           =
+                                                                           =
+       Arial,                                                              =
+                                                                           =
+                                                                           =
+                                  Helvetica,                               =
+                                                                           =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                                                           =
+                               :  10pt;"><div><div style=3D"font-family    =
+                                                                           =
+                                                                           =
+                                                                           =
+                 :  Verdana,                                               =
+                                                                           =
+                                                                           =
+                                                  Arial,                   =
+                                                                           =
+                                                                           =
+                                                                           =
+   Helvetica,                                                              =
+                                                                           =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+                                                                           =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                                                                           =
+                                                                           =
+                                                                :  Verdana,=
+                                                                           =
+                                                                           =
+                                                                           =
+                       Arial,                                              =
+                                                                           =
+                                                                           =
+                                                    Helvetica,             =
+                                                                           =
+                                                                           =
+                                                                           =
+          sans-serif; font-size                                            =
+                                                                           =
+                                                                           =
+                                                     :  10pt;"><div><div st=
+yle=3D"font-family                                                         =
+                                                                           =
+                                                                           =
+                                         :  Verdana,                       =
+                                                                           =
+                                                                           =
+                                                                           =
+ Arial,                                                                    =
+                                                                           =
+                                                                           =
+                               Helvetica,                                  =
+                                                                           =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                                                           =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                                                           =
+                                                                           =
+                                                                           =
+                       :  Verdana,                                         =
+                                                                           =
+                                                                           =
+                                                           Arial,          =
+                                                                           =
+                                                                           =
+                                                                           =
+               Helvetica,                                                  =
+                                                                           =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+                                                                           =
+                    :  10pt;"><div><div style=3D"font-family               =
+                                                                           =
+                                                                           =
+                                                                           =
+          :  Verdana,                                                      =
+                                                                           =
+                                                                           =
+                                               Arial,                      =
+                                                                           =
+                                                                           =
+                                                                           =
+    Helvetica,                                                             =
+                                                                           =
+                                                                           =
+                                        sans-serif; font-size              =
+                                                                           =
+                                                                           =
+                                                                           =
+           :  10pt;"><div><div style=3D"font-family                        =
+                                                                           =
+                                                                           =
+                                                                           =
+  :  Verdana,                                                              =
+                                                                           =
+                                                                           =
+                                        Arial,                             =
+                                                                           =
+                                                                           =
+                                                                         He=
+lvetica,                                                                   =
+                                                                           =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+                                                                           =
+       :  10pt;"><div><div style=3D"font-family                            =
+                                                                           =
+                                                                           =
+                                                                          :=
+  Verdana,                                                                 =
+                                                                           =
+                                                                           =
+                                      Arial,                               =
+                                                                           =
+                                                                           =
+                                                                        Hel=
+vetica,                                                                    =
+                                                                           =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+                                                                           =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                                                           =
+                                                                           =
+                                                                           =
+ :  Verdana,                                                               =
+                                                                           =
+                                                                           =
+                                         Arial,                            =
+                                                                           =
+                                                                           =
+                                                                           =
+ Helvetica,                                                                =
+                                                                           =
+                                                                           =
+                                        sans-serif; font-size              =
+                                                                           =
+                                                                           =
+                                                                           =
+              :  10pt;"><div><div style=3D"font-family                     =
+                                                                           =
+                                                                           =
+                                                                           =
+        :  Verdana,                                                        =
+                                                                           =
+                                                                           =
+                                                 Arial,                    =
+                                                                           =
+                                                                           =
+                                                                           =
+          Helvetica,                                                       =
+                                                                           =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+                                                                           =
+                         :  10pt;"><div><div style=3D"font-family          =
+                                                                           =
+                                                                           =
+                                                                           =
+                    :  Verdana,                                            =
+                                                                           =
+                                                                           =
+                                                              Arial,       =
+                                                                           =
+                                                                           =
+                                                                           =
+                        Helvetica,                                         =
+                                                                           =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                                                           =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                                           =
+                                                                           =
+                                     :  Verdana,                           =
+                                                                           =
+                                                                           =
+                                                                           =
+     Arial,                                                                =
+                                                                           =
+                                                                           =
+                                           Helvetica,                      =
+                                                                           =
+                                                                           =
+                                                                           =
+          sans-serif; font-size                                            =
+                                                                           =
+                                                                           =
+                                                              :  10pt;"><di=
+v><div style=3D"font-family                                                =
+                                                                           =
+                                                                           =
+                                                           :  Verdana,     =
+                                                                           =
+                                                                           =
+                                                                           =
+                            Arial,                                         =
+                                                                           =
+                                                                           =
+                                                                   Helvetic=
+a,                                                                         =
+                                                                           =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+                                                                           =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                                                           =
+                                                                           =
+                                                                           =
+           :  Verdana,                                                     =
+                                                                           =
+                                                                           =
+                                                        Arial,             =
+                                                                           =
+                                                                           =
+                                                                           =
+                     Helvetica,                                            =
+                                                                           =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                                                           =
+                                            :  10pt;"><div style=3D"font-fa=
+mily                                                                       =
+                                                                           =
+                                                                           =
+                                      :  Verdana,                          =
+                                                                           =
+                                                                           =
+                                                                           =
+         Arial,                                                            =
+                                                                           =
+                                                                           =
+                                                  Helvetica,               =
+                                                                           =
+                                                                           =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                                                           =
+                                                                           =
+:  10pt;"><div><div style=3D"font-family                                   =
+                                                                           =
+                                                                           =
+                                                                           =
+:  Verdana,                                                                =
+                                                                           =
+                                                                           =
+                                               Arial,                      =
+                                                                           =
+                                                                           =
+                                                                           =
+              Helvetica,                                                   =
+                                                                           =
+                                                                           =
+                                                            sans-serif; fon=
+t-size                                                                     =
+                                                                           =
+                                                                           =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                                           =
+                                                                           =
+                                          :  Verdana,                      =
+                                                                           =
+                                                                           =
+                                                                           =
+               Arial,                                                      =
+                                                                           =
+                                                                           =
+                                                          Helvetica,       =
+                                                                           =
+                                                                           =
+                                                                           =
+                              sans-serif; font-size                        =
+                                                                           =
+                                                                           =
+                                                                           =
+            :  10pt;"><div><div class=3D"x_1968464130align-justify" style=
+=3D"text-align                                                             =
+                                                                           =
+                               :  justify; line-height                     =
+                                                                           =
+                                                                       :  1=
+;"><span><span><span><span>Greetings!</span></span></span></span><br></div>=
+<div class=3D"x_1968464130align-justify" style=3D"text-align               =
+                                                                           =
+                                                                           =
+  :  justify; line-height                                                  =
+                                                                           =
+                                          :  1;"><br></div><div class=3D"x_=
+1968464130align-justify" style=3D"text-align                               =
+                                                                           =
+                                                             :  justify; li=
+ne-height                                                                  =
+                                                                           =
+                          :  1;"><span><span><span><span>This is test, a Me=
+dia Associate of </span><b></b><span>example.com, example.com with 5 mi=
+llion visitors monthly, Based on our marketing research, your services are =
+among the best in the market. We believe that our readers will be the right=
+ target for you to promote your product and build up your branding.</span><=
+/span></span></span><br></div><div class=3D"x_1968464130align-justify" styl=
+e=3D"text-align                                                            =
+                                                                           =
+                                :  justify; line-height                    =
+                                                                           =
+                                                                        :  =
+1;"><br></div><div class=3D"x_1968464130align-justify" style=3D"text-align =
+                                                                           =
+                                                                           =
+                :  justify; line-height                                    =
+                                                                           =
+                                                        :  1;"><span><span>=
+<span><span>Here are the 2 articles that we offer:</span></span></span></sp=
+an><br></div><div class=3D"x_1968464130align-justify" style=3D"text-align  =
+                                                                           =
+                                                                           =
+               :  justify; line-height                                     =
+                                                                           =
+                                                       :  1;"><br></div><di=
+v class=3D"x_1968464130align-justify" style=3D"text-align                  =
+                                                                           =
+                                                                          :=
+  justify; line-height                                                     =
+                                                                           =
+                                       :  1;"><b><span><span><span>1. Ranki=
+ng Article</span></span></span><br></b></div><div class=3D"x_1968464130alig=
+n-justify" style=3D"text-align                                             =
+                                                                           =
+                                               :  justify; line-height     =
+                                                                           =
+                                                                           =
+            :  1;"><b><span><span><span>2. Software/Product Review</span></=
+span></span></b><br></div><div class=3D"x_1968464130align-justify" style=3D=
+"text-align                                                                =
+                                                                           =
+                            :  justify; line-height                        =
+                                                                           =
+                                                                    :  1;">=
+<br></div><div class=3D"x_1968464130align-justify" style=3D"text-align     =
+                                                                           =
+                                                                           =
+            :  justify; line-height                                        =
+                                                                           =
+                                                    :  1;"><span><span><spa=
+n><span>Meanwhile, example is well known for Ranking Articles. For exampl=
+e, If you Google "Best Technology test Firms in India" or "Top 5 NFT, you =
+can play, " you will see that our posts are on the 1st page of Google. (Thi=
+s is an example we did for our client)</span></span></span></span><br></div=
+><div class=3D"x_1968464130align-justify" style=3D"text-align              =
+                                                                           =
+                                                                           =
+   :  justify; line-height                                                 =
+                                                                           =
+                                           :  1;"><br></div><div class=3D"x=
+_1968464130align-justify" style=3D"text-align                              =
+                                                                           =
+                                                              :  justify; l=
+ine-height                                                                 =
+                                                                           =
+                           :  1;"><span><span><span><span>Currently, we are=
+ focusing on the "</span></span></span></span><b><span><span><span>Top 5 Be=
+st Shared Inbox Software&nbsp;in 2023</span></span></span></b><span><span><=
+span><span>". Please let me know if you are interested in being featured as=
+ No.1. </span></span></span></span><b><span><span><span>You can also sugges=
+t the best keyword for your business</span></span></span></b><span><span><s=
+pan><span>.</span></span></span></span><br></div><div class=3D"x_1968464130=
+align-justify" style=3D"text-align                                         =
+                                                                           =
+                                                   :  justify; line-height =
+                                                                           =
+                                                                           =
+                :  1;"><span><span><span><span>=E2=80=8B</span></span></spa=
+n></span><br></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div></div></div></div></div></=
+div></div></div></div></div></div></div></div></div></div></div></div></div=
+></div></div></div></div></div></div></div></div><div style=3D"font-family =
+                                      :  Verdana,                          =
+              Arial,                                        Helvetica,     =
+                                   sans-serif; font-size                   =
+                    :  10pt;"><div><div style=3D"font-family               =
+                         :  Verdana,                                       =
+  Arial,                                         Helvetica,                =
+                         sans-serif; font-size                             =
+           :  10pt;"><div><div style=3D"font-family                        =
+                 :  Verdana,                                          Arial=
+,                                          Helvetica,                      =
+                    sans-serif; font-size                                  =
+       :  10pt;"><div><span><span><span><span>Please let me know if you are=
+ interested.&nbsp; Thank you.</span></span></span></span><br></div><div><di=
+v style=3D"font-family                                          :  Verdana,=
+                                           Arial,                          =
+                 Helvetica,                                           sans-=
+serif; font-size                                          :  10pt;"><div><d=
+iv style=3D"font-family                                           :  Verdan=
+a,                                            Arial,                       =
+                     Helvetica,                                            =
+sans-serif; font-size                                           :  10pt;"><=
+div><div style=3D"font-family                                            : =
+ Verdana,                                             Arial,               =
+                              Helvetica,                                   =
+          sans-serif; font-size                                            =
+:  10pt;"><div><div style=3D"font-family                                   =
+          :  Verdana,                                              Arial,  =
+                                            Helvetica,                     =
+                         sans-serif; font-size                             =
+                :  10pt;"><div><div style=3D"font-family                   =
+                           :  Verdana,                                     =
+          Arial,                                               Helvetica,  =
+                                             sans-serif; font-size         =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                               :  Verdana,               =
+                                 Arial,                                    =
+            Helvetica,                                                sans-=
+serif; font-size                                               :  10pt;"><d=
+iv><div style=3D"font-family                                               =
+ :  Verdana,                                                 Arial,        =
+                                         Helvetica,                        =
+                         sans-serif; font-size                             =
+                   :  10pt;"><div><div style=3D"font-family                =
+                                 :  Verdana,                               =
+                   Arial,                                                  =
+Helvetica,                                                  sans-serif; fon=
+t-size                                                 :  10pt;"><div><div =
+style=3D"font-family                                                  :  Ve=
+rdana,                                                   Arial,            =
+                                       Helvetica,                          =
+                         sans-serif; font-size                             =
+                     :  10pt;"><div><div style=3D"font-family              =
+                                     :  Verdana,                           =
+                         Arial,                                            =
+        Helvetica,                                                    sans-=
+serif; font-size                                                   :  10pt;=
+"><div><div style=3D"font-family                                           =
+         :  Verdana,                                                     Ar=
+ial,                                                     Helvetica,        =
+                                             sans-serif; font-size         =
+                                           :  10pt;"><div><div style=3D"fon=
+t-family                                                     :  Verdana,   =
+                                                   Arial,                  =
+                                    Helvetica,                             =
+                         sans-serif; font-size                             =
+                        :  10pt;"><div><div style=3D"font-family           =
+                                           :  Verdana,                     =
+                                  Arial,                                   =
+                    Helvetica,                                             =
+          sans-serif; font-size                                            =
+          :  10pt;"><div><div style=3D"font-family                         =
+                              :  Verdana,                                  =
+                      Arial,                                               =
+         Helvetica,                                                        =
+sans-serif; font-size                                                      =
+ :  10pt;"><div><div style=3D"font-family                                  =
+                      :  Verdana,                                          =
+               Arial,                                                      =
+   Helvetica,                                                         sans-=
+serif; font-size                                                        :  =
+10pt;"><div><div style=3D"font-family                                      =
+                   :  Verdana,                                             =
+             Arial,                                                        =
+  Helvetica,                                                          sans-=
+serif; font-size                                                         : =
+ 10pt;"><div><div style=3D"font-family                                     =
+                     :  Verdana,                                           =
+                Arial,                                                     =
+      Helvetica,                                                           =
+sans-serif; font-size                                                      =
+    :  10pt;"><div><div style=3D"font-family                               =
+                            :  Verdana,                                    =
+                        Arial,                                             =
+               Helvetica,                                                  =
+          sans-serif; font-size                                            =
+               :  10pt;"><div><div style=3D"font-family                    =
+                                        :  Verdana,                        =
+                                     Arial,                                =
+                             Helvetica,                                    =
+                         sans-serif; font-size                             =
+                               :  10pt;"><div><div style=3D"font-family    =
+                                                         :  Verdana,       =
+                                                       Arial,              =
+                                                Helvetica,                 =
+                                             sans-serif; font-size         =
+                                                    :  10pt;"><div><div sty=
+le=3D"font-family                                                          =
+    :  Verdana,                                                            =
+   Arial,                                                               Hel=
+vetica,                                                               sans-=
+serif; font-size                                                           =
+   :  10pt;"><div><div style=3D"font-family                                =
+                               :  Verdana,                                 =
+                               Arial,                                      =
+                          Helvetica,                                       =
+                         sans-serif; font-size                             =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                                               :  Verdana, =
+                                                                Arial,     =
+                                                            Helvetica,     =
+                                                            sans-serif; fon=
+t-size                                                                :  10=
+pt;"><div><div style=3D"font-family                                        =
+                         :  Verdana,                                       =
+                           Arial,                                          =
+                        Helvetica,                                         =
+                         sans-serif; font-size                             =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                  :  Verda=
+na,                                                                   Arial=
+,                                                                   Helveti=
+ca,                                                                   sans-=
+serif; font-size                                                           =
+       :  10pt;"><div style=3D"font-family                                 =
+                                  :  Verdana,                              =
+                                      Arial,                               =
+                                     Helvetica,                            =
+                                        sans-serif; font-size              =
+                                                     :  10pt;"><div><div st=
+yle=3D"font-family                                                         =
+           :  Verdana,                                                     =
+                Arial,                                                     =
+                Helvetica,                                                 =
+                    sans-serif; font-size                                  =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                                                    :  Verd=
+ana,                                                                      A=
+rial,                                                                      =
+Helvetica,                                                                 =
+     sans-serif; font-size                                                 =
+                    :  10pt;"><div><div style=3D"font-family               =
+                                                       :  Verdana,         =
+                                                              Arial,       =
+                                                                Helvetica, =
+                                                                      sans-=
+serif; font-size                                                           =
+           :  10pt;"><div><div style=3D"font-family                        =
+                                               :  Verdana,                 =
+                                                       Arial,              =
+                                                          Helvetica,       =
+                                                                 sans-serif=
+; font-size                                                                =
+       :  10pt;"><div><div style=3D"font-family                            =
+                                            :  Verdana,                    =
+                                                     Arial,                =
+                                                         Helvetica,        =
+                                                                 sans-serif=
+; font-size                                                                =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                              :  Verdana,                  =
+                                                        Arial,             =
+                                                             Helvetica,    =
+                                                                      sans-=
+serif; font-size                                                           =
+              :  10pt;"><div><div style=3D"font-family                     =
+                                                     :  Verdana,           =
+                                                                Arial,     =
+                                                                      Helve=
+tica,                                                                      =
+     sans-serif; font-size                                                 =
+                         :  10pt;"><div><div style=3D"font-family          =
+                                                                 :  Verdana=
+,                                                                          =
+  Arial,                                                                   =
+         Helvetica,                                                        =
+                    sans-serif; font-size                                  =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+       :  Verdana,                                                         =
+                    Arial,                                                 =
+                            Helvetica,                                     =
+                                        sans-serif; font-size              =
+                                                              :  10pt;"><di=
+v><div style=3D"font-family                                                =
+                             :  Verdana,                                   =
+                                           Arial,                          =
+                                                    Helvetica,             =
+                                                                 sans-serif=
+; font-size                                                                =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                                        :  Verdana,        =
+                                                                       Aria=
+l,                                                                         =
+      Helvetica,                                                           =
+                    sans-serif; font-size                                  =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+             :  Verdana,                                                   =
+                             Arial,                                        =
+                                        Helvetica,                         =
+                                                       sans-serif; font-siz=
+e                                                                          =
+     :  10pt;"><div><div style=3D"font-family                              =
+                                                  :  Verdana,              =
+                                                                   Arial,  =
+                                                                           =
+    Helvetica,                                                             =
+                    sans-serif; font-size                                  =
+                                              :  10pt;"><div><div style=3D"=
+font-family                                                                =
+                 :  Verdana,                                               =
+                                   Arial,                                  =
+                                                Helvetica,                 =
+                                                                 sans-serif=
+; font-size                                                                =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                                                                :  Verdana,=
+                                                                           =
+        Arial,                                                             =
+                      Helvetica,                                           =
+                                        sans-serif; font-size              =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                         :  Verdana,                       =
+                                                             Arial,        =
+                                                                           =
+ Helvetica,                                                                =
+                    sans-serif; font-size                                  =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                        :  Verdana,                                        =
+                                             Arial,                        =
+                                                             Helvetica,    =
+                                                                           =
+      sans-serif; font-size                                                =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+           :  Verdana,                                                     =
+                                 Arial,                                    =
+                                                  Helvetica,               =
+                                                                       sans=
+-serif; font-size                                                          =
+                           :  10pt;"><div><div style=3D"font-family        =
+                                                                           =
+   :  Verdana,                                                             =
+                          Arial,                                           =
+                                            Helvetica,                     =
+                                                                  sans-seri=
+f; font-size                                                               =
+                       :  10pt;"><div><div style=3D"font-family            =
+                                                                           =
+:  Verdana,                                                                =
+                        Arial,                                             =
+                                           Helvetica,                      =
+                                                                  sans-seri=
+f; font-size                                                               =
+                        :  10pt;"><div><div style=3D"font-family           =
+                                                                           =
+  :  Verdana,                                                              =
+                           Arial,                                          =
+                                               Helvetica,                  =
+                                                                       sans=
+-serif; font-size                                                          =
+                              :  10pt;"><div><div style=3D"font-family     =
+                                                                           =
+         :  Verdana,                                                       =
+                                   Arial,                                  =
+                                                        Helvetica,         =
+                                                                           =
+      sans-serif; font-size                                                =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                     :  Verdana,                                           =
+                                                Arial,                     =
+                                                                      Helve=
+tica,                                                                      =
+                     sans-serif; font-size                                 =
+                                                         :  10pt;"><div><di=
+v style=3D"font-family                                                     =
+                                      :  Verdana,                          =
+                                                                  Arial,   =
+                                                                           =
+              Helvetica,                                                   =
+                                         sans-serif; font-size             =
+                                                                           =
+   :  10pt;"><div><div style=3D"font-family                                =
+                                                            :  Verdana,    =
+                                                                           =
+              Arial,                                                       =
+                                      Helvetica,                           =
+                                                                  sans-seri=
+f; font-size                                                               =
+                             :  10pt;"><div><div style=3D"font-family      =
+                                                                           =
+            :  Verdana,                                                    =
+                                          Arial,                           =
+                                                                   Helvetic=
+a,                                                                         =
+                     sans-serif; font-size                                 =
+                                                            :  10pt;"><div>=
+<div style=3D"font-family                                                  =
+                                            :  Verdana,                    =
+                                                                           =
+Arial,                                                                     =
+                          Helvetica,                                       =
+                                                        sans-serif; font-si=
+ze                                                                         =
+                     :  10pt;"><div><div style=3D"font-family              =
+                                                                           =
+      :  Verdana,                                                          =
+                                      Arial,                               =
+                                                                 Helvetica,=
+                                                                           =
+                     sans-serif; font-size                                 =
+                                                              :  10pt;"><di=
+v><div style=3D"font-family                                                =
+                                                :  Verdana,                =
+                                                                           =
+      Arial,                                                               =
+                                  Helvetica,                               =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                 :  10pt;"><div><div style=3D"font-family  =
+                                                                           =
+                    :  Verdana,                                            =
+                                                      Arial,               =
+                                                                           =
+        Helvetica,                                                         =
+                                         sans-serif; font-size             =
+                                                                           =
+         :  10pt;"><div><div style=3D"font-family                          =
+                                                                        :  =
+Verdana,                                                                   =
+                                Arial,                                     =
+                                                              Helvetica,   =
+                                                                           =
+                     sans-serif; font-size                                 =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                      :  Verdana,          =
+                                                                           =
+               Arial,                                                      =
+                                              Helvetica,                   =
+                                                                           =
+      sans-serif; font-size                                                =
+                                                   :  10pt;"><div><div styl=
+e=3D"font-family                                                           =
+                                         :  Verdana,                       =
+                                                                           =
+   Arial,                                                                  =
+                                   Helvetica,                              =
+                                                                       sans=
+-serif; font-size                                                          =
+                                          :  10pt;"><div><div style=3D"font=
+-family                                                                    =
+                                 :  Verdana,                               =
+                                                                       Aria=
+l,                                                                         =
+                             Helvetica,                                    =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                      :  10pt;"><div><div style=3D"font-fam=
+ily                                                                        =
+                              :  Verdana,                                  =
+                                                                     Arial,=
+                                                                           =
+                            Helvetica,                                     =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                       :  10pt;"><div><div style=3D"font-fa=
+mily                                                                       =
+                                :  Verdana,                                =
+                                                                        Ari=
+al,                                                                        =
+                                Helvetica,                                 =
+                                                                       sans=
+-serif; font-size                                                          =
+                                             :  10pt;"><div><div style=3D"f=
+ont-family                                                                 =
+                                       :  Verdana,                         =
+                                                                           =
+     Arial,                                                                =
+                                         Helvetica,                        =
+                                                                           =
+      sans-serif; font-size                                                =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                   :  Verdana,             =
+                                                                           =
+                  Arial,                                                   =
+                                                       Helvetica,          =
+                                                                           =
+                     sans-serif; font-size                                 =
+                                                                        :  =
+10pt;"><div><div style=3D"font-family                                      =
+                                                                    :  Verd=
+ana,                                                                       =
+                                    Arial,                                 =
+                                                                          H=
+elvetica,                                                                  =
+                                         sans-serif; font-size             =
+                                                                           =
+                  :  10pt;"><div><div style=3D"font-family                 =
+                                                                           =
+               :  Verdana,                                                 =
+                                                           Arial,          =
+                                                                           =
+                       Helvetica,                                          =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                          :  Verdana,                      =
+                                                                           =
+            Arial,                                                         =
+                                                    Helvetica,             =
+                                                                           =
+                     sans-serif; font-size                                 =
+                                                                           =
+:  10pt;"><div><div style=3D"font-family                                   =
+                                                                          :=
+  Verdana,                                                                 =
+                                             Arial,                        =
+                                                                           =
+           Helvetica,                                                      =
+                                                        sans-serif; font-si=
+ze                                                                         =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+                                    :  Verdana,                            =
+                                                                           =
+        Arial,                                                             =
+                                                  Helvetica,               =
+                                                                           =
+                     sans-serif; font-size                                 =
+                                                                           =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                                                                           =
+   :  Verdana,                                                             =
+                                                   Arial,                  =
+                                                                           =
+                   Helvetica,                                              =
+                                                                  sans-seri=
+f; font-size                                                               =
+                                                :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                    :  Verdana,            =
+                                                                           =
+                          Arial,                                           =
+                                                                      Helve=
+tica,                                                                      =
+                                           sans-serif; font-size           =
+                                                                           =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                                                           =
+                             :  Verdana,                                   =
+                                                                           =
+    Arial,                                                                 =
+                                                 Helvetica,                =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+       :  10pt;"><div><div style=3D"font-family                            =
+                                                                           =
+           :  Verdana,                                                     =
+                                                              Arial,       =
+                                                                           =
+                                 Helvetica,                                =
+                                                                           =
+        sans-serif; font-size                                              =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                                                         : =
+ Verdana,                                                                  =
+                                                  Arial,                   =
+                                                                           =
+                      Helvetica,                                           =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                           :  10pt;"><div><=
+div style=3D"font-family                                                   =
+                                                                 :  Verdana=
+,                                                                          =
+                                           Arial,                          =
+                                                                           =
+                Helvetica,                                                 =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                       :  10pt;"><div><div =
+style=3D"font-family                                                       =
+                                                              :  Verdana,  =
+                                                                           =
+                                         Arial,                            =
+                                                                           =
+               Helvetica,                                                  =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                                :  Verdana,=
+                                                                           =
+                                            Arial,                         =
+                                                                           =
+                   Helvetica,                                              =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                              :  10pt;"><di=
+v><div style=3D"font-family                                                =
+                                                                       :  V=
+erdana,                                                                    =
+                                                    Arial,                 =
+                                                                           =
+                            Helvetica,                                     =
+                                                                           =
+        sans-serif; font-size                                              =
+                                                                         : =
+ 10pt;"><div><div style=3D"font-family                                     =
+                                                                           =
+        :  Verdana,                                                        =
+                                                                 Arial,    =
+                                                                           =
+                                          Helvetica,                       =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+              :  10pt;"><div><div style=3D"font-family                     =
+                                                                           =
+                         :  Verdana,                                       =
+                                                                           =
+        Arial,                                                             =
+                                                             Helvetica,    =
+                                                                           =
+                                           sans-serif; font-size           =
+                                                                           =
+                                   :  10pt;"><div><div style=3D"font-family=
+                                                                           =
+                                               :  Verdana,                 =
+                                                                           =
+                               Arial,                                      =
+                                                                           =
+          Helvetica,                                                       =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                             :  10pt;"><div=
+><div style=3D"font-family                                                 =
+                                                                          :=
+  Verdana,                                                                 =
+                                                           Arial,          =
+                                                                           =
+                                       Helvetica,                          =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                                                                           =
+                               :  Verdana,                                 =
+                                                                           =
+                 Arial,                                                    =
+                                                                         He=
+lvetica,                                                                   =
+                                                          sans-serif; font-=
+size                                                                       =
+                                                     :  10pt;"><div><div st=
+yle=3D"font-family                                                         =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                       Arial,              =
+                                                                           =
+                                     Helvetica,                            =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                   :  10pt;"><div><div style=3D"font-family                =
+                                                                           =
+                                   :  Verdana,                             =
+                                                                           =
+                       Arial,                                              =
+                                                                           =
+      Helvetica,                                                           =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                                           =
+       :  Verdana,                                                         =
+                                                                       Aria=
+l,                                                                         =
+                                                       Helvetica,          =
+                                                                           =
+                                           sans-serif; font-size           =
+                                                                           =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                           :  Verdana,     =
+                                                                           =
+                                                 Arial,                    =
+                                                                           =
+                                  Helvetica,                               =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                      :  10pt;"><div><div style=3D"font-family             =
+                                                                           =
+                                         :  Verdana,                       =
+                                                                           =
+                                Arial,                                     =
+                                                                           =
+                  Helvetica,                                               =
+                                                                           =
+        sans-serif; font-size                                              =
+                                                                           =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                                                           =
+                            :  Verdana,                                    =
+                                                                           =
+                    Arial,                                                 =
+                                                                           =
+       Helvetica,                                                          =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                                          :=
+  10pt;"><div><div style=3D"font-family                                    =
+                                                                           =
+                    :  Verdana,                                            =
+                                                                           =
+             Arial,                                                        =
+                                                                           =
+ Helvetica,                                                                =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                      :  10=
+pt;"><div><div style=3D"font-family                                        =
+                                                                           =
+                 :  Verdana,                                               =
+                                                                           =
+           Arial,                                                          =
+                                                                           =
+Helvetica,                                                                 =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                       :  1=
+0pt;"><div><div style=3D"font-family                                       =
+                                                                           =
+                   :  Verdana,                                             =
+                                                                           =
+              Arial,                                                       =
+                                                                           =
+    Helvetica,                                                             =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                                           =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                                                                           =
+                          :  Verdana,                                      =
+                                                                           =
+                      Arial,                                               =
+                                                                           =
+             Helvetica,                                                    =
+                                                                           =
+        sans-serif; font-size                                              =
+                                                                           =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                                                           =
+                                      :  Verdana,                          =
+                                                                           =
+                                   Arial,                                  =
+                                                                           =
+                           Helvetica,                                      =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                             :  10pt;"><div><div style=3D"font-family      =
+                                                                           =
+                                                       :  Verdana,         =
+                                                                           =
+                                                     Arial,                =
+                                                                           =
+                                              Helvetica,                   =
+                                                                           =
+                                           sans-serif; font-size           =
+                                                                           =
+                                                  :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+  :  Verdana,                                                              =
+                                                                           =
+ Arial,                                                                    =
+                                                                      Helve=
+tica,                                                                      =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                           =
+ :  10pt;"><div><div style=3D"font-family                                  =
+                                                                           =
+                             :  Verdana,                                   =
+                                                                           =
+                             Arial,                                        =
+                                                                           =
+                        Helvetica,                                         =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                                :  10pt;"><div><div style=3D"font-family   =
+                                                                           =
+                                                             :  Verdana,   =
+                                                                           =
+                                                              Arial,       =
+                                                                           =
+                                                          Helvetica,       =
+                                                                           =
+                                                          sans-serif; font-=
+size                                                                       =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                                                           =
+                       :  Verdana,                                         =
+                                                                           =
+                         Arial,                                            =
+                                                                           =
+                      Helvetica,                                           =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                                                           =
+                                                                 :  Verdana=
+,                                                                          =
+                                                                    Arial, =
+                                                                           =
+                                                                  Helvetica=
+,                                                                          =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                           =
+     :  10pt;"><div><div style=3D"font-family                              =
+                                                                           =
+                                     :  Verdana,                           =
+                                                                           =
+                                         Arial,                            =
+                                                                           =
+                                        Helvetica,                         =
+                                                                           =
+                                           sans-serif; font-size           =
+                                                                           =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                                           =
+              :  Verdana,                                                  =
+                                                                           =
+                   Arial,                                                  =
+                                                                           =
+                   Helvetica,                                              =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                                                         =
+                                                                       :  V=
+erdana,                                                                    =
+                                                                           =
+  Arial,                                                                   =
+                                                                           =
+   Helvetica,                                                              =
+                                                                           =
+        sans-serif; font-size                                              =
+                                                                           =
+                       :  10pt;"><div><div style=3D"font-family            =
+                                                                           =
+                                                          :  Verdana,      =
+                                                                           =
+                                                                 Arial,    =
+                                                                           =
+                                                                   Helvetic=
+a,                                                                         =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                                           =
+              :  10pt;"><div><div style=3D"font-family                     =
+                                                                           =
+                                                  :  Verdana,              =
+                                                                           =
+                                                          Arial,           =
+                                                                           =
+                                                             Helvetica,    =
+                                                                           =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                           =
+          :  10pt;"><div><div style=3D"font-family                         =
+                                                                           =
+                                               :  Verdana,                 =
+                                                                           =
+                                                        Arial,             =
+                                                                           =
+                                                            Helvetica,     =
+                                                                           =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                           =
+           :  10pt;"><div><div style=3D"font-family                        =
+                                                                           =
+                                                 :  Verdana,               =
+                                                                           =
+                                                           Arial,          =
+                                                                           =
+                                                                Helvetica, =
+                                                                           =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                                           =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                                                                           =
+                                                        :  Verdana,        =
+                                                                           =
+                                                                   Arial,  =
+                                                                           =
+                                                                         He=
+lvetica,                                                                   =
+                                                                           =
+        sans-serif; font-size                                              =
+                                                                           =
+                            :  10pt;"><div><div style=3D"font-family       =
+                                                                           =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                                           =
+     Arial,                                                                =
+                                                                           =
+            Helvetica,                                                     =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                                           =
+          :  Verdana,                                                      =
+                                                                           =
+                       Arial,                                              =
+                                                                           =
+                               Helvetica,                                  =
+                                                                           =
+                                           sans-serif; font-size           =
+                                                                           =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                                           =
+                                :  Verdana,                                =
+                                                                           =
+                                              Arial,                       =
+                                                                           =
+                                                       Helvetica,          =
+                                                                           =
+                                                                    sans-se=
+rif; font-size                                                             =
+                                                                           =
+                :  10pt;"><div><div style=3D"font-family                   =
+                                                                           =
+                                                           :  Verdana,     =
+                                                                           =
+                                                                          A=
+rial,                                                                      =
+                                                                           =
+         Helvetica,                                                        =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                                               :  10pt;"><div><div style=3D=
+"font-family                                                               =
+                                                                           =
+                :  Verdana,                                                =
+                                                                           =
+                                Arial,                                     =
+                                                                           =
+                                           Helvetica,                      =
+                                                                           =
+                                                          sans-serif; font-=
+size                                                                       =
+                                                                           =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                                                           =
+                                                     :  Verdana,           =
+                                                                           =
+                                                                      Arial=
+,                                                                          =
+                                                                           =
+       Helvetica,                                                          =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                     :  Verdana,                                           =
+                                                                           =
+                                       Arial,                              =
+                                                                           =
+                                                    Helvetica,             =
+                                                                           =
+                                                                     sans-s=
+erif; font-size                                                            =
+                                                                           =
+                     :  10pt;"><div><div style=3D"font-family              =
+                                                                           =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                                           =
+            Arial,                                                         =
+                                                                           =
+                          Helvetica,                                       =
+                                                                           =
+                                            sans-serif; font-size          =
+                                                                           =
+                                                                        :  =
+10pt;"><div><div style=3D"font-family                                      =
+                                                                           =
+                                             :  Verdana,                   =
+                                                                           =
+                                                                 Arial,    =
+                                                                           =
+                                                                           =
+     Helvetica,                                                            =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                                                     :  10pt;"><div><div st=
+yle=3D"font-family                                                         =
+                                                                           =
+                           :  Verdana,                                     =
+                                                                           =
+                                                Arial,                     =
+                                                                           =
+                                                                Helvetica, =
+                                                                           =
+                                                                           =
+         sans-serif; font-size                                             =
+                                                                           =
+                                       :  10pt;"><div><div style=3D"font-fa=
+mily                                                                       =
+                                                                           =
+              :  Verdana,                                                  =
+                                                                           =
+                                    Arial,                                 =
+                                                                           =
+                                                     Helvetica,            =
+                                                                           =
+                                                                          s=
+ans-serif; font-size                                                       =
+                                                                           =
+                              :  10pt;"><div><div style=3D"font-family     =
+                                                                           =
+                                                                           =
+      :  Verdana,                                                          =
+                                                                           =
+                             Arial,                                        =
+                                                                           =
+                                               Helvetica,                  =
+                                                                           =
+                                                                     sans-s=
+erif; font-size                                                            =
+                                                                           =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                                                           =
+                                                                           =
+   :  Verdana,                                                             =
+                                                                           =
+                           Arial,                                          =
+                                                                           =
+                                              Helvetica,                   =
+                                                                           =
+                                                                     sans-s=
+erif; font-size                                                            =
+                                                                           =
+                           :  10pt;"><div><div style=3D"font-family        =
+                                                                           =
+                                                                           =
+     :  Verdana,                                                           =
+                                                                           =
+                              Arial,                                       =
+                                                                           =
+                                                  Helvetica,               =
+                                                                           =
+                                                                          s=
+ans-serif; font-size                                                       =
+                                                                           =
+                                 :  10pt;"><div><div style=3D"font-family  =
+                                                                           =
+                                                                           =
+            :  Verdana,                                                    =
+                                                                           =
+                                      Arial,                               =
+                                                                           =
+                                                           Helvetica,      =
+                                                                           =
+                                                                           =
+         sans-serif; font-size                                             =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                                           =
+                        :  Verdana,                                        =
+                                                                           =
+                                                   Arial,                  =
+                                                                           =
+                                                                         He=
+lvetica,                                                                   =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                                                            :  10pt;"><div>=
+<div style=3D"font-family                                                  =
+                                                                           =
+                                         :  Verdana,                       =
+                                                                           =
+                                                                     Arial,=
+                                                                           =
+                                                                           =
+                 Helvetica,                                                =
+                                                                           =
+                                            sans-serif; font-size          =
+                                                                           =
+                                                                           =
+      :  10pt;"><div style=3D"font-family                                  =
+                                                                           =
+                                                          :  Verdana,      =
+                                                                           =
+                                                                           =
+            Arial,                                                         =
+                                                                           =
+                                    Helvetica,                             =
+                                                                           =
+                                                                sans-serif;=
+ font-size                                                                 =
+                                                                           =
+                           :  10pt;"><div><div style=3D"font-family        =
+                                                                           =
+                                                                           =
+          :  Verdana,                                                      =
+                                                                           =
+                                        Arial,                             =
+                                                                           =
+                                                                 Helvetica,=
+                                                                           =
+                                                                           =
+                   sans-serif; font-size                                   =
+                                                                           =
+                                                          :  10pt;"><div><d=
+iv style=3D"font-family                                                    =
+                                                                           =
+                                          :  Verdana,                      =
+                                                                           =
+                                                                         Ar=
+ial,                                                                       =
+                                                                           =
+                        Helvetica,                                         =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                                           =
+                   :  10pt;"><div><div style=3D"font-family                =
+                                                                           =
+                                                                           =
+    :  Verdana,                                                            =
+                                                                           =
+                                    Arial,                                 =
+                                                                           =
+                                                               Helvetica,  =
+                                                                           =
+                                                                           =
+                   sans-serif; font-size                                   =
+                                                                           =
+                                                            :  10pt;"><div>=
+<div style=3D"font-family                                                  =
+                                                                           =
+                                              :  Verdana,                  =
+                                                                           =
+                                                                           =
+    Arial,                                                                 =
+                                                                           =
+                                Helvetica,                                 =
+                                                                           =
+                                                                sans-serif;=
+ font-size                                                                 =
+                                                                           =
+                               :  10pt;"><div><div style=3D"font-family    =
+                                                                           =
+                                                                           =
+                  :  Verdana,                                              =
+                                                                           =
+                                                    Arial,                 =
+                                                                           =
+                                                                           =
+      Helvetica,                                                           =
+                                                                           =
+                                       sans-serif; font-size               =
+                                                                           =
+                                                                           =
+       :  10pt;"><div><div style=3D"font-family                            =
+                                                                           =
+                                                                      :  Ve=
+rdana,                                                                     =
+                                                                           =
+                              Arial,                                       =
+                                                                           =
+                                                            Helvetica,     =
+                                                                           =
+                                                                           =
+                   sans-serif; font-size                                   =
+                                                                           =
+                                                               :  10pt;"><d=
+iv><div style=3D"font-family                                               =
+                                                                           =
+                                                    :  Verdana,            =
+                                                                           =
+                                                                           =
+             Arial,                                                        =
+                                                                           =
+                                            Helvetica,                     =
+                                                                           =
+                                                                           =
+    sans-serif; font-size                                                  =
+                                                                           =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                                        :  Verdana,                        =
+                                                                           =
+                                                                           =
+  Arial,                                                                   =
+                                                                           =
+                                  Helvetica,                               =
+                                                                           =
+                                                                      sans-=
+serif; font-size                                                           =
+                                                                           =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                                           =
+                                :  Verdana,                                =
+                                                                           =
+                                                                      Arial=
+,                                                                          =
+                                                                           =
+                            Helvetica,                                     =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                                                         =
+                                                                           =
+                             :  Verdana,                                   =
+                                                                           =
+                                                                    Arial, =
+                                                                           =
+                                                                           =
+                           Helvetica,                                      =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                      :  10pt;"><div style=3D"font-family  =
+                                                                           =
+                                                                           =
+                          :  Verdana,                                      =
+                                                                           =
+                                                                  Arial,   =
+                                                                           =
+                                                                           =
+                          Helvetica,                                       =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                                       :  10pt;"><div><div style=3D"font-fa=
+mily                                                                       =
+                                                                           =
+                                 :  Verdana,                               =
+                                                                           =
+                                                                          A=
+rial,                                                                      =
+                                                                           =
+                                   Helvetica,                              =
+                                                                           =
+                                                                           =
+sans-serif; font-size                                                      =
+                                                                           =
+                                                  :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                                             :  Verdana,                   =
+                                                                           =
+                                                                           =
+            Arial,                                                         =
+                                                                           =
+                                                 Helvetica,                =
+                                                                           =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                                                  :  10pt;"=
+><div><div style=3D"font-family                                            =
+                                                                           =
+                                                              :  Verdana,  =
+                                                                           =
+                                                                           =
+                              Arial,                                       =
+                                                                           =
+                                                                    Helveti=
+ca,                                                                        =
+                                                                           =
+                                   sans-serif; font-size                   =
+                                                                           =
+                                                                           =
+            :  10pt;"><div><div style=3D"font-family                       =
+                                                                           =
+                                                                           =
+         :  Verdana,                                                       =
+                                                                           =
+                                                     Arial,                =
+                                                                           =
+                                                                           =
+                 Helvetica,                                                =
+                                                                           =
+                                                            sans-serif; fon=
+t-size                                                                     =
+                                                                           =
+                                      :  10pt;"><div><div style=3D"font-fam=
+ily                                                                        =
+                                                                           =
+                                    :  Verdana,                            =
+                                                                           =
+                                                                           =
+      Arial,                                                               =
+                                                                           =
+                                              Helvetica,                   =
+                                                                           =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                                                     :  10p=
+t;"><div><div style=3D"font-family                                         =
+                                                                           =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                                           =
+                                       Arial,                              =
+                                                                           =
+                                                                           =
+     Helvetica,                                                            =
+                                                                           =
+                                                  sans-serif; font-size    =
+                                                                           =
+                                                                           =
+                              :  10pt;"><div style=3D"font-family          =
+                                                                           =
+                                                                           =
+                         :  Verdana,                                       =
+                                                                           =
+                                                                        Ari=
+al,                                                                        =
+                                                                           =
+                                       Helvetica,                          =
+                                                                           =
+                                                                           =
+          sans-serif; font-size                                            =
+                                                                           =
+                                                                  :  10pt;"=
+><div><div style=3D"font-family                                            =
+                                                                           =
+                                                                   :  Verda=
+na,                                                                        =
+                                                                           =
+                                        Arial,                             =
+                                                                           =
+                                                                           =
+        Helvetica,                                                         =
+                                                                           =
+                                                       sans-serif; font-siz=
+e                                                                          =
+                                                                           =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                                                         =
+                                                                           =
+                                       :  Verdana,                         =
+                                                                           =
+                                                                           =
+             Arial,                                                        =
+                                                                           =
+                                                         Helvetica,        =
+                                                                           =
+                                                                           =
+                              sans-serif; font-size                        =
+                                                                           =
+                                                                           =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                                                           =
+                                                                           =
+                :  Verdana,                                                =
+                                                                           =
+                                                                  Arial,   =
+                                                                           =
+                                                                           =
+                                    Helvetica,                             =
+                                                                           =
+                                                                           =
+          sans-serif; font-size                                            =
+                                                                           =
+                                                                     :  10p=
+t;"><div><div style=3D"font-family                                         =
+                                                                           =
+                                                                         : =
+ Verdana,                                                                  =
+                                                                           =
+                                                 Arial,                    =
+                                                                           =
+                                                                           =
+                    Helvetica,                                             =
+                                                                           =
+                                                                      sans-=
+serif; font-size                                                           =
+                                                                           =
+                                                       :  10pt;"><div><div =
+style=3D"font-family                                                       =
+                                                                           =
+                                                            :  Verdana,    =
+                                                                           =
+                                                                           =
+                                     Arial,                                =
+                                                                           =
+                                                                           =
+         Helvetica,                                                        =
+                                                                           =
+                                                            sans-serif; fon=
+t-size                                                                     =
+                                                                           =
+                                              :  10pt;"><div><div style=3D"=
+font-family                                                                =
+                                                                           =
+                                                    :  Verdana,            =
+                                                                           =
+                                                                           =
+                              Arial,                                       =
+                                                                           =
+                                                                           =
+   Helvetica,                                                              =
+                                                                           =
+                                                       sans-serif; font-siz=
+e                                                                          =
+                                                                           =
+                                          :  10pt;"><div><div style=3D"font=
+-family                                                                    =
+                                                                           =
+                                                 :  Verdana,               =
+                                                                           =
+                                                                           =
+                            Arial,                                         =
+                                                                           =
+                                                                           =
+  Helvetica,                                                               =
+                                                                           =
+                                                       sans-serif; font-siz=
+e                                                                          =
+                                                                           =
+                                           :  10pt;"><div><div style=3D"fon=
+t-family                                                                   =
+                                                                           =
+                                                   :  Verdana,             =
+                                                                           =
+                                                                           =
+                               Arial,                                      =
+                                                                           =
+                                                                           =
+      Helvetica,                                                           =
+                                                                           =
+                                                            sans-serif; fon=
+t-size                                                                     =
+                                                                           =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                                                           :  Verdana,     =
+                                                                           =
+                                                                           =
+                                        Arial,                             =
+                                                                           =
+                                                                           =
+                Helvetica,                                                 =
+                                                                           =
+                                                                       sans=
+-serif; font-size                                                          =
+                                                                           =
+                                                             :  10pt;"><div=
+><div style=3D"font-family                                                 =
+                                                                           =
+                                                                      :  Ve=
+rdana,                                                                     =
+                                                                           =
+                                                   Arial,                  =
+                                                                           =
+                                                                           =
+                           Helvetica,                                      =
+                                                                           =
+                                                                           =
+       sans-serif; font-size                                               =
+                                                                           =
+                                                                        :  =
+10.0pt;"><div><div style=3D"font-family                                    =
+                                                                           =
+                                                                           =
+        :  Verdana,                                                        =
+                                                                           =
+                                                                Arial,     =
+                                                                           =
+                                                                           =
+                                        Helvetica,                         =
+                                                                           =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                                                           =
+          :  10.0pt;"><div><div style=3D"font-family                       =
+                                                                           =
+                                                                           =
+                     :  Verdana,                                           =
+                                                                           =
+                                                                           =
+  Arial,                                                                   =
+                                                                           =
+                                                     Helvetica,            =
+                                                                           =
+                                                                           =
+                                 sans-serif; font-size                     =
+                                                                           =
+                                                                           =
+                       :  10.0pt;"><div><div style=3D"font-family          =
+                                                                           =
+                                                                           =
+                                  :  Verdana,                              =
+                                                                           =
+                                                                           =
+               Arial,                                                      =
+                                                                           =
+                                                                  Helvetica=
+,                                                                          =
+                                                                           =
+                                              sans-serif; font-size        =
+                                                                           =
+                                                                           =
+                                    :  10.0pt;"><div><div style=3D"font-fam=
+ily                                                                        =
+                                                                           =
+                                               :  Verdana,                 =
+                                                                           =
+                                                                           =
+                            Arial,                                         =
+                                                                           =
+                                                                           =
+    Helvetica,                                                             =
+                                                                           =
+                                                           sans-serif; font=
+-size                                                                      =
+                                                                           =
+                                                 :  10.0pt;"><div><div styl=
+e=3D"font-family                                                           =
+                                                                           =
+                                                            :  Verdana,    =
+                                                                           =
+                                                                           =
+                                         Arial,                            =
+                                                                           =
+                                                                           =
+                 Helvetica,                                                =
+                                                                           =
+                                                                        san=
+s-serif; font-size                                                         =
+                                                                           =
+                                                              :  10.0pt;"><=
+div><div style=3D"font-family                                              =
+                                                                           =
+                                                                         : =
+ Verdana,                                                                  =
+                                                                           =
+                                                      Arial,               =
+                                                                           =
+                                                                           =
+                              Helvetica,                                   =
+                                                                           =
+                                                                           =
+          sans-serif; font-size                                            =
+                                                                           =
+                                                                           =
+:  10.0pt;"><div><div style=3D"font-family                                 =
+                                                                           =
+                                                                           =
+           :  Verdana,                                                     =
+                                                                           =
+                                                                   Arial,  =
+                                                                           =
+                                                                           =
+                                           Helvetica,                      =
+                                                                           =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                                                                           =
+             :  10.0pt;"><div><div style=3D"font-family                    =
+                                                                           =
+                                                                           =
+                        :  Verdana,                                        =
+                                                                           =
+                                                                           =
+     Arial,                                                                =
+                                                                           =
+                                                        Helvetica,         =
+                                                                           =
+                                                                           =
+                                    sans-serif; font-size                  =
+                                                                           =
+                                                                           =
+                          :  10.0pt;"><div><div style=3D"font-family       =
+                                                                           =
+                                                                           =
+                                     :  Verdana,                           =
+                                                                           =
+                                                                           =
+                  Arial,                                                   =
+                                                                           =
+                                                                     Helvet=
+ica,                                                                       =
+                                                                           =
+                                                 sans-serif; font-size     =
+                                                                           =
+                                                                           =
+                                       :  10.0pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                                           =
+                                                  :  Verdana,              =
+                                                                           =
+                                                                           =
+                               Arial,                                      =
+                                                                           =
+                                                                           =
+       Helvetica,                                                          =
+                                                                           =
+                                                              sans-serif; f=
+ont-size                                                                   =
+                                                                           =
+                                                    :  10.0pt;"><div><div s=
+tyle=3D"font-family                                                        =
+                                                                           =
+                                                               :  Verdana, =
+                                                                           =
+                                                                           =
+                                            Arial,                         =
+                                                                           =
+                                                                           =
+                    Helvetica,                                             =
+                                                                           =
+                                                                           =
+sans-serif; font-size                                                      =
+                                                                           =
+                                                                 :  10.0pt;=
+"><div style=3D"font-family                                                =
+                                                                           =
+                                                                       :  V=
+erdana,                                                                    =
+                                                                           =
+                                                    Arial,                 =
+                                                                           =
+                                                                           =
+                            Helvetica,                                     =
+                                                                           =
+                                                                           =
+        sans-serif; font-size                                              =
+                                                                           =
+                                                                         : =
+ 10.0pt;"><div><div><div style=3D"font-family                              =
+                                                                           =
+                                                                           =
+              :  Verdana,                                                  =
+                                                                           =
+                                                                      Arial=
+,                                                                          =
+                                                                           =
+                                              Helvetica,                   =
+                                                                           =
+                                                                           =
+                          sans-serif; font-size                            =
+                                                                           =
+                                                                           =
+                :  10.0pt;"><div><div style=3D"font-family                 =
+                                                                           =
+                                                                           =
+                           :  Verdana,                                     =
+                                                                           =
+                                                                           =
+        Arial,                                                             =
+                                                                           =
+                                                           Helvetica,      =
+                                                                           =
+                                                                           =
+                                       sans-serif; font-size               =
+                                                                           =
+                                                                           =
+                             :  10.0pt;"><div><div style=3D"font-family    =
+                                                                           =
+                                                                           =
+                                        :  Verdana,                        =
+                                                                           =
+                                                                           =
+                     Arial,                                                =
+                                                                           =
+                                                                        Hel=
+vetica,                                                                    =
+                                                                           =
+                                                    sans-serif; font-size  =
+                                                                           =
+                                                                           =
+                                          :  10.0pt;"><div><br></div><div c=
+lass=3D"x_-1344600408zmail_signature_below"><div id=3D"x_-1344600408"><div>=
+<span><span><span><span><span><span><span><span><span><span><span><span><sp=
+an><span>Sincerely,</span></span></span></span></span></span></span></span>=
+</span></span></span></span></span></span><br></div><div><b><span><span><sp=
+an><span><span><span><span><span><span><span><span><span><span><span>test W=
+right</span></span></span></span></span></span></span></span></span></span>=
+</span></span></span></span></b><br></div><div><span><span><span><span><spa=
+n><span><span><span><span><span><span><span><span><span>Sales Associate</sp=
+an></span></span></span></span></span></span></span></span></span></span></=
+span></span></span><br></div><div><span><span><span><span><span><span><span=
+><span><span><span><span><span><span><span>example.com</span></span></spa=
+n></span></span></span></span></span></span></span></span></span></span></s=
+pan><br></div><div><img height=3D"87" width=3D"87" src=3D"cid:0.28869202910=
+.6138388557080725296.1839baef51b__inline__img__src"><br></div></div></div><=
+div><br></div></div><div><br></div></div></div></div><div><br></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div></div></div></div></di=
+v></div></div></div></div></div></div></div></div></div></div></div></div><=
+/div></div></div></div></div></div></div></div></div><div><div style=3D"fon=
+t-family                                       :  Verdana,                 =
+                       Arial,                                        Helvet=
+ica,                                        sans-serif; font-size          =
+                             :  10pt;"><div><div style=3D"font-family      =
+                                  :  Verdana,                              =
+           Arial,                                         Helvetica,       =
+                                  sans-serif; font-size                    =
+                    :  10pt;"><div><div style=3D"font-family               =
+                          :  Verdana,                                      =
+    Arial,                                          Helvetica,             =
+                             sans-serif; font-size                         =
+                :  10pt;"><div><div style=3D"font-family                   =
+                       :  Verdana,                                         =
+  Arial,                                           Helvetica,              =
+                             sans-serif; font-size                         =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                         :  Verdana,                                       =
+     Arial,                                            Helvetica,          =
+                                  sans-serif; font-size                    =
+                       :  10pt;"><div><div style=3D"font-family            =
+                                :  Verdana,                                =
+             Arial,                                             Helvetica, =
+                                            sans-serif; font-size          =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                            :  Verdana,                    =
+                          Arial,                                           =
+   Helvetica,                                              sans-serif; font=
+-size                                             :  10pt;"><div><div style=
+=3D"font-family                                              :  Verdana,   =
+                                            Arial,                         =
+                      Helvetica,                                           =
+    sans-serif; font-size                                              :  1=
+0pt;"><div><div style=3D"font-family                                       =
+        :  Verdana,                                                Arial,  =
+                                              Helvetica,                   =
+                             sans-serif; font-size                         =
+                      :  10pt;"><div><div style=3D"font-family             =
+                                   :  Verdana,                             =
+                    Arial,                                                 =
+Helvetica,                                                 sans-serif; font=
+-size                                                :  10pt;"><div><div st=
+yle=3D"font-family                                                 :  Verda=
+na,                                                  Arial,                =
+                                  Helvetica,                               =
+                   sans-serif; font-size                                   =
+              :  10pt;"><div><div style=3D"font-family                     =
+                             :  Verdana,                                   =
+                Arial,                                                   He=
+lvetica,                                                   sans-serif; font=
+-size                                                  :  10pt;"><div><div =
+style=3D"font-family                                                   :  V=
+erdana,                                                    Arial,          =
+                                          Helvetica,                       =
+                             sans-serif; font-size                         =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                           :  Verdana,                     =
+                                Arial,                                     =
+                Helvetica,                                                 =
+    sans-serif; font-size                                                  =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                    :  Verdana,                                            =
+          Arial,                                                      Helve=
+tica,                                                      sans-serif; font=
+-size                                                     :  10pt;"><div><d=
+iv style=3D"font-family                                                    =
+  :  Verdana,                                                       Arial, =
+                                                      Helvetica,           =
+                                            sans-serif; font-size          =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                       :  Verdana,=
+                                                        Arial,             =
+                                           Helvetica,                      =
+                                  sans-serif; font-size                    =
+                                   :  10pt;"><div><div style=3D"font-family=
+                                                        :  Verdana,        =
+                                                 Arial,                    =
+                                     Helvetica,                            =
+                             sans-serif; font-size                         =
+                               :  10pt;"><div><div style=3D"font-family    =
+                                                     :  Verdana,           =
+                                               Arial,                      =
+                                    Helvetica,                             =
+                             sans-serif; font-size                         =
+                                :  10pt;"><div><div style=3D"font-family   =
+                                                       :  Verdana,         =
+                                                  Arial,                   =
+                                        Helvetica,                         =
+                                  sans-serif; font-size                    =
+                                      :  10pt;"><div><div style=3D"font-fam=
+ily                                                           :  Verdana,  =
+                                                          Arial,           =
+                                                 Helvetica,                =
+                                            sans-serif; font-size          =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+:  Verdana,                                                             Ari=
+al,                                                             Helvetica, =
+                                                            sans-serif; fon=
+t-size                                                            :  10pt;"=
+><div><div style=3D"font-family                                            =
+                 :  Verdana,                                               =
+               Arial,                                                      =
+        Helvetica,                                                         =
+     sans-serif; font-size                                                 =
+            :  10pt;"><div><div style=3D"font-family                       =
+                                       :  Verdana,                         =
+                                      Arial,                               =
+                                Helvetica,                                 =
+                              sans-serif; font-size                        =
+                                      :  10pt;"><div style=3D"font-family  =
+                                                             :  Verdana,   =
+                                                             Arial,        =
+                                                        Helvetica,         =
+                                                       sans-serif; font-siz=
+e                                                               :  10pt;"><=
+div><div style=3D"font-family                                              =
+                  :  Verdana,                                              =
+                   Arial,                                                  =
+               Helvetica,                                                  =
+               sans-serif; font-size                                       =
+                         :  10pt;"><div><div style=3D"font-family          =
+                                                       :  Verdana,         =
+                                                         Arial,            =
+                                                      Helvetica,           =
+                                                       sans-serif; font-siz=
+e                                                                 :  10pt;"=
+><div><div style=3D"font-family                                            =
+                      :  Verdana,                                          =
+                         Arial,                                            =
+                       Helvetica,                                          =
+                         sans-serif; font-size                             =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                                                   :  Ver=
+dana,                                                                    Ar=
+ial,                                                                    Hel=
+vetica,                                                                    =
+sans-serif; font-size                                                      =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                              :  Verdana,                  =
+                                                   Arial,                  =
+                                                   Helvetica,              =
+                                                       sans-serif; font-siz=
+e                                                                    :  10p=
+t;"><div><div style=3D"font-family                                         =
+                            :  Verdana,                                    =
+                                  Arial,                                   =
+                                   Helvetica,                              =
+                                        sans-serif; font-size              =
+                                                       :  10pt;"><div><div =
+style=3D"font-family                                                       =
+               :  Verdana,                                                 =
+                      Arial,                                               =
+                        Helvetica,                                         =
+                              sans-serif; font-size                        =
+                                              :  10pt;"><div><div style=3D"=
+font-family                                                                =
+       :  Verdana,                                                         =
+               Arial,                                                      =
+                  Helvetica,                                               =
+                         sans-serif; font-size                             =
+                                          :  10pt;"><div><div style=3D"font=
+-family                                                                    =
+    :  Verdana,                                                            =
+             Arial,                                                        =
+                 Helvetica,                                                =
+                         sans-serif; font-size                             =
+                                           :  10pt;"><div><div style=3D"fon=
+t-family                                                                   =
+      :  Verdana,                                                          =
+                Arial,                                                     =
+                     Helvetica,                                            =
+                              sans-serif; font-size                        =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+              :  Verdana,                                                  =
+                         Arial,                                            =
+                               Helvetica,                                  =
+                                         sans-serif; font-size             =
+                                                             :  10pt;"><div=
+ style=3D"font-family                                                      =
+                     :  Verdana,                                           =
+                                 Arial,                                    =
+                                        Helvetica,                         =
+                                                   sans-serif; font-size   =
+                                                                        :  =
+10pt;"><div><div style=3D"font-family                                      =
+                                      :  Verdana,                          =
+                                                   Arial,                  =
+                                                           Helvetica,      =
+                                                                       sans=
+-serif; font-size                                                          =
+                  :  10pt;"><div><div style=3D"font-family                 =
+                                                            :  Verdana,    =
+                                                                          A=
+rial,                                                                      =
+        Helvetica,                                                         =
+                     sans-serif; font-size                                 =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+            :  Verdana,                                                    =
+                           Arial,                                          =
+                                     Helvetica,                            =
+                                                   sans-serif; font-size   =
+                                                                           =
+:  10pt;"><div><div style=3D"font-family                                   =
+                                            :  Verdana,                    =
+                                                            Arial,         =
+                                                                       Helv=
+etica,                                                                     =
+           sans-serif; font-size                                           =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+      :  Verdana,                                                          =
+                       Arial,                                              =
+                                   Helvetica,                              =
+                                                   sans-serif; font-size   =
+                                                                           =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                                                :  Verdana,                =
+                                                                  Arial,   =
+                                                                           =
+    Helvetica,                                                             =
+                     sans-serif; font-size                                 =
+                                                :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                      :  Verdana,                                          =
+                                         Arial,                            =
+                                                       Helvetica,          =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                                                          :=
+  Verdana,                                                                 =
+                   Arial,                                                  =
+                                  Helvetica,                               =
+                                                     sans-serif; font-size =
+                                                                           =
+       :  10pt;"><div><div style=3D"font-family                            =
+                                                        :  Verdana,        =
+                                                                           =
+  Arial,                                                                   =
+                  Helvetica,                                               =
+                                      sans-serif; font-size                =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                           :  Verdana,                     =
+                                                                 Arial,    =
+                                                                           =
+       Helvetica,                                                          =
+                            sans-serif; font-size                          =
+                                                           :  10pt;"><div><=
+div style=3D"font-family                                                   =
+                                   :  Verdana,                             =
+                                                          Arial,           =
+                                                                           =
+ Helvetica,                                                                =
+                       sans-serif; font-size                               =
+                                                       :  10pt;"><div><div =
+style=3D"font-family                                                       =
+                                :  Verdana,                                =
+                                                        Arial,             =
+                                                                           =
+Helvetica,                                                                 =
+                       sans-serif; font-size                               =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                  :  Verdana,                              =
+                                                           Arial,          =
+                                                                           =
+    Helvetica,                                                             =
+                            sans-serif; font-size                          =
+                                                              :  10pt;"><di=
+v><div style=3D"font-family                                                =
+                                         :  Verdana,                       =
+                                                                   Arial,  =
+                                                                           =
+             Helvetica,                                                    =
+                                      sans-serif; font-size                =
+                                                                         : =
+ 10pt;"><div><div style=3D"font-family                                     =
+                                                     :  Verdana,           =
+                                                                           =
+     Arial,                                                                =
+                           Helvetica,                                      =
+                                                     sans-serif; font-size =
+                                                                           =
+              :  10pt;"><div><div style=3D"font-family                     =
+                                                                      :  Ve=
+rdana,                                                                     =
+                       Arial,                                              =
+                                              Helvetica,                   =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                   :  10pt;"><div><div style=3D"font-family=
+                                                                           =
+                 :  Verdana,                                               =
+                                              Arial,                       =
+                                                                      Helve=
+tica,                                                                      =
+                       sans-serif; font-size                               =
+                                                             :  10pt;"><div=
+><div style=3D"font-family                                                 =
+                                            :  Verdana,                    =
+                                                                          A=
+rial,                                                                      =
+                        Helvetica,                                         =
+                                                     sans-serif; font-size =
+                                                                           =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                                                                           =
+ :  Verdana,                                                               =
+                                Arial,                                     =
+                                                          Helvetica,       =
+                                                                           =
+             sans-serif; font-size                                         =
+                                                     :  10pt;"><div><div st=
+yle=3D"font-family                                                         =
+                                      :  Verdana,                          =
+                                                                      Arial=
+,                                                                          =
+                      Helvetica,                                           =
+                                                     sans-serif; font-size =
+                                                                           =
+                   :  10pt;"><div><div style=3D"font-family                =
+                                                                           =
+     :  Verdana,                                                           =
+                                      Arial,                               =
+                                                                  Helvetica=
+,                                                                          =
+                       sans-serif; font-size                               =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                    :  Verdana,            =
+                                                                           =
+           Arial,                                                          =
+                                        Helvetica,                         =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                             :  Verdana,                                   =
+                                                                Arial,     =
+                                                                           =
+                   Helvetica,                                              =
+                                                     sans-serif; font-size =
+                                                                           =
+                      :  10pt;"><div><div style=3D"font-family             =
+                                                                           =
+           :  Verdana,                                                     =
+                                               Arial,                      =
+                                                                           =
+   Helvetica,                                                              =
+                                      sans-serif; font-size                =
+                                                                           =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                                                         : =
+ Verdana,                                                                  =
+                                   Arial,                                  =
+                                                                   Helvetic=
+a,                                                                         =
+                            sans-serif; font-size                          =
+                                                                          :=
+  10pt;"><div><div style=3D"font-family                                    =
+                                                                 :  Verdana=
+,                                                                          =
+                            Arial,                                         =
+                                                             Helvetica,    =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                      :  10=
+pt;"><div><div style=3D"font-family                                        =
+                                                              :  Verdana,  =
+                                                                           =
+                          Arial,                                           =
+                                                            Helvetica,     =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                       :  1=
+0pt;"><div><div style=3D"font-family                                       =
+                                                                :  Verdana,=
+                                                                           =
+                             Arial,                                        =
+                                                                Helvetica, =
+                                                                           =
+                            sans-serif; font-size                          =
+                                                                           =
+  :  10pt;"><div><div style=3D"font-family                                 =
+                                                                       :  V=
+erdana,                                                                    =
+                                     Arial,                                =
+                                                                         He=
+lvetica,                                                                   =
+                                      sans-serif; font-size                =
+                                                                           =
+             :  10pt;"><div><div style=3D"font-family                      =
+                                                                           =
+        :  Verdana,                                                        =
+                                                  Arial,                   =
+                                                                           =
+            Helvetica,                                                     =
+                                                     sans-serif; font-size =
+                                                                           =
+                             :  10pt;"><div><div style=3D"font-family      =
+                                                                           =
+                         :  Verdana,                                       =
+                                                                    Arial, =
+                                                                           =
+                               Helvetica,                                  =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                  :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                               :  Verdana,                 =
+                                                                           =
+                Arial,                                                     =
+                                                       Helvetica,          =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+ :  10pt;"><div><div style=3D"font-family                                  =
+                                                                          :=
+  Verdana,                                                                 =
+                                            Arial,                         =
+                                                                           =
+         Helvetica,                                                        =
+                                                     sans-serif; font-size =
+                                                                           =
+                                :  10pt;"><div><div style=3D"font-family   =
+                                                                           =
+                               :  Verdana,                                 =
+                                                                           =
+  Arial,                                                                   =
+                                           Helvetica,                      =
+                                                                           =
+             sans-serif; font-size                                         =
+                                                                    :  10pt=
+;"><div><div style=3D"font-family                                          =
+                                                                    :  Verd=
+ana,                                                                       =
+                                        Arial,                             =
+                                                                           =
+       Helvetica,                                                          =
+                                                     sans-serif; font-size =
+                                                                           =
+                                  :  10pt;"><div><div style=3D"font-family =
+                                                                           =
+                                   :  Verdana,                             =
+                                                                           =
+        Arial,                                                             =
+                                                   Helvetica,              =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+     :  10pt;"><div><div style=3D"font-family                              =
+                                                                           =
+       :  Verdana,                                                         =
+                                                        Arial,             =
+                                                                           =
+                         Helvetica,                                        =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                           :  Verdana,     =
+                                                                           =
+                                  Arial,                                   =
+                                                                           =
+    Helvetica,                                                             =
+                                                     sans-serif; font-size =
+                                                                           =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                                                         =
+                                         :  Verdana,                       =
+                                                                           =
+                 Arial,                                                    =
+                                                               Helvetica,  =
+                                                                           =
+                                      sans-serif; font-size                =
+                                                                           =
+                       :  10pt;"><div><div style=3D"font-family            =
+                                                                           =
+                            :  Verdana,                                    =
+                                                                           =
+     Arial,                                                                =
+                                                    Helvetica,             =
+                                                                           =
+                            sans-serif; font-size                          =
+                                                                           =
+              :  10pt;"><div><div style=3D"font-family                     =
+                                                                           =
+                    :  Verdana,                                            =
+                                                                         Ar=
+ial,                                                                       =
+                                              Helvetica,                   =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+          :  10pt;"><div><div style=3D"font-family                         =
+                                                                           =
+                 :  Verdana,                                               =
+                                                                       Aria=
+l,                                                                         =
+                                             Helvetica,                    =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+           :  10pt;"><div><div style=3D"font-family                        =
+                                                                           =
+                   :  Verdana,                                             =
+                                                                          A=
+rial,                                                                      =
+                                                 Helvetica,                =
+                                                                           =
+                            sans-serif; font-size                          =
+                                                                           =
+                 :  10pt;"><div><div style=3D"font-family                  =
+                                                                           =
+                          :  Verdana,                                      =
+                                                                           =
+       Arial,                                                              =
+                                                          Helvetica,       =
+                                                                           =
+                                      sans-serif; font-size                =
+                                                                           =
+                            :  10pt;"><div><div style=3D"font-family       =
+                                                                           =
+                                      :  Verdana,                          =
+                                                                           =
+                    Arial,                                                 =
+                                                                        Hel=
+vetica,                                                                    =
+                                                     sans-serif; font-size =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                       :  Verdana,         =
+                                                                           =
+                                      Arial,                               =
+                                                                           =
+                Helvetica,                                                 =
+                                                                         sa=
+ns-serif; font-size                                                        =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                                           =
+  :  Verdana,                                                              =
+                                                             Arial,        =
+                                                                           =
+                                        Helvetica,                         =
+                                                                           =
+                       sans-serif; font-size                               =
+                                                                           =
+                :  10pt;"><div><div style=3D"font-family                   =
+                                                                           =
+                             :  Verdana,                                   =
+                                                                           =
+              Arial,                                                       =
+                                                                     Helvet=
+ica,                                                                       =
+                                                     sans-serif; font-size =
+                                                                           =
+                                               :  10pt;"><div><div style=3D=
+"font-family                                                               =
+                                                             :  Verdana,   =
+                                                                           =
+                                               Arial,                      =
+                                                                           =
+                            Helvetica,                                     =
+                                                                           =
+             sans-serif; font-size                                         =
+                                                                           =
+        :  10pt;"><div><div style=3D"font-family                           =
+                                                                           =
+                       :  Verdana,                                         =
+                                                                           =
+          Arial,                                                           =
+                                                                   Helvetic=
+a,                                                                         =
+                                                     sans-serif; font-size =
+                                                                           =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                  :  Verdan=
+a,                                                                         =
+                                                      Arial,               =
+                                                                           =
+                                     Helvetica,                            =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                     :  10pt;"><div><div style=3D"font-family              =
+                                                                           =
+                                      :  Verdana,                          =
+                                                                           =
+                           Arial,                                          =
+                                                                           =
+           Helvetica,                                                      =
+                                                                          s=
+ans-serif; font-size                                                       =
+                                                                        :  =
+10pt;"><div><div style=3D"font-family                                      =
+                                                                           =
+               :  Verdana,                                                 =
+                                                                           =
+     Arial,                                                                =
+                                                                 Helvetica,=
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                     :  10pt;"><div><div st=
+yle=3D"font-family                                                         =
+                                                                        :  =
+Verdana,                                                                   =
+                                                               Arial,      =
+                                                                           =
+                                                 Helvetica,                =
+                                                                           =
+                                       sans-serif; font-size               =
+                                                                           =
+                                       :  10pt;"><div><div style=3D"font-fa=
+mily                                                                       =
+                                                           :  Verdana,     =
+                                                                           =
+                                                   Arial,                  =
+                                                                           =
+                                      Helvetica,                           =
+                                                                           =
+                             sans-serif; font-size                         =
+                                                                           =
+                              :  10pt;"><div><div style=3D"font-family     =
+                                                                           =
+                                                   :  Verdana,             =
+                                                                           =
+                                            Arial,                         =
+                                                                           =
+                                Helvetica,                                 =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                          :  10pt;"><div><div style=3D"font-family         =
+                                                                           =
+                                                :  Verdana,                =
+                                                                           =
+                                          Arial,                           =
+                                                                           =
+                               Helvetica,                                  =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                           :  10pt;"><div><div style=3D"font-family        =
+                                                                           =
+                                                  :  Verdana,              =
+                                                                           =
+                                             Arial,                        =
+                                                                           =
+                                   Helvetica,                              =
+                                                                           =
+                             sans-serif; font-size                         =
+                                                                           =
+                                 :  10pt;"><div><div style=3D"font-family  =
+                                                                           =
+                                                         :  Verdana,       =
+                                                                           =
+                                                     Arial,                =
+                                                                           =
+                                            Helvetica,                     =
+                                                                           =
+                                       sans-serif; font-size               =
+                                                                           =
+                                            :  10pt;"><div><div style=3D"fo=
+nt-family                                                                  =
+                                                                     :  Ver=
+dana,                                                                      =
+                                                                  Arial,   =
+                                                                           =
+                                                          Helvetica,       =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                            :  10pt;"><div>=
+<div style=3D"font-family                                                  =
+                                                                           =
+           :  Verdana,                                                     =
+                                                                           =
+         Arial,                                                            =
+                                                                           =
+  Helvetica,                                                               =
+                                                                          s=
+ans-serif; font-size                                                       =
+                                                                           =
+      :  10pt;"><div><div style=3D"font-family                             =
+                                                                           =
+                                 :  Verdana,                               =
+                                                                           =
+                                Arial,                                     =
+                                                                           =
+                          Helvetica,                                       =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                                :  10pt;"><div><div style=3D"font-family   =
+                                                                           =
+                                                            :  Verdana,    =
+                                                                           =
+                                                            Arial,         =
+                                                                           =
+                                                       Helvetica,          =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                               :  10pt;"><d=
+iv><div style=3D"font-family                                               =
+                                                                           =
+                 :  Verdana,                                               =
+                                                                           =
+                  Arial,                                                   =
+                                                                           =
+              Helvetica,                                                   =
+                                                                           =
+              sans-serif; font-size                                        =
+                                                                           =
+                        :  10pt;"><div><div style=3D"font-family           =
+                                                                           =
+                                                      :  Verdana,          =
+                                                                           =
+                                                        Arial,             =
+                                                                           =
+                                                     Helvetica,            =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                                 :  10pt;">=
+<div><div style=3D"font-family                                             =
+                                                                           =
+                     :  Verdana,                                           =
+                                                                           =
+                        Arial,                                             =
+                                                                           =
+                      Helvetica,                                           =
+                                                                           =
+                        sans-serif; font-size                              =
+                                                                           =
+                                    :  10pt;"><div><div style=3D"font-famil=
+y                                                                          =
+                                                                    :  Verd=
+ana,                                                                       =
+                                                                        Ari=
+al,                                                                        =
+                                                                       Helv=
+etica,                                                                     =
+                                                                          s=
+ans-serif; font-size                                                       =
+                                                                           =
+            :  10pt;"><div><div style=3D"font-family                       =
+                                                                           =
+                                             :  Verdana,                   =
+                                                                           =
+                                                  Arial,                   =
+                                                                           =
+                                                  Helvetica,               =
+                                                                           =
+                                                      sans-serif; font-size=
+                                                                           =
+                                                                    :  10pt=
+;"><div style=3D"font-family                                               =
+                                                                           =
+                      :  Verdana,                                          =
+                                                                           =
+                            Arial,                                         =
+                                                                           =
+                             Helvetica,                                    =
+                                                                           =
+                                  sans-serif; font-size                    =
+                                                                           =
+                                                 :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+          :  Verdana,                                                      =
+                                                                           =
+                 Arial,                                                    =
+                                                                           =
+                   Helvetica,                                              =
+                                                                           =
+                         sans-serif; font-size                             =
+                                                                           =
+                                         :  10pt;"><div><div style=3D"font-=
+family                                                                     =
+                                                                           =
+  :  Verdana,                                                              =
+                                                                           =
+          Arial,                                                           =
+                                                                           =
+             Helvetica,                                                    =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                     :  10pt;"><div><div style=3D"font-fami=
+ly                                                                         =
+                                                                          :=
+  Verdana,                                                                 =
+                                                                           =
+        Arial,                                                             =
+                                                                           =
+            Helvetica,                                                     =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                      :  10pt;"><div style=3D"font-family  =
+                                                                           =
+                                                                       :  V=
+erdana,                                                                    =
+                                                                           =
+      Arial,                                                               =
+                                                                           =
+           Helvetica,                                                      =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                       :  10pt;"><div><div style=3D"font-fa=
+mily                                                                       =
+                                                                           =
+   :  Verdana,                                                             =
+                                                                           =
+              Arial,                                                       =
+                                                                           =
+                    Helvetica,                                             =
+                                                                           =
+                              sans-serif; font-size                        =
+                                                                           =
+                                                  :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+               :  Verdana,                                                 =
+                                                                           =
+                           Arial,                                          =
+                                                                           =
+                                  Helvetica,                               =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                  :  10pt;"=
+><div><div style=3D"font-family                                            =
+                                                                           =
+                                :  Verdana,                                =
+                                                                           =
+                                             Arial,                        =
+                                                                           =
+                                                     Helvetica,            =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+            :  10pt;"><div><div style=3D"font-family                       =
+                                                                           =
+                                                      :  Verdana,          =
+                                                                           =
+                                                                    Arial, =
+                                                                           =
+                                                                           =
+  Helvetica,                                                               =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                      :  10pt;"><div><div style=3D"font-fam=
+ily                                                                        =
+                                                                           =
+      :  Verdana,                                                          =
+                                                                           =
+                     Arial,                                                =
+                                                                           =
+                               Helvetica,                                  =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                     :  10p=
+t;"><div><div style=3D"font-family                                         =
+                                                                           =
+                                      :  Verdana,                          =
+                                                                           =
+                                                      Arial,               =
+                                                                           =
+                                                                 Helvetica,=
+                                                                           =
+                                                                           =
+     sans-serif; font-size                                                 =
+                                                                           =
+                              :  10pt;"><div><div style=3D"font-family     =
+                                                                           =
+                                                                           =
+:  Verdana,                                                                =
+                                                                           =
+                 Arial,                                                    =
+                                                                           =
+                             Helvetica,                                    =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                       :  1=
+0pt;"><div><div style=3D"font-family                                       =
+                                                                           =
+                                          :  Verdana,                      =
+                                                                           =
+                                                            Arial,         =
+                                                                           =
+                                                                         He=
+lvetica,                                                                   =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                          :  10pt;"><div><div style=3D"font=
+-family                                                                    =
+                                                                           =
+              :  Verdana,                                                  =
+                                                                           =
+                                 Arial,                                    =
+                                                                           =
+                                               Helvetica,                  =
+                                                                           =
+                                                                 sans-serif=
+; font-size                                                                =
+                                                                           =
+                  :  10pt;"><div><div style=3D"font-family                 =
+                                                                           =
+                                                                  :  Verdan=
+a,                                                                         =
+                                                                           =
+           Arial,                                                          =
+                                                                           =
+                          Helvetica,                                       =
+                                                                           =
+                                             sans-serif; font-size         =
+                                                                           =
+                                                                          :=
+  10pt;"><div><div style=3D"font-family                                    =
+                                                                           =
+                                                :  Verdana,                =
+                                                                           =
+                                                                     Arial,=
+                                                                           =
+                                                                           =
+          Helvetica,                                                       =
+                                                                           =
+                              sans-serif; font-size                        =
+                                                                           =
+                                                            :  10pt;"><div>=
+<div style=3D"font-family                                                  =
+                                                                           =
+                                   :  Verdana,                             =
+                                                                           =
+                                                         Arial,            =
+                                                                           =
+                                                                          H=
+elvetica,                                                                  =
+                                                                           =
+                    sans-serif; font-size                                  =
+                                                                           =
+                                                   :  10pt;"><div><div styl=
+e=3D"font-family                                                           =
+                                                                           =
+                           :  Verdana,                                     =
+                                                                           =
+                                                  Arial,                   =
+                                                                           =
+                                                                    Helveti=
+ca,                                                                        =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                               :  10pt;"><div><div style=3D=
+"font-family                                                               =
+                                                                           =
+                        :  Verdana,                                        =
+                                                                           =
+                                                Arial,                     =
+                                                                           =
+                                                                   Helvetic=
+a,                                                                         =
+                                                                           =
+               sans-serif; font-size                                       =
+                                                                           =
+                                                :  10pt;"><div><div style=
+=3D"font-family                                                            =
+                                                                           =
+                            :  Verdana,                                    =
+                                                                           =
+                                                     Arial,                =
+                                                                           =
+                                                                         He=
+lvetica,                                                                   =
+                                                                           =
+                      sans-serif; font-size                                =
+                                                                           =
+                                                        :  10pt;"><div><div=
+ style=3D"font-family                                                      =
+                                                                           =
+                                   :  Verdana,                             =
+                                                                           =
+                                                             Arial,        =
+                                                                           =
+                                                                           =
+       Helvetica,                                                          =
+                                                                           =
+                                sans-serif; font-size                      =
+                                                                           =
+                                                                   :  10pt;=
+"><br></div></div></div></div></div></div></div></div></div></div></div></d=
+iv></div></div></div></div></div></div></div></div></div></div></div></div>=
+</div></div></div></div></div></div></div></div></div></div></div></div></d=
+iv></div></div></div></div></div></div></div></div></div></div></div></div>=
+</div></div></div></div><div><br></div></div></div></div><div><br></div></d=
+iv></div><div><br></div></div></div><div><br></div></div></div><div><br></d=
+iv></div></div><div><br></div></div></div><div><br></div></div></div><div><=
+br></div></div></div><div><br></div></div></div><div><br></div></div></div>=
+<div><br></div></div></div><div><br></div></div></div><div><br></div></div>=
+</div><div><br></div></div></div><div><br></div></div></div><div><br></div>=
+</div></div><div><br></div></div></div><div><br></div></div></div><div><br>=
+</div></div></div><div><br></div></div></div><div><br></div></div></div><di=
+v><br></div></div></div><div><br></div></div></div><div><br></div></div></d=
+iv><div><br></div></div></div><div><br></div></div></div><div><br></div></d=
+iv></div><div><br></div></div></div><div><br></div></div></div><div><br></d=
+iv></div></div><div><br></div></div></div><div><br></div></div></div><div><=
+br></div></div></div><div><br></div></div></div><div><br></div></div></div>=
+<div><br></div></div></div><div><br></div></div></div><div><br></div></div>=
+</div><div><br></div></div></div><div><br></div></div></div><div><br></div>=
+</div></div><div><br></div></div></div><div><br></div></div></div><div><br>=
+</div></div></div><div><br></div></div></div><div><br></div></div></div><di=
+v><br></div></div></div><div><br></div></div></div><div><br></div></div></d=
+iv><div><br></div></div></div><div><br></div></div></div><div><br></div></d=
+iv></div><div><br></div></div></div><div><br></div></div></div><div><br></d=
+iv></div></div><div><br></div></div></div><div><br></div></div></div><div><=
+br></div></div></div><div><br></div></div></div><div><br></div></div></div>=
+<div><br></div></div></div><div><br></div></div></div></div><div><br></div>=
+</div></div><div><br></div></div></div><div><br></div></div></div><div><br>=
+</div></div></div><div><br></div></div></div><div><br></div></div></div><di=
+v><br></div></div></div><div><br></div></div></div><div><br></div></div></d=
+iv><div><br></div></div></div><div><br></div></div></div></div><div><br></d=
+iv></div></div><div><br></div></div></div><div><br></div></div></div><div><=
+br></div></div></div><div><br></div></div></div><div><br></div></div></div>=
+<div><br></div></div></div><div><br></div></div></div><div><br></div></div>=
+</div><div><br></div></div></div><div><br></div></div></div><div><br></div>=
+</div></div><div><br></div></div></div><div><br></div></div></div><div><br>=
+</div></div></div><div><br></div></div></div><div><br></div></div></div><di=
+v><br></div></div></div><div><br></div></div></div><div><br></div></div></d=
+iv><div><br></div></div></div><div><br></div></div></div><div><br></div></d=
+iv></div><div><br></div></div></div><div><br></div></div></div><div><br></d=
+iv></div></div><div><br></div></div></div><div><br></div></div></div><div><=
+br></div></div></div><div><br></div></div></div><div><br></div></div></div>=
+<div><br></div></div></div><div><br></div></div></div><div><br></div></div>=
+</div><div><br></div></div></div><div><br></div></div></div><div><br></div>=
+</div></div><div><br></div></div></div><div><br></div></div></div><div><br>=
+</div></div></div><div><br></div></div></div><div><br></div></div></div><di=
+v><br></div></div></div><div><br></div></div></div><div><br></div></div></d=
+iv><div><br></div></div></div><div><br></div></div></div><div><br></div></d=
+iv></div><div><br></div></div></div><div><br></div></div></div><div><br></d=
+iv></div></div><div><br></div></div></div><div><br></div></div></div><div><=
+br></div></div></div><div><br></div></div></div><div><br></div></div></div>=
+<div><br></div></div></div><div><br></div></div></div><div><br></div></div>=
+</div><div><br></div></div></div><div><br></div></div></div><br></body></ht=
+ml>
+------=_Part_737887_1998664302.1686187550644
+Content-Type: image/png; name=1.png
+Content-Transfer-Encoding: base64
+Content-Disposition: inline; filename=1.png
+Content-ID: <0.28869202910.6138388557080725296.1839baef51b__inline__img__src>
+
+
+------=_Part_737887_1998664302.1686187550644--
+------=_Part_737886_53803080.1686187550614--
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index d8d0991a8..0bee15fa9 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -110,6 +110,29 @@ RSpec.describe ReplyMailbox do
       end
     end
 
+    context 'with inline attachments and html_part' do
+      let(:mail_with_html_part_no_html_content) { create_inbound_email_from_fixture('mail_with_html_part_no_html_content.eml') }
+      let(:described_subject) { described_class.receive mail_with_html_part_no_html_content }
+
+      before do
+        conversation.uuid = '6bdc3f4d-0bed-4515-a284-5d916fdde489'
+        conversation.save!
+
+        described_subject
+      end
+
+      it 'mail content will create message' do
+        expect(conversation.messages.last.content).to include('This is test message.')
+      end
+
+      it 'html_content is empty' do
+        expect(conversation.messages.last.attachments.count).to eq(0)
+
+        html_full_content = conversation.messages.last.content_attributes[:email][:html_content][:full]
+        expect(html_full_content).to be_nil
+      end
+    end
+
     context 'with reply_to email address present' do
       let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
       let(:conversation_1) do

From 879a244f93fe5a74faf415ea412af93e76f8ce50 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 9 Jun 2023 17:00:05 +0530
Subject: [PATCH 75/93] fix: Automations condition based quoted text (#7272)

---
 app/models/message.rb                         | 43 +++++++++------
 .../conditions_filter_service.rb              |  3 ++
 ...d_processed_message_content_to_messages.rb |  5 ++
 db/schema.rb                                  |  3 +-
 .../automation_rule_listener_old_spec.rb      | 45 ----------------
 .../automation_rule_listener_spec.rb          |  7 +++
 spec/models/message_spec.rb                   | 10 ++++
 .../conditions_filter_service_spec.rb         | 54 +++++++++++++++++++
 8 files changed, 107 insertions(+), 63 deletions(-)
 create mode 100644 db/migrate/20230608040738_add_processed_message_content_to_messages.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index cea70e835..1cb47fab5 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -2,23 +2,24 @@
 #
 # Table name: messages
 #
-#  id                    :integer          not null, primary key
-#  additional_attributes :jsonb
-#  content               :text
-#  content_attributes    :json
-#  content_type          :integer          default("text"), not null
-#  external_source_ids   :jsonb
-#  message_type          :integer          not null
-#  private               :boolean          default(FALSE)
-#  sender_type           :string
-#  status                :integer          default("sent")
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  account_id            :integer          not null
-#  conversation_id       :integer          not null
-#  inbox_id              :integer          not null
-#  sender_id             :bigint
-#  source_id             :string
+#  id                        :integer          not null, primary key
+#  additional_attributes     :jsonb
+#  content                   :text
+#  content_attributes        :json
+#  content_type              :integer          default("text"), not null
+#  external_source_ids       :jsonb
+#  message_type              :integer          not null
+#  private                   :boolean          default(FALSE)
+#  processed_message_content :text
+#  sender_type               :string
+#  status                    :integer          default("sent")
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  account_id                :integer          not null
+#  conversation_id           :integer          not null
+#  inbox_id                  :integer          not null
+#  sender_id                 :bigint
+#  source_id                 :string
 #
 # Indexes
 #
@@ -57,6 +58,7 @@ class Message < ApplicationRecord
   }.to_json.freeze
 
   before_validation :ensure_content_type
+  before_save :ensure_processed_message_content
 
   validates :account_id, presence: true
   validates :inbox_id, presence: true
@@ -214,6 +216,13 @@ class Message < ApplicationRecord
 
   private
 
+  def ensure_processed_message_content
+    text_content_quoted = content_attributes.dig(:email, :text_content, :quoted)
+    html_content_quoted = content_attributes.dig(:email, :html_content, :quoted)
+
+    self.processed_message_content = text_content_quoted || html_content_quoted || content
+  end
+
   def ensure_content_type
     self.content_type ||= Message.content_types[:text]
   end
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index 432e9cfc3..f2f344e16 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -27,6 +27,7 @@ class AutomationRules::ConditionsFilterService < FilterService
     end
 
     records = base_relation.where(@query_string, @filter_values.with_indifferent_access)
+
     records = perform_attribute_changed_filter(records) if @attribute_changed_query_filter.any?
 
     records.any?
@@ -93,6 +94,8 @@ class AutomationRules::ConditionsFilterService < FilterService
     attribute_key = query_hash['attribute_key']
     query_operator = query_hash['query_operator']
 
+    attribute_key = 'processed_message_content' if attribute_key == 'content'
+
     filter_operator_value = filter_operation(query_hash, current_index)
 
     case current_filter['attribute_type']
diff --git a/db/migrate/20230608040738_add_processed_message_content_to_messages.rb b/db/migrate/20230608040738_add_processed_message_content_to_messages.rb
new file mode 100644
index 000000000..24514d6b2
--- /dev/null
+++ b/db/migrate/20230608040738_add_processed_message_content_to_messages.rb
@@ -0,0 +1,5 @@
+class AddProcessedMessageContentToMessages < ActiveRecord::Migration[7.0]
+  def change
+    add_column :messages, :processed_message_content, :text, null: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5875dd977..d3be0e597 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[7.0].define(version: 2023_05_23_104139) do
+ActiveRecord::Schema[7.0].define(version: 2023_06_08_040738) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -663,6 +663,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_23_104139) do
     t.bigint "sender_id"
     t.jsonb "external_source_ids", default: {}
     t.jsonb "additional_attributes", default: {}
+    t.text "processed_message_content"
     t.index "((additional_attributes -> 'campaign_id'::text))", name: "index_messages_on_additional_attributes_campaign_id", using: :gin
     t.index ["account_id", "inbox_id"], name: "index_messages_on_account_id_and_inbox_id"
     t.index ["account_id"], name: "index_messages_on_account_id"
diff --git a/spec/listeners/automation_rule_listener_old_spec.rb b/spec/listeners/automation_rule_listener_old_spec.rb
index 68507ea76..5c02ef90a 100644
--- a/spec/listeners/automation_rule_listener_old_spec.rb
+++ b/spec/listeners/automation_rule_listener_old_spec.rb
@@ -505,51 +505,6 @@ describe AutomationRuleListener do
     end
   end
 
-  describe '#message_created' do
-    before do
-      automation_rule.update!(
-        event_name: 'message_created',
-        name: 'Call actions message created',
-        description: 'Add labels, assign team after message created',
-        conditions: [{ 'values': ['incoming'], 'attribute_key': 'message_type', 'query_operator': nil, 'filter_operator': 'equal_to' }]
-      )
-    end
-
-    let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'incoming') }
-    let!(:event) do
-      Events::Base.new('message_created', Time.zone.now, { conversation: conversation, message: message })
-    end
-
-    context 'when rule matches' do
-      it 'triggers automation rule to assign team' do
-        expect(conversation.team_id).not_to eq(team.id)
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-        listener.message_created(event)
-        conversation.reload
-
-        expect(conversation.team_id).to eq(team.id)
-      end
-
-      it 'triggers automation rule to add label' do
-        expect(conversation.labels).to eq([])
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-        listener.message_created(event)
-        conversation.reload
-
-        expect(conversation.labels.pluck(:name)).to contain_exactly('support', 'priority_customer')
-      end
-
-      it 'triggers automation rule to assign best agent' do
-        expect(conversation.assignee).to be_nil
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-        listener.message_created(event)
-        conversation.reload
-
-        expect(conversation.assignee).to eq(user_1)
-      end
-    end
-  end
-
   describe '#message_created with conversation and contacts based conditions' do
     before do
       automation_rule.update!(
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 6f87b8342..e0103b19a 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -164,6 +164,13 @@ describe AutomationRuleListener do
         listener.message_created(event)
         expect(AutomationRules::ActionService).not_to have_received(:new).with(automation_rule, account, conversation)
       end
+
+      it 'does not call AutomationRules::ActionService if conditions do not match based on content' do
+        message.update!(processed_message_content: 'hi', content: "hi\n\nhello")
+        allow(condition_match).to receive(:present?).and_return(false)
+        listener.message_created(event)
+        expect(AutomationRules::ActionService).not_to have_received(:new).with(automation_rule, account, conversation)
+      end
     end
   end
 end
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index f7dbc9cf8..109946655 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -201,6 +201,7 @@ RSpec.describe Message do
         message.inbox = create(:inbox, account: message.account, channel: build(:channel_email, account: message.account))
         allow(EmailReplyWorker).to receive(:perform_in).and_return(true)
         message.message_type = 'outgoing'
+        message.content_attributes = { email: { text_content: { quoted: 'quoted text' } } }
         message.save!
         expect(EmailReplyWorker).to have_received(:perform_in).with(1.second, message.id)
       end
@@ -223,6 +224,15 @@ RSpec.describe Message do
     end
   end
 
+  context 'when processed_message_content is blank' do
+    let(:message) { build(:message, content_type: :text, account: create(:account), content: 'Processed message content') }
+
+    it 'sets content_type as text' do
+      message.save!
+      expect(message.processed_message_content).to eq message.content
+    end
+  end
+
   context 'when attachments size maximum' do
     let(:message) { build(:message, content_type: nil, account: create(:account)) }
 
diff --git a/spec/services/automation_rules/conditions_filter_service_spec.rb b/spec/services/automation_rules/conditions_filter_service_spec.rb
index 163430462..ec9f52062 100644
--- a/spec/services/automation_rules/conditions_filter_service_spec.rb
+++ b/spec/services/automation_rules/conditions_filter_service_spec.rb
@@ -3,6 +3,11 @@ require 'rails_helper'
 RSpec.describe AutomationRules::ConditionsFilterService do
   let(:account) { create(:account) }
   let(:conversation) { create(:conversation, account: account) }
+  let(:email_channel) { create(:channel_email, account: account) }
+  let(:email_inbox) { create(:inbox, channel: email_channel, account: account) }
+  let(:message) do
+    create(:message, account: account, conversation: conversation, content: 'test text', inbox: conversation.inbox, message_type: :incoming)
+  end
   let(:rule) { create(:automation_rule, account: account) }
 
   before do
@@ -57,5 +62,54 @@ RSpec.describe AutomationRules::ConditionsFilterService do
         end
       end
     end
+
+    context 'when conditions based on messages attributes' do
+      context 'when filter_operator is equal_to' do
+        before do
+          rule.conditions = [
+            { 'values': ['test text'], 'attribute_key': 'content', 'query_operator': 'AND', 'filter_operator': 'equal_to' },
+            { 'values': ['incoming'], 'attribute_key': 'message_type', 'query_operator': nil, 'filter_operator': 'equal_to' }
+          ]
+          rule.save
+        end
+
+        it 'will return true when conditions matches' do
+          expect(described_class.new(rule, conversation, { message: message, changed_attributes: {} }).perform).to be(true)
+        end
+
+        it 'will return false when conditions in rule does not match' do
+          message.update!(message_type: :outgoing)
+          expect(described_class.new(rule, conversation, { message: message, changed_attributes: {} }).perform).to be(false)
+        end
+      end
+
+      context 'when filter_operator is on processed_message_content' do
+        before do
+          rule.conditions = [
+            { 'values': ['help'], 'attribute_key': 'content', 'query_operator': 'AND', 'filter_operator': 'contains' },
+            { 'values': ['incoming'], 'attribute_key': 'message_type', 'query_operator': nil, 'filter_operator': 'equal_to' }
+          ]
+          rule.save
+        end
+
+        let(:conversation) { create(:conversation, account: account, inbox: email_inbox) }
+        let(:message) do
+          create(:message, account: account, conversation: conversation, content: "We will help you\n\n\n test",
+                           inbox: conversation.inbox, message_type: :incoming,
+                           content_attributes: { email: { text_content: { quoted: 'We will help you' } } })
+        end
+
+        it 'will return true for processed_message_content matches' do
+          message
+          expect(described_class.new(rule, conversation, { message: message, changed_attributes: {} }).perform).to be(true)
+        end
+
+        it 'will return false when processed_message_content does no match' do
+          rule.update(conditions: [{ 'values': ['text'], 'attribute_key': 'content', 'query_operator': nil, 'filter_operator': 'contains' }])
+
+          expect(described_class.new(rule, conversation, { message: message, changed_attributes: {} }).perform).to be(false)
+        end
+      end
+    end
   end
 end

From cd28f401ba1eef1e6f630222e88544249327aa4f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Sat, 10 Jun 2023 05:25:03 +0530
Subject: [PATCH 76/93] fix: Custom attribute date is not working in some time
 zone  (#7224)

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

diff --git a/app/javascript/dashboard/components/CustomAttribute.vue b/app/javascript/dashboard/components/CustomAttribute.vue
index 80d5da911..3ce2787ce 100644
--- a/app/javascript/dashboard/components/CustomAttribute.vue
+++ b/app/javascript/dashboard/components/CustomAttribute.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import format from 'date-fns/format';
+import { format, parseISO } from 'date-fns';
 import { required, url } from 'vuelidate/lib/validators';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import MultiselectDropdown from 'shared/components/ui/MultiselectDropdown.vue';
@@ -143,15 +143,20 @@ export default {
   },
 
   computed: {
-    formattedValue() {
+    displayValue() {
       if (this.isAttributeTypeDate) {
-        return format(new Date(this.value || new Date()), DATE_FORMAT);
+        return new Date(this.value || new Date()).toLocaleDateString();
       }
       if (this.isAttributeTypeCheckbox) {
         return this.value === 'false' ? false : this.value;
       }
       return this.value;
     },
+    formattedValue() {
+      return this.isAttributeTypeDate
+        ? format(this.value ? new Date(this.value) : new Date(), DATE_FORMAT)
+        : this.value;
+    },
     listOptions() {
       return this.values.map((value, index) => ({
         id: index + 1,
@@ -192,17 +197,11 @@ export default {
       }
       return this.$t('CUSTOM_ATTRIBUTES.VALIDATIONS.REQUIRED');
     },
-    displayValue() {
-      if (this.attributeType === 'date') {
-        return format(new Date(this.editedValue), 'dd-MM-yyyy');
-      }
-      return this.editedValue;
-    },
   },
   watch: {
     value() {
       this.isEditing = false;
-      this.editedValue = this.value;
+      this.editedValue = this.formattedValue;
     },
   },
 
@@ -249,9 +248,8 @@ export default {
     onUpdate() {
       const updatedValue =
         this.attributeType === 'date'
-          ? format(new Date(this.editedValue), DATE_FORMAT)
+          ? parseISO(this.editedValue)
           : this.editedValue;
-
       this.$v.$touch();
       if (this.$v.$invalid) {
         return;

From 9ff5978d6e83ec753778a21e274497884fb6b247 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Sat, 10 Jun 2023 06:00:36 +0530
Subject: [PATCH 77/93] feat: Add audit trail events for team (#7285)

---
 .../dashboard/i18n/locale/en/auditLogs.json   |  7 ++++-
 .../dashboard/settings/auditlogs/Index.vue    |  3 ++
 app/models/team.rb                            |  2 ++
 .../app/models/enterprise/audit/team.rb       |  7 +++++
 spec/enterprise/models/team_spec.rb           | 30 +++++++++++++++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 enterprise/app/models/enterprise/audit/team.rb
 create mode 100644 spec/enterprise/models/team_spec.rb

diff --git a/app/javascript/dashboard/i18n/locale/en/auditLogs.json b/app/javascript/dashboard/i18n/locale/en/auditLogs.json
index b1653e027..22b0f1bf1 100644
--- a/app/javascript/dashboard/i18n/locale/en/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/en/auditLogs.json
@@ -38,6 +38,11 @@
     "USER_ACTION": {
       "SIGN_IN": "%{agentName} signed in",
       "SIGN_OUT": "%{agentName} signed out"
-    }
+    },
+    "TEAM": {
+      "ADD": "%{agentName} created a new team (#%{id})",
+      "EDIT": "%{agentName} updated a team (#%{id})",
+      "DELETE": "%{agentName} deleted a team (#%{id})"
+  }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
index d7d94f2e8..97e5830e0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
@@ -127,6 +127,9 @@ export default {
         'inbox:destroy': `AUDIT_LOGS.INBOX.DELETE`,
         'user:sign_in': `AUDIT_LOGS.USER_ACTION.SIGN_IN`,
         'user:sign_out': `AUDIT_LOGS.USER_ACTION.SIGN_OUT`,
+        'team:create': `AUDIT_LOGS.TEAM.ADD`,
+        'team:update': `AUDIT_LOGS.TEAM.EDIT`,
+        'team:destroy': `AUDIT_LOGS.TEAM.DELETE`,
       };
 
       return this.$t(translationKeys[logActionKey] || '', translationPayload);
diff --git a/app/models/team.rb b/app/models/team.rb
index 57bd30451..c5935c285 100644
--- a/app/models/team.rb
+++ b/app/models/team.rb
@@ -54,3 +54,5 @@ class Team < ApplicationRecord
     }
   end
 end
+
+Team.include_mod_with('Audit::Team')
diff --git a/enterprise/app/models/enterprise/audit/team.rb b/enterprise/app/models/enterprise/audit/team.rb
new file mode 100644
index 000000000..9e4102280
--- /dev/null
+++ b/enterprise/app/models/enterprise/audit/team.rb
@@ -0,0 +1,7 @@
+module Enterprise::Audit::Team
+  extend ActiveSupport::Concern
+
+  included do
+    audited associated_with: :account
+  end
+end
diff --git a/spec/enterprise/models/team_spec.rb b/spec/enterprise/models/team_spec.rb
new file mode 100644
index 000000000..af8bcdc1b
--- /dev/null
+++ b/spec/enterprise/models/team_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Team do
+  let(:account) { create(:account) }
+  let!(:team) { create(:team, account: account) }
+
+  describe 'audit log' do
+    context 'when team is created' do
+      it 'has associated audit log created' do
+        expect(Audited::Audit.where(auditable_type: 'Team', action: 'create').count).to eq 1
+      end
+    end
+
+    context 'when team is updated' do
+      it 'has associated audit log created' do
+        team.update(description: 'awesome team')
+        expect(Audited::Audit.where(auditable_type: 'Team', action: 'update').count).to eq 1
+      end
+    end
+
+    context 'when team is deleted' do
+      it 'has associated audit log created' do
+        team.destroy!
+        expect(Audited::Audit.where(auditable_type: 'Team', action: 'destroy').count).to eq 1
+      end
+    end
+  end
+end

From c99d9f955791763665d73e805974882bc081bdee Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 12 Jun 2023 16:01:56 +0530
Subject: [PATCH 78/93] fix: search for nil in-reply-to messages (#7286)

---
 app/mailboxes/imap/imap_mailbox.rb       | 44 +++++++++++++++---------
 spec/mailboxes/imap/imap_mailbox_spec.rb | 36 +++++++++++++++++++
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index 71e3d6ec0..fffba4307 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -35,9 +35,9 @@ class Imap::ImapMailbox
   end
 
   def find_conversation_by_in_reply_to
-    return if in_reply_to.blank? && @inbound_mail.references.blank?
+    return if in_reply_to.blank?
 
-    message = @inbox.messages.find_by(source_id: in_reply_to) || find_message_by_references
+    message = @inbox.messages.find_by(source_id: in_reply_to)
     if message.nil?
       @inbox.conversations.where("additional_attributes->>'in_reply_to' = ?", in_reply_to).first
     else
@@ -45,6 +45,16 @@ class Imap::ImapMailbox
     end
   end
 
+  def find_conversation_by_reference_ids
+    return if @inbound_mail.references.blank? && in_reply_to.present?
+
+    message = find_message_by_references
+
+    return if message.nil?
+
+    @inbox.conversations.find(message.conversation_id)
+  end
+
   def in_reply_to
     @inbound_mail.in_reply_to
   end
@@ -52,8 +62,6 @@ class Imap::ImapMailbox
   def find_message_by_references
     message_to_return = nil
 
-    return if @inbound_mail.references.blank?
-
     references = Array.wrap(@inbound_mail.references)
 
     references.each do |message_id|
@@ -64,18 +72,22 @@ class Imap::ImapMailbox
   end
 
   def find_or_create_conversation
-    @conversation = find_conversation_by_in_reply_to || ::Conversation.create!({ account_id: @account.id,
-                                                                                 inbox_id: @inbox.id,
-                                                                                 contact_id: @contact.id,
-                                                                                 contact_inbox_id: @contact_inbox.id,
-                                                                                 additional_attributes: {
-                                                                                   source: 'email',
-                                                                                   in_reply_to: in_reply_to,
-                                                                                   mail_subject: @processed_mail.subject,
-                                                                                   initiated_at: {
-                                                                                     timestamp: Time.now.utc
-                                                                                   }
-                                                                                 } })
+    @conversation = find_conversation_by_in_reply_to || find_conversation_by_reference_ids || ::Conversation.create!(
+      {
+        account_id: @account.id,
+        inbox_id: @inbox.id,
+        contact_id: @contact.id,
+        contact_inbox_id: @contact_inbox.id,
+        additional_attributes: {
+          source: 'email',
+          in_reply_to: in_reply_to,
+          mail_subject: @processed_mail.subject,
+          initiated_at: {
+            timestamp: Time.now.utc
+          }
+        }
+      }
+    )
   end
 
   def find_or_create_contact
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index 3957ac5ab..07881de25 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -79,6 +79,42 @@ RSpec.describe Imap::ImapMailbox do
       end
     end
 
+    context 'when a new conversation with nil in_reply_to' do
+      let(:prev_conversation) { create(:conversation, account: account, inbox: channel.inbox, assignee: agent) }
+      let(:reply_mail) do
+        create_inbound_email_from_mail(from: 'email@gmail.com', to: 'imap@gmail.com', subject: 'Hello!', in_reply_to: nil)
+      end
+
+      it 'appends new email to the existing conversation' do
+        create(
+          :message,
+          content: 'Incoming Message',
+          message_type: 'incoming',
+          inbox: inbox,
+          account: account,
+          conversation: prev_conversation
+        )
+        create(
+          :message,
+          content: 'Outgoing Message',
+          message_type: 'outgoing',
+          inbox: inbox,
+          source_id: nil,
+          account: account,
+          conversation: prev_conversation
+        )
+
+        expect(prev_conversation.messages.size).to eq(2)
+
+        class_instance.process(reply_mail.mail, channel)
+
+        expect(prev_conversation.messages.size).to eq(2)
+
+        new_converstion_message = Conversation.last.messages.last.content_attributes
+        expect(new_converstion_message['email']['subject']).to eq('Hello!')
+      end
+    end
+
     context 'when a reply for non existing email conversation' do
       let(:reply_mail) do
         create_inbound_email_from_mail(from: 'email@gmail.com', to: 'imap@gmail.com', subject: 'Hello!', in_reply_to: 'test-in-reply-to')

From 429ec7194fb1990077f68d3dc013694d683a3316 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 12 Jun 2023 18:23:42 +0530
Subject: [PATCH 79/93] feat: add index to reporting events [CW-1960] (#7294)

* fix: annotation

* feat: add better index for reporting_events
---
 app/models/contact.rb                               |  2 +-
 app/models/reporting_event.rb                       | 13 +++++++------
 .../20230612103936_add_index_to_reporting_events.rb |  7 +++++++
 db/schema.rb                                        |  3 ++-
 4 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20230612103936_add_index_to_reporting_events.rb

diff --git a/app/models/contact.rb b/app/models/contact.rb
index b13e3d60e..543100c68 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -19,7 +19,7 @@
 #  index_contacts_on_account_id                          (account_id)
 #  index_contacts_on_lower_email_account_id              (lower((email)::text), account_id)
 #  index_contacts_on_name_email_phone_number_identifier  (name,email,phone_number,identifier) USING gin
-#  index_contacts_on_identifiable_fields                 (account_id,email,phone_number,identifier) WHERE (((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text)) # rubocop:disable Layout/LineLength
+#  index_contacts_on_nonempty_fields                     (account_id,email,phone_number,identifier) WHERE (((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))  # rubocop:disable Layout/LineLength
 #  index_contacts_on_phone_number_and_account_id         (phone_number,account_id)
 #  uniq_email_per_account_contact                        (email,account_id) UNIQUE
 #  uniq_identifier_per_account_contact                   (identifier,account_id) UNIQUE
diff --git a/app/models/reporting_event.rb b/app/models/reporting_event.rb
index 3568d2a06..2f141786b 100644
--- a/app/models/reporting_event.rb
+++ b/app/models/reporting_event.rb
@@ -17,12 +17,13 @@
 #
 # Indexes
 #
-#  index_reporting_events_on_account_id       (account_id)
-#  index_reporting_events_on_conversation_id  (conversation_id)
-#  index_reporting_events_on_created_at       (created_at)
-#  index_reporting_events_on_inbox_id         (inbox_id)
-#  index_reporting_events_on_name             (name)
-#  index_reporting_events_on_user_id          (user_id)
+#  index_reporting_events_on_account_id            (account_id)
+#  index_reporting_events_on_conversation_id       (conversation_id)
+#  index_reporting_events_on_created_at            (created_at)
+#  index_reporting_events_on_inbox_id              (inbox_id)
+#  index_reporting_events_on_name                  (name)
+#  index_reporting_events_on_user_id               (user_id)
+#  reporting_events__account_id__name__created_at  (account_id,name,created_at)
 #
 
 class ReportingEvent < ApplicationRecord
diff --git a/db/migrate/20230612103936_add_index_to_reporting_events.rb b/db/migrate/20230612103936_add_index_to_reporting_events.rb
new file mode 100644
index 000000000..657d1736a
--- /dev/null
+++ b/db/migrate/20230612103936_add_index_to_reporting_events.rb
@@ -0,0 +1,7 @@
+class AddIndexToReportingEvents < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :reporting_events, [:account_id, :name, :created_at], name: 'reporting_events__account_id__name__created_at', algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d3be0e597..91a2501ba 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[7.0].define(version: 2023_06_08_040738) do
+ActiveRecord::Schema[7.0].define(version: 2023_06_12_103936) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -798,6 +798,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_08_040738) do
     t.float "value_in_business_hours"
     t.datetime "event_start_time", precision: nil
     t.datetime "event_end_time", precision: nil
+    t.index ["account_id", "name", "created_at"], name: "reporting_events__account_id__name__created_at"
     t.index ["account_id"], name: "index_reporting_events_on_account_id"
     t.index ["conversation_id"], name: "index_reporting_events_on_conversation_id"
     t.index ["created_at"], name: "index_reporting_events_on_created_at"

From 23ca6d56f9f5af2d1212bc7d95ebfd70bf7cc49c Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 13 Jun 2023 09:18:43 +0530
Subject: [PATCH 80/93] feat: Contact Exports (#7258)

---
 .../api/v1/accounts/contacts_controller.rb    |  6 +++
 app/javascript/dashboard/api/contacts.js      |  4 ++
 .../dashboard/i18n/locale/en/contact.json     |  7 +++
 .../contacts/components/ContactsView.vue      | 13 +++++
 .../dashboard/contacts/components/Header.vue  | 14 ++++++
 .../store/modules/contacts/actions.js         | 14 ++++++
 app/jobs/account/contacts_export_job.rb       | 47 +++++++++++++++++
 .../channel_notifications_mailer.rb           |  8 +++
 app/models/account.rb                         |  2 +
 app/policies/contact_policy.rb                |  4 ++
 .../contact_export_complete.liquid            |  8 +++
 config/locales/en.yml                         |  2 +
 config/routes.rb                              |  1 +
 .../v1/accounts/contacts_controller_spec.rb   | 46 +++++++++++++++++
 spec/jobs/account/contacts_export_job_spec.rb | 50 +++++++++++++++++++
 .../channel_notifications_mailer_spec.rb      | 14 ++++++
 16 files changed, 240 insertions(+)
 create mode 100644 app/jobs/account/contacts_export_job.rb
 create mode 100644 app/views/mailers/administrator_notifications/channel_notifications_mailer/contact_export_complete.liquid
 create mode 100644 spec/jobs/account/contacts_export_job_spec.rb

diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index 8afd5b655..ba78cb805 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -42,6 +42,12 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     head :ok
   end
 
+  def export
+    column_names = params['column_names']
+    Account::ContactsExportJob.perform_later(Current.account.id, column_names)
+    head :ok, message: I18n.t('errors.contacts.export.success')
+  end
+
   # returns online contacts
   def active
     contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
diff --git a/app/javascript/dashboard/api/contacts.js b/app/javascript/dashboard/api/contacts.js
index 3599961e1..4def5ee2e 100644
--- a/app/javascript/dashboard/api/contacts.js
+++ b/app/javascript/dashboard/api/contacts.js
@@ -75,6 +75,10 @@ class ContactAPI extends ApiClient {
   destroyAvatar(contactId) {
     return axios.delete(`${this.url}/${contactId}/avatar`);
   }
+
+  exportContacts() {
+    return axios.get(`${this.url}/export`);
+  }
 }
 
 export default new ContactAPI();
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 042a1c1fc..feb6f0595 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -73,6 +73,13 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "There was an error, please try again"
   },
+  "EXPORT_CONTACTS": {
+    "BUTTON_LABEL": "Export",
+    "TITLE": "Export Contacts",
+    "DESC": "Export contacts to a CSV file.",
+    "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
   "DELETE_NOTE": {
     "CONFIRM": {
       "TITLE": "Confirm Deletion",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index a7e2c3e29..bec3ce529 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -5,6 +5,7 @@
         :search-query="searchQuery"
         :segments-id="segmentsId"
         :on-search-submit="onSearchSubmit"
+        :on-export-submit="onExportSubmit"
         this-selected-contact-id=""
         :on-input-search="onInputSearch"
         :on-toggle-create="onToggleCreate"
@@ -92,6 +93,7 @@ import filterQueryGenerator from '../../../../helper/filterQueryGenerator';
 import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews';
 import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCustomViews';
 import { CONTACTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
+import alertMixin from 'shared/mixins/alertMixin';
 import countries from 'shared/constants/countries.js';
 import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';
 
@@ -110,6 +112,7 @@ export default {
     AddCustomViews,
     DeleteCustomViews,
   },
+  mixins: [alertMixin],
   props: {
     label: { type: String, default: '' },
     segmentsId: {
@@ -386,6 +389,16 @@ export default {
       this.$store.dispatch('contacts/clearContactFilters');
       this.fetchContacts(this.pageParameter);
     },
+    onExportSubmit() {
+      try {
+        this.$store.dispatch('contacts/export');
+        this.showAlert(this.$t('EXPORT_CONTACTS.SUCCESS_MESSAGE'));
+      } catch (error) {
+        this.showAlert(
+          error.message || this.$t('EXPORT_CONTACTS.ERROR_MESSAGE')
+        );
+      }
+    },
     setParamsForEditSegmentModal() {
       // Here we are setting the params for edit segment modal to show the existing values.
 
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index fd6dc8d52..46ab24a08 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -87,6 +87,16 @@
         >
           {{ $t('IMPORT_CONTACTS.BUTTON_LABEL') }}
         </woot-button>
+
+        <woot-button
+          v-if="isAdmin"
+          color-scheme="info"
+          icon="upload"
+          class="clear"
+          @click="onExportSubmit"
+        >
+          {{ $t('EXPORT_CONTACTS.BUTTON_LABEL') }}
+        </woot-button>
       </div>
     </div>
   </header>
@@ -127,6 +137,10 @@ export default {
       type: Function,
       default: () => {},
     },
+    onExportSubmit: {
+      type: Function,
+      default: () => {},
+    },
     onToggleFilter: {
       type: Function,
       default: () => {},
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
index 7b898cbea..9e264d186 100644
--- a/app/javascript/dashboard/store/modules/contacts/actions.js
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -140,6 +140,20 @@ export const actions = {
     }
   },
 
+  export: async ({ commit }) => {
+    try {
+      await ContactAPI.exportContacts();
+      commit(types.SET_CONTACT_UI_FLAG, { isCreating: false });
+    } catch (error) {
+      commit(types.SET_CONTACT_UI_FLAG, { isCreating: false });
+      if (error.response?.data?.message) {
+        throw new Error(error.response.data.message);
+      } else {
+        throw new Error(error);
+      }
+    }
+  },
+
   delete: async ({ commit }, id) => {
     commit(types.SET_CONTACT_UI_FLAG, { isDeleting: true });
     try {
diff --git a/app/jobs/account/contacts_export_job.rb b/app/jobs/account/contacts_export_job.rb
new file mode 100644
index 000000000..0ae8b3892
--- /dev/null
+++ b/app/jobs/account/contacts_export_job.rb
@@ -0,0 +1,47 @@
+class Account::ContactsExportJob < ApplicationJob
+  queue_as :low
+
+  def perform(account_id, column_names)
+    account = Account.find(account_id)
+    headers = valid_headers(column_names)
+    generate_csv(account, headers)
+    file_url = account_contact_export_url(account)
+
+    AdministratorNotifications::ChannelNotificationsMailer.with(account: account).contact_export_complete(file_url)&.deliver_later
+  end
+
+  def generate_csv(account, headers)
+    csv_data = CSV.generate do |csv|
+      csv << headers
+      account.contacts.each do |contact|
+        csv << headers.map { |header| contact.send(header) }
+      end
+    end
+
+    attach_export_file(account, csv_data)
+  end
+
+  def valid_headers(column_names)
+    columns = (column_names.presence || default_columns)
+    headers = columns.map { |column| column if Contact.column_names.include?(column) }
+    headers.compact
+  end
+
+  def attach_export_file(account, csv_data)
+    return if csv_data.blank?
+
+    account.contacts_export.attach(
+      io: StringIO.new(csv_data),
+      filename: "#{account.name}_#{account.id}_contacts.csv",
+      content_type: 'text/csv'
+    )
+  end
+
+  def account_contact_export_url(account)
+    Rails.application.routes.url_helpers.rails_blob_url(account.contacts_export)
+  end
+
+  def default_columns
+    %w[id name email phone_number]
+  end
+end
diff --git a/app/mailers/administrator_notifications/channel_notifications_mailer.rb b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
index c0b3e1697..c1f7bd81c 100644
--- a/app/mailers/administrator_notifications/channel_notifications_mailer.rb
+++ b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
@@ -43,6 +43,14 @@ class AdministratorNotifications::ChannelNotificationsMailer < ApplicationMailer
     send_mail_with_liquid(to: admin_emails, subject: subject) and return
   end
 
+  def contact_export_complete(file_url)
+    return unless smtp_config_set_or_development?
+
+    @action_url = file_url
+    subject = "Your contact's export file is available to download."
+    send_mail_with_liquid(to: admin_emails, subject: subject) and return
+  end
+
   private
 
   def admin_emails
diff --git a/app/models/account.rb b/app/models/account.rb
index e5453bfa3..564d2f7e2 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -77,6 +77,8 @@ class Account < ApplicationRecord
   has_many :whatsapp_channels, dependent: :destroy_async, class_name: '::Channel::Whatsapp'
   has_many :working_hours, dependent: :destroy_async
 
+  has_one_attached :contacts_export
+
   enum locale: LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h
   enum status: { active: 0, suspended: 1 }
 
diff --git a/app/policies/contact_policy.rb b/app/policies/contact_policy.rb
index 71a967c6f..cd199012f 100644
--- a/app/policies/contact_policy.rb
+++ b/app/policies/contact_policy.rb
@@ -11,6 +11,10 @@ class ContactPolicy < ApplicationPolicy
     @account_user.administrator?
   end
 
+  def export?
+    @account_user.administrator?
+  end
+
   def search?
     true
   end
diff --git a/app/views/mailers/administrator_notifications/channel_notifications_mailer/contact_export_complete.liquid b/app/views/mailers/administrator_notifications/channel_notifications_mailer/contact_export_complete.liquid
new file mode 100644
index 000000000..dea003e46
--- /dev/null
+++ b/app/views/mailers/administrator_notifications/channel_notifications_mailer/contact_export_complete.liquid
@@ -0,0 +1,8 @@
+<p>Hi</p>
+
+
+<p>Your contact export file is ready to download.</p>
+
+<p>
+Click <a href="{{ action_url }}">here</a> to download the export file.
+</p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index daa5a295c..b4ea686d9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -52,6 +52,8 @@ en:
     contacts:
       import:
         failed: File is blank
+      export:
+        success: We will notify you once contacts export file is ready to view.
       email:
         invalid: Invalid email
       phone_number:
diff --git a/config/routes.rb b/config/routes.rb
index 73eccd3ee..9d862da2e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -115,6 +115,7 @@ Rails.application.routes.draw do
               get :search
               post :filter
               post :import
+              get :export
             end
             member do
               get :contactable_inboxes
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index f6141000e..cd5f977ca 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -168,6 +168,52 @@ RSpec.describe 'Contacts API', type: :request do
     end
   end
 
+  describe 'POST /api/v1/accounts/{account.id}/contacts/export' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/contacts/export"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user with out permission' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/contacts/export",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+
+      it 'enqueues a contact export job' do
+        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, nil).once
+
+        get "/api/v1/accounts/#{account.id}/contacts/export",
+            headers: admin.create_new_auth_token,
+            params: { column_names: nil }
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'enqueues a contact export job with sent_columns' do
+        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, %w[phone_number email]).once
+
+        get "/api/v1/accounts/#{account.id}/contacts/export",
+            headers: admin.create_new_auth_token,
+            params: { column_names: %w[phone_number email] }
+
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
+
   describe 'GET /api/v1/accounts/{account.id}/contacts/active' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
diff --git a/spec/jobs/account/contacts_export_job_spec.rb b/spec/jobs/account/contacts_export_job_spec.rb
new file mode 100644
index 000000000..d1c7dcff8
--- /dev/null
+++ b/spec/jobs/account/contacts_export_job_spec.rb
@@ -0,0 +1,50 @@
+require 'rails_helper'
+
+RSpec.describe Account::ContactsExportJob do
+  subject(:job) { described_class.perform_later }
+
+  let!(:account) { create(:account) }
+
+  it 'enqueues the job' do
+    expect { job }.to have_enqueued_job(described_class)
+      .on_queue('low')
+  end
+
+  context 'when export_contacts' do
+    before do
+      create(:contact, account: account, phone_number: '+910808080818', email: 'test1@text.example')
+      8.times do
+        create(:contact, account: account)
+      end
+      create(:contact, account: account, phone_number: '+910808080808', email: 'test2@text.example')
+    end
+
+    it 'generates CSV file and attach to account' do
+      mailer = double
+      allow(AdministratorNotifications::ChannelNotificationsMailer).to receive(:with).with(account: account).and_return(mailer)
+      allow(mailer).to receive(:contact_export_complete)
+
+      described_class.perform_now(account.id, [])
+
+      file_url = Rails.application.routes.url_helpers.rails_blob_url(account.contacts_export)
+
+      expect(account.contacts_export).to be_present
+      expect(file_url).to be_present
+      expect(mailer).to have_received(:contact_export_complete).with(file_url)
+    end
+
+    it 'generates valid data export file' do
+      described_class.perform_now(account.id, [])
+
+      csv_data = CSV.parse(account.contacts_export.download, headers: true)
+      first_row = csv_data[0]
+      last_row = csv_data[csv_data.length - 1]
+      first_contact = account.contacts.first
+      last_contact = account.contacts.last
+
+      expect(csv_data.length).to eq(account.contacts.count)
+      expect([first_row['email'], last_row['email']]).to contain_exactly(first_contact.email, last_contact.email)
+      expect([first_row['phone_number'], last_row['phone_number']]).to contain_exactly(first_contact.phone_number, last_contact.phone_number)
+    end
+  end
+end
diff --git a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
index 7190678cc..2bbb25b84 100644
--- a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
+++ b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe AdministratorNotifications::ChannelNotificationsMailer do
   before do
     allow(described_class).to receive(:new).and_return(class_instance)
     allow(class_instance).to receive(:smtp_config_set_or_development?).and_return(true)
+    Account::ContactsExportJob.perform_now(account.id, [])
   end
 
   describe 'slack_disconnect' do
@@ -55,4 +56,17 @@ RSpec.describe AdministratorNotifications::ChannelNotificationsMailer do
       expect(mail.to).to eq([administrator.email])
     end
   end
+
+  describe 'contact_export_complete' do
+    let!(:file_url) { Rails.application.routes.url_helpers.rails_blob_url(account.contacts_export) }
+    let(:mail) { described_class.with(account: account).contact_export_complete(file_url).deliver_now }
+
+    it 'renders the subject' do
+      expect(mail.subject).to eq("Your contact's export file is available to download.")
+    end
+
+    it 'renders the receiver email' do
+      expect(mail.to).to eq([administrator.email])
+    end
+  end
 end

From c755978352ace7ca4c1eb8ea0607671de1cac37a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 14 Jun 2023 12:56:42 +0530
Subject: [PATCH 81/93] feat: update banner design [CW-1491] (#7296)

* refactor: banner styling

* refactor: update button style for reply assign banner

* feat: remove update-banner classes

---------

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 app/javascript/dashboard/App.vue              |  5 --
 .../dashboard/components/app/UpdateBanner.vue |  1 -
 .../dashboard/components/ui/Banner.vue        | 86 +++++++++++++------
 .../widgets/conversation/ReplyBox.vue         |  1 +
 4 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index ccae9e52c..203ccec30 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -115,11 +115,6 @@ export default {
 
 <style lang="scss">
 @import './assets/scss/app';
-.update-banner {
-  height: var(--space-larger);
-  align-items: center;
-  font-size: var(--font-size-small) !important;
-}
 </style>
 
 <style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
diff --git a/app/javascript/dashboard/components/app/UpdateBanner.vue b/app/javascript/dashboard/components/app/UpdateBanner.vue
index e9e41b6cb..74ee0691a 100644
--- a/app/javascript/dashboard/components/app/UpdateBanner.vue
+++ b/app/javascript/dashboard/components/app/UpdateBanner.vue
@@ -1,7 +1,6 @@
 <template>
   <banner
     v-if="shouldShowBanner"
-    class="update-banner"
     color-scheme="primary"
     :banner-message="bannerMessage"
     href-link="https://github.com/chatwoot/chatwoot/releases"
diff --git a/app/javascript/dashboard/components/ui/Banner.vue b/app/javascript/dashboard/components/ui/Banner.vue
index a1b612952..5c406e1f4 100644
--- a/app/javascript/dashboard/components/ui/Banner.vue
+++ b/app/javascript/dashboard/components/ui/Banner.vue
@@ -11,26 +11,29 @@
         {{ hrefLinkText }}
       </a>
     </span>
-    <woot-button
-      v-if="hasActionButton"
-      size="small"
-      variant="link"
-      icon="arrow-right"
-      color-scheme="primary"
-      class-names="banner-action__button"
-      @click="onClick"
-    >
-      {{ actionButtonLabel }}
-    </woot-button>
-    <woot-button
-      v-if="hasCloseButton"
-      size="small"
-      variant="link"
-      color-scheme="secondary"
-      icon="dismiss-circle"
-      class-names="banner-action__button"
-      @click="onClickClose"
-    />
+    <div class="actions">
+      <woot-button
+        v-if="hasActionButton"
+        size="tiny"
+        icon="arrow-right"
+        :variant="actionButtonVariant"
+        color-scheme="primary"
+        class-names="banner-action__button"
+        @click="onClick"
+      >
+        {{ actionButtonLabel }}
+      </woot-button>
+      <woot-button
+        v-if="hasCloseButton"
+        size="tiny"
+        :color-scheme="colorScheme"
+        icon="dismiss-circle"
+        class-names="banner-action__button"
+        @click="onClickClose"
+      >
+        {{ $t('GENERAL_SETTINGS.DISMISS') }}
+      </woot-button>
+    </div>
   </div>
 </template>
 
@@ -53,6 +56,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    actionButtonVariant: {
+      type: String,
+      default: '',
+    },
     actionButtonLabel: {
       type: String,
       default: '',
@@ -68,7 +75,12 @@ export default {
   },
   computed: {
     bannerClasses() {
-      return [this.colorScheme];
+      const classList = [this.colorScheme, `banner-align-${this.align}`];
+
+      if (this.hasActionButton || this.hasCloseButton) {
+        classList.push('has-button');
+      }
+      return classList;
     },
   },
   methods: {
@@ -84,17 +96,26 @@ export default {
 
 <style lang="scss" scoped>
 .banner {
+  --x-padding: var(--space-normal);
+  --y-padding: var(--space-slab);
+
   display: flex;
+  gap: var(--x-padding);
   color: var(--white);
   font-size: var(--font-size-mini);
-  padding: var(--space-slab) var(--space-normal);
+  padding: var(--y-padding) var(--x-padding);
   justify-content: center;
-  position: sticky;
 
   &.primary {
     background: var(--w-500);
     .banner-action__button {
+      background: var(--w-600);
+      border: none;
       color: var(--white);
+
+      &:hover {
+        background: var(--w-800);
+      }
     }
   }
 
@@ -107,7 +128,16 @@ export default {
   }
 
   &.alert {
-    background: var(--r-400);
+    background: var(--r-500);
+    .banner-action__button {
+      background: var(--r-700);
+      border: none;
+      color: var(--white);
+
+      &:hover {
+        background: var(--r-800);
+      }
+    }
   }
 
   &.warning {
@@ -133,8 +163,6 @@ export default {
   }
 
   .banner-action__button {
-    margin: 0 var(--space-smaller);
-
     ::v-deep .button__content {
       white-space: nowrap;
     }
@@ -144,5 +172,11 @@ export default {
     display: flex;
     align-items: center;
   }
+
+  .actions {
+    display: flex;
+    gap: var(--space-smaller);
+    right: var(--y-padding);
+  }
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index e72a38c5c..bdb107ed8 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -2,6 +2,7 @@
   <div class="reply-box" :class="replyBoxClass">
     <banner
       v-if="showSelfAssignBanner"
+      action-button-variant="link"
       color-scheme="secondary"
       :banner-message="$t('CONVERSATION.NOT_ASSIGNED_TO_YOU')"
       :has-action-button="true"

From a86e236d19b66f1b1d4bead707b6994a2d55bded Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 14 Jun 2023 13:21:51 +0530
Subject: [PATCH 82/93] feat: update cache headers for cache_keys (#7283)

Update the cache headers for cache_keys to max-age=10, private, stale-while-revalidate=300

1. The cache will be fresh for 10 seconds (max-age=10). During this time, the browser will use the cached version without checking with the server.
2. After the initial 10 seconds, the browser can continue to serve the stale cache for up to 5 minutes (stale-while-revalidate=300). During this period, it will also try to revalidate and update the cache in the background.
3. After 310 seconds in total (10 seconds fresh, 300 seconds stale), if the browser has not been able to revalidate the cache, it will attempt to fetch the fresh resource directly from the server for subsequent requests, causing potential latency equivalent to a network request.

This means that the data will be directly revalidated only every 5 mins. Other times, it will stay fresh for 10 seconds and revalidate in the background. In most cases, we won't have to rely on a cache validation check because there is a WebSocket event for revalidation, so we know if something changes.

Right now the stale-while-revalidate is 5 minutes, we can then move it to 15 minutes.

> The stale-while-revalidate header is not supported in Safari, for Safari the cache keys will only stay in memory for 10 seconds before being marked stale
---
 app/controllers/api/v1/accounts_controller.rb       |  1 +
 spec/controllers/api/v1/accounts_controller_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 5af8a1fd1..ef0e0c777 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -37,6 +37,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def cache_keys
+    expires_in 10.seconds, public: false, stale_while_revalidate: 5.minutes
     render json: { cache_keys: get_cache_keys }, status: :ok
   end
 
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 6b21cfbb2..ce5f9623c 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -151,6 +151,16 @@ RSpec.describe 'Accounts API', type: :request do
       expect(response).to have_http_status(:success)
       expect(response.parsed_body['cache_keys'].keys).to match_array(%w[label inbox team])
     end
+
+    it 'sets the appropriate cache headers' do
+      get "/api/v1/accounts/#{account.id}/cache_keys",
+          headers: admin.create_new_auth_token,
+          as: :json
+
+      expect(response.headers['Cache-Control']).to include('max-age=10')
+      expect(response.headers['Cache-Control']).to include('private')
+      expect(response.headers['Cache-Control']).to include('stale-while-revalidate=300')
+    end
   end
 
   describe 'PUT /api/v1/accounts/{account.id}' do

From 2e79a32db76937956bd4d3cfcda83fd3f4e7304b Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 14 Jun 2023 13:50:10 +0530
Subject: [PATCH 83/93] fix: calculation for resolution count (#7293)

* fix: calculation for resolution count

* test: resolution count bug fix

- ensure enqueued jobs are run
- fix the dates check, conversations resolved today should show up in today

* feat: ensure conversations are resolved

* test: do not count extra events if the conversation is not resolved currently

* fix: typo
---
 app/helpers/report_helper.rb            |  4 +++-
 spec/builders/v2/report_builder_spec.rb | 28 ++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/helpers/report_helper.rb b/app/helpers/report_helper.rb
index 5fdb34170..8ee747eb9 100644
--- a/app/helpers/report_helper.rb
+++ b/app/helpers/report_helper.rb
@@ -29,7 +29,9 @@ module ReportHelper
   end
 
   def resolutions_count
-    (get_grouped_values scope.conversations.where(account_id: account.id).resolved).count
+    object_scope = scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_resolved,
+                                                                                              conversations: { status: :resolved }).distinct
+    (get_grouped_values object_scope).count
   end
 
   def avg_first_response_time
diff --git a/spec/builders/v2/report_builder_spec.rb b/spec/builders/v2/report_builder_spec.rb
index 283f18a38..b19ff3343 100644
--- a/spec/builders/v2/report_builder_spec.rb
+++ b/spec/builders/v2/report_builder_spec.rb
@@ -106,12 +106,20 @@ describe V2::ReportBuilder do
         }
 
         conversations = account.conversations.where('created_at < ?', 1.day.ago)
-        conversations.each(&:resolved!)
+        perform_enqueued_jobs do
+          # Resolve all 5 conversations
+          conversations.each(&:resolved!)
+
+          # Reopen 1 conversation
+          conversations.first.open!
+        end
+
         builder = described_class.new(account, params)
         metrics = builder.timeseries
 
-        expect(metrics[Time.zone.today]).to be 0
-        expect(metrics[Time.zone.today - 2.days]).to be 5
+        # 4 conversations are resolved
+        expect(metrics[Time.zone.today]).to be 4
+        expect(metrics[Time.zone.today - 2.days]).to be 0
       end
 
       it 'returns average first response time' do
@@ -216,11 +224,21 @@ describe V2::ReportBuilder do
         }
 
         conversations = account.conversations.where('created_at < ?', 1.day.ago)
-        conversations.each(&:resolved!)
+
+        perform_enqueued_jobs do
+          # ensure 5 reporting events are created
+          conversations.each(&:resolved!)
+
+          # open one of the conversations to check if it is not counted
+          conversations.last.open!
+        end
+
         builder = described_class.new(account, params)
         metrics = builder.timeseries
 
-        expect(metrics[Time.zone.today - 2.days]).to be 5
+        # this should count only 4 since the last conversation was reopened
+        expect(metrics[Time.zone.today]).to be 4
+        expect(metrics[Time.zone.today - 2.days]).to be 0
       end
 
       it 'returns average first response time' do

From d2aa19579e5b092e64e0f8508e8fa94f32ce1b58 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 14 Jun 2023 15:39:00 +0530
Subject: [PATCH 84/93] feat: Adds support for superscript in help center
 articles (#7279)

- Adds support for superscript when rendering article markdown
- Chatwoot Markdown Render to render markdown everywhere

Co-authored-by: Sojan <sojan@pepalo.com>
---
 .../api/v1/portals/articles_controller.rb     |  4 +-
 app/helpers/message_format_helper.rb          |  4 +-
 .../conversation_transcript.html.erb          |  2 +-
 .../email_reply.html.erb                      |  2 +-
 .../reply_with_summary.html.erb               |  2 +-
 .../reply_without_summary.html.erb            |  2 +-
 lib/chatwoot_markdown_renderer.rb             | 26 ++++++++++
 lib/superscript_renderer.rb                   | 28 +++++++++++
 .../v1/portals/articles_controller_spec.rb    |  6 ++-
 spec/lib/chatwoot_markdown_renderer_spec.rb   | 44 ++++++++++++++++
 spec/lib/superscript_renderer_spec.rb         | 50 +++++++++++++++++++
 11 files changed, 159 insertions(+), 11 deletions(-)
 create mode 100644 lib/chatwoot_markdown_renderer.rb
 create mode 100644 lib/superscript_renderer.rb
 create mode 100644 spec/lib/chatwoot_markdown_renderer_spec.rb
 create mode 100644 spec/lib/superscript_renderer_spec.rb

diff --git a/app/controllers/public/api/v1/portals/articles_controller.rb b/app/controllers/public/api/v1/portals/articles_controller.rb
index b4739e0d1..1f8be3ad7 100644
--- a/app/controllers/public/api/v1/portals/articles_controller.rb
+++ b/app/controllers/public/api/v1/portals/articles_controller.rb
@@ -43,8 +43,6 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
   end
 
   def render_article_content(content)
-    # rubocop:disable Rails/OutputSafety
-    CommonMarker.render_html(content).html_safe
-    # rubocop:enable Rails/OutputSafety
+    ChatwootMarkdownRenderer.new(content).render_article
   end
 end
diff --git a/app/helpers/message_format_helper.rb b/app/helpers/message_format_helper.rb
index 1e89c56c1..2c50fd609 100644
--- a/app/helpers/message_format_helper.rb
+++ b/app/helpers/message_format_helper.rb
@@ -7,8 +7,6 @@ module MessageFormatHelper
   end
 
   def render_message_content(message_content)
-    # rubocop:disable Rails/OutputSafety
-    CommonMarker.render_html(message_content).html_safe
-    # rubocop:enable Rails/OutputSafety
+    ChatwootMarkdownRenderer.new(message_content).render_message
   end
 end
diff --git a/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb b/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
index a372a1c43..9bcd231f9 100644
--- a/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
@@ -7,7 +7,7 @@
   <tr>
     <td style="padding-bottom: 16px;">
       <% if message.content %>
-        <%= CommonMarker.render_html(message.content).html_safe %>
+        <%= ChatwootMarkdownRenderer.new(message_content).render_message %>
       <% end %>
       <% if message.attachments %>
         <% message.attachments.each do |attachment| %>
diff --git a/app/views/mailers/conversation_reply_mailer/email_reply.html.erb b/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
index 197c6ce60..1d943c27e 100644
--- a/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
@@ -1,5 +1,5 @@
 <% if @message.content %>
-  <%= CommonMarker.render_html(@message.content).html_safe %>
+  <%= ChatwootMarkdownRenderer.new(@message.content).render_message %>
 <% end %>
 <% if @message.attachments %>
   <% @message.attachments.each do |attachment| %>
diff --git a/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb b/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
index c6cb77ad2..6c498d793 100644
--- a/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
@@ -13,7 +13,7 @@
       <% if (message.content_type == 'input_csat' && message.message_type == 'template') %>
         <p>Click <a href="<%= message.conversation.csat_survey_link %>" _target="blank">here</a> to rate the conversation.</p>
       <% elsif message.content.present? %>
-        <%= CommonMarker.render_html(message.content).html_safe %>
+        <%= ChatwootMarkdownRenderer.new(message.content).render_message %>
       <% end %>
       <% if message.attachments.count.positive? %>
         <p>
diff --git a/app/views/mailers/conversation_reply_mailer/reply_without_summary.html.erb b/app/views/mailers/conversation_reply_mailer/reply_without_summary.html.erb
index 42c7ed6ab..3c9b8034a 100644
--- a/app/views/mailers/conversation_reply_mailer/reply_without_summary.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/reply_without_summary.html.erb
@@ -1,7 +1,7 @@
 <% @messages.each do |message| %>
   <p style="font-family: Roboto,"Helvetica Neue",Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
     <% if message.content %>
-      <%= CommonMarker.render_html(message.content).html_safe %>
+      <%= ChatwootMarkdownRenderer.new(message.content).render_message %>
     <% end %>
     <% if message.attachments %>
       <% message.attachments.each do |attachment| %>
diff --git a/lib/chatwoot_markdown_renderer.rb b/lib/chatwoot_markdown_renderer.rb
new file mode 100644
index 000000000..5fa8998b3
--- /dev/null
+++ b/lib/chatwoot_markdown_renderer.rb
@@ -0,0 +1,26 @@
+class ChatwootMarkdownRenderer
+  def initialize(content)
+    @content = content
+  end
+
+  def render_message
+    html = CommonMarker.render_html(@content)
+    render_as_html_safe(html)
+  end
+
+  def render_article
+    superscript_renderer = SuperscriptRenderer.new
+    doc = CommonMarker.render_doc(@content, :DEFAULT)
+    html = superscript_renderer.render(doc)
+
+    render_as_html_safe(html)
+  end
+
+  private
+
+  def render_as_html_safe(html)
+    # rubocop:disable Rails/OutputSafety
+    html.html_safe
+    # rubocop:enable Rails/OutputSafety
+  end
+end
diff --git a/lib/superscript_renderer.rb b/lib/superscript_renderer.rb
new file mode 100644
index 000000000..485ffd1f0
--- /dev/null
+++ b/lib/superscript_renderer.rb
@@ -0,0 +1,28 @@
+class SuperscriptRenderer < CommonMarker::HtmlRenderer
+  def text(node)
+    content = node.string_content
+
+    # Check for presence of '^' in the content
+    if content.include?('^')
+      # Split the text and insert <sup> tags where necessary
+      split_content = parse_sup(content)
+      # Output the transformed content
+      out(split_content.join)
+    else
+      # Output the original content
+      out(escape_html(content))
+    end
+  end
+
+  private
+
+  def parse_sup(content)
+    content.split(/(\^[^\^]+\^)/).map do |segment|
+      if segment.start_with?('^') && segment.end_with?('^')
+        "<sup>#{escape_html(segment[1..-2])}</sup>"
+      else
+        escape_html(segment)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
index 079a85bc1..86651fee1 100644
--- a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
@@ -6,7 +6,10 @@ RSpec.describe 'Public Articles API', type: :request do
   let!(:portal) { create(:portal, slug: 'test-portal', config: { allowed_locales: %w[en es] }, custom_domain: 'www.example.com') }
   let!(:category) { create(:category, name: 'category', portal: portal, account_id: account.id, locale: 'en', slug: 'category_slug') }
   let!(:category_2) { create(:category, name: 'category', portal: portal, account_id: account.id, locale: 'es', slug: 'category_slug') }
-  let!(:article) { create(:article, category: category, portal: portal, account_id: account.id, author_id: agent.id) }
+  let!(:article) do
+    create(:article, category: category, portal: portal, account_id: account.id, author_id: agent.id,
+                     content: 'This is a *test* content with ^markdown^')
+  end
 
   before do
     ENV['HELPCENTER_URL'] = ENV.fetch('FRONTEND_URL', nil)
@@ -43,6 +46,7 @@ RSpec.describe 'Public Articles API', type: :request do
     it 'Fetch article with the id' do
       get "/hc/#{portal.slug}/articles/#{article.slug}"
       expect(response).to have_http_status(:success)
+      expect(response.body).to include(ChatwootMarkdownRenderer.new(article.content).render_article)
       expect(article.reload.views).to eq 1
     end
 
diff --git a/spec/lib/chatwoot_markdown_renderer_spec.rb b/spec/lib/chatwoot_markdown_renderer_spec.rb
new file mode 100644
index 000000000..74e6777c2
--- /dev/null
+++ b/spec/lib/chatwoot_markdown_renderer_spec.rb
@@ -0,0 +1,44 @@
+require 'rails_helper'
+
+RSpec.describe ChatwootMarkdownRenderer do
+  let(:markdown_content) { 'This is a *test* content with ^markdown^' }
+  let(:doc) { instance_double(CommonMarker::Node) }
+  let(:renderer) { described_class.new(markdown_content) }
+  let(:superscript_renderer) { instance_double(SuperscriptRenderer) }
+  let(:html_content) { '<p>This is a <em>test</em> content with <sup>markdown</sup></p>' }
+
+  before do
+    allow(CommonMarker).to receive(:render_doc).with(markdown_content, :DEFAULT).and_return(doc)
+    allow(SuperscriptRenderer).to receive(:new).and_return(superscript_renderer)
+    allow(superscript_renderer).to receive(:render).with(doc).and_return(html_content)
+  end
+
+  describe '#render_article' do
+    let(:rendered_content) { renderer.render_article }
+
+    it 'renders the markdown content to html' do
+      expect(rendered_content.to_s).to eq(html_content)
+    end
+
+    it 'returns an html safe string' do
+      expect(rendered_content).to be_html_safe
+    end
+  end
+
+  describe '#render_message' do
+    let(:message_html_content) { '<p>This is a <em>test</em> content with ^markdown^</p>' }
+    let(:rendered_message) { renderer.render_message }
+
+    before do
+      allow(CommonMarker).to receive(:render_html).with(markdown_content).and_return(message_html_content)
+    end
+
+    it 'renders the markdown message to html' do
+      expect(rendered_message.to_s).to eq(message_html_content)
+    end
+
+    it 'returns an html safe string' do
+      expect(rendered_message).to be_html_safe
+    end
+  end
+end
diff --git a/spec/lib/superscript_renderer_spec.rb b/spec/lib/superscript_renderer_spec.rb
new file mode 100644
index 000000000..ac69e4ef1
--- /dev/null
+++ b/spec/lib/superscript_renderer_spec.rb
@@ -0,0 +1,50 @@
+require 'rails_helper'
+
+describe SuperscriptRenderer do
+  let(:renderer) { described_class.new }
+
+  def render_markdown(markdown)
+    doc = CommonMarker.render_doc(markdown, :DEFAULT)
+    renderer.render(doc)
+  end
+
+  describe '#text' do
+    it 'converts text wrapped in ^ to superscript' do
+      markdown = 'This is an example of a superscript: ^superscript^.'
+      expect(render_markdown(markdown)).to include('<sup>superscript</sup>')
+    end
+
+    it 'does not convert text not wrapped in ^' do
+      markdown = 'This is an example without superscript.'
+      expect(render_markdown(markdown)).not_to include('<sup>')
+    end
+
+    it 'converts multiple superscripts in the same text' do
+      markdown = 'This is an example with ^multiple^ ^superscripts^.'
+      rendered_html = render_markdown(markdown)
+      expect(rendered_html.scan('<sup>').length).to eq(2)
+      expect(rendered_html).to include('<sup>multiple</sup>')
+      expect(rendered_html).to include('<sup>superscripts</sup>')
+    end
+  end
+
+  describe 'broken ^ usage' do
+    it 'does not convert text that only starts with ^' do
+      markdown = 'This is an example with ^broken superscript.'
+      expected_output = '<p>This is an example with ^broken superscript.</p>'
+      expect(render_markdown(markdown)).to include(expected_output)
+    end
+
+    it 'does not convert text that only ends with ^' do
+      markdown = 'This is an example with broken^ superscript.'
+      expected_output = '<p>This is an example with broken^ superscript.</p>'
+      expect(render_markdown(markdown)).to include(expected_output)
+    end
+
+    it 'does not convert text with uneven numbers of ^' do
+      markdown = 'This is an example with ^broken^ superscript^.'
+      expected_output = '<p>This is an example with <sup>broken</sup> superscript^.</p>'
+      expect(render_markdown(markdown)).to include(expected_output)
+    end
+  end
+end

From 8b91f0ffac320fcc1ab429af5c747474a2eb6e4d Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Wed, 14 Jun 2023 11:10:24 +0100
Subject: [PATCH 85/93] fix: Gemfile.lock to reduce vulnerabilities (#7280)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 Gemfile.lock | 137 ++++++++++++++++++++++++++-------------------------
 1 file changed, 69 insertions(+), 68 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 058176f5e..c4d6f7e56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,70 +33,70 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actioncable (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionmailbox (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionmailer (7.0.5)
+      actionpack (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actiontext (7.0.5)
+      actionpack (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_query_trace (1.8)
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activejob (7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.3.6)
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
     activerecord-import (1.4.1)
       activerecord (>= 4.2)
-    activestorage (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activestorage (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activesupport (= 7.0.5)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4.3)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -356,7 +356,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
@@ -423,9 +423,9 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.20.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -465,14 +465,14 @@ GEM
       sidekiq
     newrelic_rpm (8.16.0)
     nio4r (2.5.9)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.14.3-arm64-darwin)
+    nokogiri (1.15.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-darwin)
+    nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -525,7 +525,7 @@ GEM
     pundit (2.3.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.6.2)
+    racc (1.7.0)
     rack (2.2.7)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
@@ -540,28 +540,29 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.4.3)
-      actioncable (= 7.0.4.3)
-      actionmailbox (= 7.0.4.3)
-      actionmailer (= 7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actiontext (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    rails (7.0.5)
+      actioncable (= 7.0.5)
+      actionmailbox (= 7.0.5)
+      actionmailer (= 7.0.5)
+      actionpack (= 7.0.5)
+      actiontext (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activemodel (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       bundler (>= 1.15.0)
-      railties (= 7.0.4.3)
+      railties (= 7.0.5)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -725,8 +726,8 @@ GEM
     stripe (8.5.0)
     telephone_number (1.4.20)
     test-prof (1.2.1)
-    thor (1.2.1)
-    tilt (2.1.0)
+    thor (1.2.2)
+    tilt (2.2.0)
     time_diff (0.3.0)
       activesupport
       i18n
@@ -920,4 +921,4 @@ RUBY VERSION
    ruby 3.2.2p185
 
 BUNDLED WITH
-   2.4.10
+   2.4.6

From 6eb4fa41ffadd442c65c14b697dec721fc8fc310 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 14 Jun 2023 17:29:13 +0530
Subject: [PATCH 86/93] feat: Add sender details and message create date in the
 attachment API (#7308)

---
 .../accounts/conversations/attachments.json.jbuilder  | 11 ++++++++++-
 .../api/v1/accounts/conversations_controller_spec.rb  |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/api/v1/accounts/conversations/attachments.json.jbuilder b/app/views/api/v1/accounts/conversations/attachments.json.jbuilder
index e31980ea2..86c900fca 100644
--- a/app/views/api/v1/accounts/conversations/attachments.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/attachments.json.jbuilder
@@ -1 +1,10 @@
-json.payload @attachments.map(&:push_event_data)
+json.payload @attachments do |attachment|
+  json.message_id attachment.push_event_data[:message_id]
+  json.thumb_url attachment.push_event_data[:thumb_url]
+  json.data_url attachment.push_event_data[:data_url]
+  json.file_size attachment.push_event_data[:file_size]
+  json.file_type attachment.push_event_data[:file_type]
+  json.extension attachment.push_event_data[:extension]
+  json.created_at attachment.message.created_at.to_i
+  json.sender attachment.message.sender.push_event_data if attachment.message.sender
+end
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index d4929fea1..7578f0b7d 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -753,6 +753,7 @@ RSpec.describe 'Conversations API', type: :request do
         expect(response).to have_http_status(:success)
         response_body = response.parsed_body
         expect(response_body['payload'].first['file_type']).to eq('image')
+        expect(response_body['payload'].first['sender']['id']).to eq(conversation.messages.last.sender.id)
       end
 
       it 'return the attachments if you are an agent with access to inbox' do

From 1ee6a8fe90ce75ed05152bba69e76977e599effe Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 14 Jun 2023 18:28:42 +0530
Subject: [PATCH 87/93] chore: Add validation for processed content field 
 (#7306)

* logging the messages id for message validation exception

* Update the processed_message_content validation over length

* codeclimate

* specs failing for contacts
---
 app/models/message.rb                         | 4 +++-
 spec/jobs/account/contacts_export_job_spec.rb | 1 +
 spec/models/message_spec.rb                   | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index 1cb47fab5..b4121523a 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -70,6 +70,7 @@ class Message < ApplicationRecord
 
   validates :content_type, presence: true
   validates :content, length: { maximum: 150_000 }
+  validates :processed_message_content, length: { maximum: 150_000 }
 
   # when you have a temperory id in your frontend and want it echoed back via action cable
   attr_accessor :echo_id
@@ -220,7 +221,8 @@ class Message < ApplicationRecord
     text_content_quoted = content_attributes.dig(:email, :text_content, :quoted)
     html_content_quoted = content_attributes.dig(:email, :html_content, :quoted)
 
-    self.processed_message_content = text_content_quoted || html_content_quoted || content
+    message_content = text_content_quoted || html_content_quoted || content
+    self.processed_message_content = message_content&.truncate(150_000)
   end
 
   def ensure_content_type
diff --git a/spec/jobs/account/contacts_export_job_spec.rb b/spec/jobs/account/contacts_export_job_spec.rb
index d1c7dcff8..48d2f6e6e 100644
--- a/spec/jobs/account/contacts_export_job_spec.rb
+++ b/spec/jobs/account/contacts_export_job_spec.rb
@@ -43,6 +43,7 @@ RSpec.describe Account::ContactsExportJob do
       last_contact = account.contacts.last
 
       expect(csv_data.length).to eq(account.contacts.count)
+
       expect([first_row['email'], last_row['email']]).to contain_exactly(first_contact.email, last_contact.email)
       expect([first_row['phone_number'], last_row['phone_number']]).to contain_exactly(first_contact.phone_number, last_contact.phone_number)
     end
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 109946655..631e126a6 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -21,7 +21,10 @@ RSpec.describe Message do
 
       it 'invalid when crossed the limit' do
         message.content = 'a' * 150_001
+        message.processed_message_content = 'a' * 150_001
         message.valid?
+
+        expect(message.errors[:processed_message_content]).to include('is too long (maximum is 150000 characters)')
         expect(message.errors[:content]).to include('is too long (maximum is 150000 characters)')
       end
     end

From 9985f1c143e80703035f6a30bd9147439290a041 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 15 Jun 2023 12:57:56 +0530
Subject: [PATCH 88/93] refactor: remove redundant taggable declaration (#7310)

---
 app/models/concerns/liquidable.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/concerns/liquidable.rb b/app/models/concerns/liquidable.rb
index 6734dfeae..8a30977a7 100644
--- a/app/models/concerns/liquidable.rb
+++ b/app/models/concerns/liquidable.rb
@@ -2,7 +2,6 @@ module Liquidable
   extend ActiveSupport::Concern
 
   included do
-    acts_as_taggable_on :labels
     before_create :process_liquid_in_content
   end
 

From 06ac7c829b92b77b3b995c9ce56489ce46c96744 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 15 Jun 2023 16:00:21 +0530
Subject: [PATCH 89/93] fix: Fixes wrong variable usage in transcript file
 (#7316)

---
 .../conversation_reply_mailer/conversation_transcript.html.erb  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb b/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
index 9bcd231f9..ea253a4c8 100644
--- a/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
@@ -7,7 +7,7 @@
   <tr>
     <td style="padding-bottom: 16px;">
       <% if message.content %>
-        <%= ChatwootMarkdownRenderer.new(message_content).render_message %>
+        <%= ChatwootMarkdownRenderer.new(message.content).render_message %>
       <% end %>
       <% if message.attachments %>
         <% message.attachments.each do |attachment| %>

From cac9fe18807664934709e93e9c286988e2f677f6 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 15 Jun 2023 16:23:56 +0530
Subject: [PATCH 90/93] Revert "feat(perf): update query to reduce N+1 impact
 [CW-1926] (#7228)" (#7271)

This reverts commit f28533bc47308284ea1574143719e6cd48e9f593.
---
 app/finders/conversation_finder.rb                          | 6 +++---
 .../v1/conversations/partials/_conversation.json.jbuilder   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 5ac056931..a072b68b3 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -155,9 +155,9 @@ class ConversationFinder
   end
 
   def conversations
-    @conversations = @conversations.includes(:taggings, :inbox,
-                                             { assignee: [{ account_users: [:account] }, { avatar_attachment: [:blob] }] },
-                                             { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox, :messages)
+    @conversations = @conversations.includes(
+      :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox
+    )
     sort_by = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['latest']
     @conversations.send(sort_by).page(current_page)
   end
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 84aa6dcff..78774ee95 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -22,7 +22,7 @@ if conversation.messages.first.blank?
 elsif conversation.unread_incoming_messages.count.zero?
   json.messages [conversation.messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last.try(:push_event_data)]
 else
-  json.messages conversation.unread_messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last(10).map(&:push_event_data)
+  json.messages conversation.unread_messages.includes([:user, { attachments: [{ file_attachment: [:blob] }] }]).last(10).map(&:push_event_data)
 end
 
 json.account_id conversation.account_id

From 69b9123963e9231afb7c63e4f55c4c4d8c6d2ac9 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 15 Jun 2023 05:22:53 -0700
Subject: [PATCH 91/93] fix: Use available_name only (#7312)

We have display_name and the actual name for an agent. display_name is used in all public facing parts. The https://github.com/chatwoot/chatwoot/pull/7232/files PR missed this and used actual name instead.

This PR fixes it.
---
 app/mailers/conversation_reply_mailer.rb       |  4 ++--
 spec/mailers/conversation_reply_mailer_spec.rb | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index 139be8d2b..79938a97c 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -80,11 +80,11 @@ class ConversationReplyMailer < ApplicationMailer
   end
 
   def sender_name
-    @sender_name ||= current_message&.sender&.name || @agent&.available_name || 'Notifications'
+    @sender_name ||= current_message&.sender&.available_name || @agent&.available_name || 'Notifications'
   end
 
   def current_message
-    @message || @messages.last
+    @message || @conversation.messages.outgoing.last
   end
 
   def mail_subject
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index 8e65e9396..77f993cc2 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -82,11 +82,11 @@ RSpec.describe ConversationReplyMailer do
 
     context 'without assignee' do
       let(:conversation) { create(:conversation, assignee: nil) }
-      let(:message) { create(:message, conversation: conversation) }
+      let(:message) { create(:message, message_type: :outgoing, conversation: conversation) }
       let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
 
       it 'has correct name' do
-        expect(mail[:from].display_names).to eq(["#{message.sender.name} from Inbox"])
+        expect(mail[:from].display_names).to eq(["#{message.sender.available_name} from Inbox"])
       end
     end
 
@@ -171,13 +171,13 @@ RSpec.describe ConversationReplyMailer do
 
       it 'renders sender name in the from address' do
         mail = described_class.email_reply(message)
-        expect(mail['from'].value).to eq "#{message.sender.name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
+        expect(mail['from'].value).to eq "#{message.sender.available_name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
       end
 
       it 'renders sender name even when assignee is not present' do
         conversation.update(assignee_id: nil)
         mail = described_class.email_reply(message)
-        expect(mail['from'].value).to eq "#{message.sender.name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
+        expect(mail['from'].value).to eq "#{message.sender.available_name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
       end
 
       it 'renders assignee name in the from address when sender_name not available' do
@@ -261,7 +261,7 @@ RSpec.describe ConversationReplyMailer do
     context 'when the custom domain emails are enabled' do
       let(:account) { create(:account) }
       let(:conversation) { create(:conversation, assignee: agent, account: account).reload }
-      let(:message) { create(:message, conversation: conversation, account: account, inbox: conversation.inbox) }
+      let(:message) { create(:message, message_type: :outgoing, conversation: conversation, account: account, inbox: conversation.inbox) }
       let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
 
       before do
@@ -274,13 +274,13 @@ RSpec.describe ConversationReplyMailer do
 
       it 'sets reply to email to be based on the domain' do
         reply_to_email = "reply+#{message.conversation.uuid}@#{conversation.account.domain}"
-        reply_to = "#{message.sender.name} from #{conversation.inbox.name} <#{reply_to_email}>"
+        reply_to = "#{message.sender.available_name} from #{conversation.inbox.name} <#{reply_to_email}>"
         expect(mail['REPLY-TO'].value).to eq(reply_to)
         expect(mail.reply_to).to eq([reply_to_email])
       end
 
       it 'sets the from email to be the support email' do
-        expect(mail['FROM'].value).to eq("#{conversation.messages.last.sender.name} from Inbox <#{conversation.account.support_email}>")
+        expect(mail['FROM'].value).to eq("#{conversation.messages.last.sender.available_name} from Inbox <#{conversation.account.support_email}>")
         expect(mail.from).to eq([conversation.account.support_email])
       end
 

From 2c34dca347039b5ce992f56d826f3bb00e58532b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 15 Jun 2023 17:53:26 +0530
Subject: [PATCH 92/93] fix: `NS_ERROR_STORAGE_BUSY` warnings in firefox
 (#7319)

Fixes: https://linear.app/chatwoot/issue/CW-2075/ns-error-storage-busy-no-error-message
---
 app/javascript/shared/helpers/localStorage.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/shared/helpers/localStorage.js b/app/javascript/shared/helpers/localStorage.js
index 9f46c48ca..2c002bd5c 100644
--- a/app/javascript/shared/helpers/localStorage.js
+++ b/app/javascript/shared/helpers/localStorage.js
@@ -4,8 +4,9 @@ export const LocalStorage = {
   },
 
   get(key) {
-    const value = window.localStorage.getItem(key);
+    let value = null;
     try {
+      value = window.localStorage.getItem(key);
       return typeof value === 'string' ? JSON.parse(value) : value;
     } catch (error) {
       return value;

From e383e9259b69cf8ca9fed5840bfdad135d1cc469 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Thu, 15 Jun 2023 18:44:13 +0530
Subject: [PATCH 93/93] Bump version to 2.18.0

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

diff --git a/config/app.yml b/config/app.yml
index 9e05c6865..f72285e70 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.17.1'
+  version: '2.18.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index a5b927d3b..0d7778843 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.17.1",
+  "version": "2.18.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",