diff --git a/.env.example b/.env.example
index 177cb7fc81926..26b1487ae7a8d 100644
--- a/.env.example
+++ b/.env.example
@@ -23,6 +23,9 @@ FORCE_SSL=false
 ENABLE_ACCOUNT_SIGNUP=false
 
 # Redis config
+# specify the configs via single URL or individual variables
+# ref: https://www.iana.org/assignments/uri-schemes/prov/redis
+# You can also use the following format for the URL: redis://:password@host:port/db_number
 REDIS_URL=redis://redis:6379
 # If you are using docker-compose, set this variable's value to be any string,
 # which will be the password for the redis service running inside the docker-compose
@@ -180,8 +183,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## Sentry
 # SENTRY_DSN=
 
-## LogRocket
-# LOG_ROCKET_PROJECT_ID=xxxxx/some-project
 
 # MICROSOFT CLARITY
 # MS_CLARITY_TOKEN=xxxxxxxxx
@@ -251,9 +252,6 @@ AZURE_APP_SECRET=
 ## OpenAI key
 # OPENAI_API_KEY=
 
-# Sentiment analysis model file path
-SENTIMENT_FILE_PATH=
-
 # Housekeeping/Performance related configurations
 # Set to true if you want to remove stale contact inboxes
 # contact_inboxes with no conversation older than 90 days will be removed
diff --git a/Gemfile b/Gemfile
index 0dac6e95f4284..bee9eddc10137 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,13 +71,13 @@ gem 'barnes'
 ##--- gems for authentication & authorization ---##
 gem 'devise', '>= 4.9.4'
 gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
-gem 'devise_token_auth'
+gem 'devise_token_auth', '>= 1.2.3'
 # authorization
 gem 'jwt'
 gem 'pundit'
 # super admin
 gem 'administrate', '>= 0.20.1'
-gem 'administrate-field-active_storage', '>= 1.0.1'
+gem 'administrate-field-active_storage', '>= 1.0.2'
 gem 'administrate-field-belongs_to_search', '>= 0.9.0'
 
 ##--- gems for pubsub service ---##
@@ -113,10 +113,10 @@ gem 'newrelic-sidekiq-metrics', '>= 1.6.2', require: false
 gem 'scout_apm', require: false
 gem 'sentry-rails', '>= 5.14.0', require: false
 gem 'sentry-ruby', require: false
-gem 'sentry-sidekiq', '>= 5.14.0', require: false
+gem 'sentry-sidekiq', '>= 5.15.0', require: false
 
 ##-- background job processing --##
-gem 'sidekiq', '>= 7.2.1'
+gem 'sidekiq', '>= 7.2.4'
 # We want cron jobs
 gem 'sidekiq-cron', '>= 1.12.0'
 
@@ -166,7 +166,7 @@ gem 'audited', '~> 5.4', '>= 5.4.1'
 # need for google auth
 gem 'omniauth', '>= 2.1.2'
 gem 'omniauth-google-oauth2', '>= 1.1.2'
-gem 'omniauth-rails_csrf_protection', '~> 1.0'
+gem 'omniauth-rails_csrf_protection', '~> 1.0', '>= 1.0.2'
 
 ## Gems for reponse bot
 # adds cosine similarity to postgres using vector extension
@@ -175,9 +175,6 @@ gem 'pgvector'
 # Convert Website HTML to Markdown
 gem 'reverse_markdown'
 
-# Sentiment analysis
-gem 'informers'
-
 ### Gems required only in specific deployment environments ###
 ##############################################################
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 55021a04b379a..2f890deaa28fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,7 +113,7 @@ GEM
       kaminari (~> 1.2.2)
       sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
-    administrate-field-active_storage (1.0.1)
+    administrate-field-active_storage (1.0.2)
       administrate (>= 0.2.2)
       rails (>= 7.0)
     administrate-field-belongs_to_search (0.9.0)
@@ -148,10 +148,10 @@ GEM
     barnes (0.0.9)
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
-    base64 (0.1.1)
+    base64 (0.2.0)
     bcrypt (3.1.20)
+    bigdecimal (3.1.7)
     bindex (0.8.1)
-    blingfire (0.1.8)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
     brakeman (5.4.1)
@@ -200,10 +200,10 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_token_auth (1.2.1)
+    devise_token_auth (1.2.3)
       bcrypt (~> 3.0)
       devise (> 3.5.2, < 5)
-      rails (>= 4.2.0, < 7.1)
+      rails (>= 4.2.0, < 7.2)
     diff-lcs (1.5.0)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
@@ -316,15 +316,15 @@ GEM
     google-cloud-translate-v3 (0.6.0)
       gapic-common (>= 0.17.1, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.25.2)
-    google-protobuf (3.25.2-arm64-darwin)
-    google-protobuf (3.25.2-x86_64-darwin)
-    google-protobuf (3.25.2-x86_64-linux)
+    google-protobuf (3.25.3)
+    google-protobuf (3.25.3-arm64-darwin)
+    google-protobuf (3.25.3-x86_64-darwin)
+    google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.11.0)
+    googleapis-common-protos-types (1.14.0)
       google-protobuf (~> 3.18)
     googleauth (1.5.2)
       faraday (>= 0.17.3, < 3.a)
@@ -335,14 +335,17 @@ GEM
       signet (>= 0.16, < 2.a)
     groupdate (6.2.1)
       activesupport (>= 5.2)
-    grpc (1.54.3)
-      google-protobuf (~> 3.21)
+    grpc (1.62.0)
+      google-protobuf (~> 3.25)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.54.3-x86_64-darwin)
-      google-protobuf (~> 3.21)
+    grpc (1.62.0-arm64-darwin)
+      google-protobuf (~> 3.25)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.54.3-x86_64-linux)
-      google-protobuf (~> 3.21)
+    grpc (1.62.0-x86_64-darwin)
+      google-protobuf (~> 3.25)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.62.0-x86_64-linux)
+      google-protobuf (~> 3.25)
       googleapis-common-protos-types (~> 1.0)
     haikunator (1.1.1)
     hairtrigger (1.0.0)
@@ -366,15 +369,11 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    informers (0.2.0)
-      blingfire (>= 0.1.7)
-      numo-narray
-      onnxruntime (>= 0.5.1)
     io-console (0.6.0)
     irb (1.7.2)
       reline (>= 0.3.6)
@@ -449,13 +448,13 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     maxminddb (0.1.22)
     memoist (0.16.2)
     meta_request (0.8.2)
       rack-contrib (>= 1.1, < 3)
       railties (>= 3.0.0, < 8)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
@@ -475,7 +474,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.9)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
@@ -490,17 +489,16 @@ GEM
       sidekiq
     newrelic_rpm (9.6.0)
       base64
-    nio4r (2.7.0)
-    nokogiri (1.16.4)
+    nio4r (2.7.3)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.4-arm64-darwin)
+    nokogiri (1.16.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-darwin)
+    nokogiri (1.16.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
-    numo-narray (0.9.2.1)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
       snaky_hash (~> 2.0)
@@ -526,17 +524,9 @@ GEM
     omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    onnxruntime (0.7.6)
-      ffi
-    onnxruntime (0.7.6-arm64-darwin)
-      ffi
-    onnxruntime (0.7.6-x86_64-darwin)
-      ffi
-    onnxruntime (0.7.6-x86_64-linux)
-      ffi
     openssl (3.1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
@@ -614,7 +604,7 @@ GEM
       ffi (~> 1.0)
     redis (5.0.6)
       redis-client (>= 0.9.0)
-    redis-client (0.19.1)
+    redis-client (0.22.1)
       connection_pool
     redis-namespace (1.10.0)
       redis (>= 4)
@@ -713,18 +703,19 @@ GEM
       activesupport (>= 4)
     selectize-rails (0.12.6)
     semantic_range (3.0.0)
-    sentry-rails (5.14.0)
+    sentry-rails (5.17.3)
       railties (>= 5.0)
-      sentry-ruby (~> 5.14.0)
-    sentry-ruby (5.14.0)
+      sentry-ruby (~> 5.17.3)
+    sentry-ruby (5.17.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.14.0)
-      sentry-ruby (~> 5.14.0)
+    sentry-sidekiq (5.17.3)
+      sentry-ruby (~> 5.17.3)
       sidekiq (>= 3.0)
     sexp_processor (4.17.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.2.1)
+    sidekiq (7.2.4)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
@@ -828,7 +819,7 @@ GEM
     working_hours (1.4.1)
       activesupport (>= 3.2)
       tzinfo
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   arm64-darwin-20
@@ -846,7 +837,7 @@ DEPENDENCIES
   activerecord-import
   acts-as-taggable-on
   administrate (>= 0.20.1)
-  administrate-field-active_storage (>= 1.0.1)
+  administrate-field-active_storage (>= 1.0.2)
   administrate-field-belongs_to_search (>= 0.9.0)
   annotate
   attr_extras
@@ -869,7 +860,7 @@ DEPENDENCIES
   debug (~> 1.8)
   devise (>= 4.9.4)
   devise-secure_password!
-  devise_token_auth
+  devise_token_auth (>= 1.2.3)
   dotenv-rails
   down
   elastic-apm
@@ -892,7 +883,6 @@ DEPENDENCIES
   hashie
   html2text!
   image_processing
-  informers
   jbuilder
   json_refs
   json_schemer
@@ -914,7 +904,7 @@ DEPENDENCIES
   omniauth (>= 2.1.2)
   omniauth-google-oauth2 (>= 1.1.2)
   omniauth-oauth2
-  omniauth-rails_csrf_protection (~> 1.0)
+  omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2)
   pg
   pg_search
   pgvector
@@ -943,9 +933,9 @@ DEPENDENCIES
   seed_dump
   sentry-rails (>= 5.14.0)
   sentry-ruby
-  sentry-sidekiq (>= 5.14.0)
+  sentry-sidekiq (>= 5.15.0)
   shoulda-matchers
-  sidekiq (>= 7.2.1)
+  sidekiq (>= 7.2.4)
   sidekiq-cron (>= 1.12.0)
   simplecov (= 0.17.1)
   slack-ruby-client (~> 2.2.0)
diff --git a/app.json b/app.json
index 4ee025f06e3f1..d50040814205e 100644
--- a/app.json
+++ b/app.json
@@ -55,7 +55,7 @@
       "plan": "heroku-redis:mini"
     },
     {
-      "plan": "heroku-postgresql:mini"
+      "plan": "heroku-postgresql:essential-0"
     }
   ],
   "stack": "heroku-20",
diff --git a/app/builders/contact_inbox_with_contact_builder.rb b/app/builders/contact_inbox_with_contact_builder.rb
index 6e913eda83b63..2f30093dbf8a7 100644
--- a/app/builders/contact_inbox_with_contact_builder.rb
+++ b/app/builders/contact_inbox_with_contact_builder.rb
@@ -19,9 +19,9 @@ def find_or_create_contact_and_contact_inbox
 
     ActiveRecord::Base.transaction(requires_new: true) do
       build_contact_with_contact_inbox
-      update_contact_avatar(@contact) unless @contact.avatar.attached?
-      @contact_inbox
     end
+    update_contact_avatar(@contact) unless @contact.avatar.attached?
+    @contact_inbox
   end
 
   private
diff --git a/app/controllers/api/v1/accounts/bulk_actions_controller.rb b/app/controllers/api/v1/accounts/bulk_actions_controller.rb
index 832f5a49b1277..34db47861fe48 100644
--- a/app/controllers/api/v1/accounts/bulk_actions_controller.rb
+++ b/app/controllers/api/v1/accounts/bulk_actions_controller.rb
@@ -21,6 +21,6 @@ def type_matches?
   end
 
   def permitted_params
-    params.permit(:type, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
+    params.permit(:type, :snoozed_until, ids: [], fields: [:status, :assignee_id, :team_id], labels: [add: [], remove: []])
   end
 end
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index 729db34b5d7be..250c64a86105d 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -46,7 +46,8 @@ def import
 
   def export
     column_names = params['column_names']
-    Account::ContactsExportJob.perform_later(Current.account.id, column_names, Current.user.email)
+    filter_params = { :payload => params.permit!['payload'], :label => params.permit!['label'] }
+    Account::ContactsExportJob.perform_later(Current.account.id, Current.user.id, column_names, filter_params)
     head :ok, message: I18n.t('errors.contacts.export.success')
   end
 
@@ -61,7 +62,7 @@ def active
   def show; end
 
   def filter
-    result = ::Contacts::FilterService.new(params.permit!, current_user).perform
+    result = ::Contacts::FilterService.new(Current.account, Current.user, params.permit!).perform
     contacts = result[:contacts]
     @contacts_count = result[:count]
     @contacts = fetch_contacts(contacts)
diff --git a/app/controllers/api/v1/accounts/conversations/draft_messages_controller.rb b/app/controllers/api/v1/accounts/conversations/draft_messages_controller.rb
new file mode 100644
index 0000000000000..86b7ce5bbf5d5
--- /dev/null
+++ b/app/controllers/api/v1/accounts/conversations/draft_messages_controller.rb
@@ -0,0 +1,28 @@
+class Api::V1::Accounts::Conversations::DraftMessagesController < Api::V1::Accounts::Conversations::BaseController
+  def show
+    render json: { has_draft: false } and return unless Redis::Alfred.exists?(draft_redis_key)
+
+    draft_message = Redis::Alfred.get(draft_redis_key)
+    render json: { has_draft: true, message: draft_message }
+  end
+
+  def update
+    Redis::Alfred.set(draft_redis_key, draft_message_params)
+    head :ok
+  end
+
+  def destroy
+    Redis::Alfred.delete(draft_redis_key)
+    head :ok
+  end
+
+  private
+
+  def draft_redis_key
+    format(Redis::Alfred::CONVERSATION_DRAFT_MESSAGE, id: @conversation.id)
+  end
+
+  def draft_message_params
+    params.dig(:draft_message, :message) || ''
+  end
+end
diff --git a/app/controllers/public/api/v1/portals_controller.rb b/app/controllers/public/api/v1/portals_controller.rb
index fe51ed161aa5c..e8fb867cb69b6 100644
--- a/app/controllers/public/api/v1/portals_controller.rb
+++ b/app/controllers/public/api/v1/portals_controller.rb
@@ -6,6 +6,12 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
 
   def show; end
 
+  def sitemap
+    @help_center_url = @portal.custom_domain || ChatwootApp.help_center_root
+    # if help_center_url does not contain a protocol, prepend it with https
+    @help_center_url = "https://#{@help_center_url}" unless @help_center_url.include?('://')
+  end
+
   private
 
   def portal
diff --git a/app/dispatchers/async_dispatcher.rb b/app/dispatchers/async_dispatcher.rb
index f2f238cd49030..b582bc5dd993d 100644
--- a/app/dispatchers/async_dispatcher.rb
+++ b/app/dispatchers/async_dispatcher.rb
@@ -10,14 +10,15 @@ def publish_event(event_name, timestamp, data)
 
   def listeners
     [
+      AutomationRuleListener.instance,
       CampaignListener.instance,
       CsatSurveyListener.instance,
       HookListener.instance,
       InstallationWebhookListener.instance,
       NotificationListener.instance,
+      ParticipationListener.instance,
       ReportingEventListener.instance,
-      WebhookListener.instance,
-      AutomationRuleListener.instance
+      WebhookListener.instance
     ]
   end
 end
diff --git a/app/helpers/api/v2/accounts/reports_helper.rb b/app/helpers/api/v2/accounts/reports_helper.rb
index 74c7af43e350a..4d5a6f115e0bf 100644
--- a/app/helpers/api/v2/accounts/reports_helper.rb
+++ b/app/helpers/api/v2/accounts/reports_helper.rb
@@ -1,7 +1,7 @@
 module Api::V2::Accounts::ReportsHelper
   def generate_agents_report
     Current.account.users.map do |agent|
-      agent_report = generate_report({ type: :agent, id: agent.id })
+      agent_report = report_builder({ type: :agent, id: agent.id }).summary
       [agent.name] + generate_readable_report_metrics(agent_report)
     end
   end
@@ -15,7 +15,7 @@ def generate_inboxes_report
 
   def generate_teams_report
     Current.account.teams.map do |team|
-      team_report = generate_report({ type: :team, id: team.id })
+      team_report = report_builder({ type: :team, id: team.id }).summary
       [team.name] + generate_readable_report_metrics(team_report)
     end
   end
@@ -27,7 +27,7 @@ def generate_labels_report
     end
   end
 
-  def generate_report(report_params)
+  def report_builder(report_params)
     V2::ReportBuilder.new(
       Current.account,
       report_params.merge(
@@ -37,7 +37,11 @@ def generate_report(report_params)
           business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
         }
       )
-    ).short_summary
+    )
+  end
+
+  def generate_report(report_params)
+    report_builder(report_params).short_summary
   end
 
   private
@@ -46,7 +50,9 @@ def generate_readable_report_metrics(report_metric)
     [
       report_metric[:conversations_count],
       Reports::TimeFormatPresenter.new(report_metric[:avg_first_response_time]).format,
-      Reports::TimeFormatPresenter.new(report_metric[:avg_resolution_time]).format
+      Reports::TimeFormatPresenter.new(report_metric[:avg_resolution_time]).format,
+      Reports::TimeFormatPresenter.new(report_metric[:reply_time]).format,
+      report_metric[:resolutions_count]
     ]
   end
 end
diff --git a/app/javascript/dashboard/api/contacts.js b/app/javascript/dashboard/api/contacts.js
index 61312dd2417ab..85c4bba1d5e1a 100644
--- a/app/javascript/dashboard/api/contacts.js
+++ b/app/javascript/dashboard/api/contacts.js
@@ -77,8 +77,8 @@ class ContactAPI extends ApiClient {
     return axios.delete(`${this.url}/${contactId}/avatar`);
   }
 
-  exportContacts() {
-    return axios.get(`${this.url}/export`);
+  exportContacts(queryPayload) {
+    return axios.post(`${this.url}/export`, queryPayload);
   }
 }
 
diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index 5728dd51b26df..4b33d5b10c240 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -40,3 +40,347 @@
 .hide {
   @apply hidden;
 }
+
+@layer base {
+  // scss-lint:disable PropertySortOrder
+  :root {
+    --color-amber-25: 254 253 251;
+    --color-amber-50: 255 249 237;
+    --color-amber-75: 255 243 208;
+    --color-amber-100: 255 236 183;
+    --color-amber-200: 255 224 161;
+    --color-amber-300: 245 208 140;
+    --color-amber-400: 228 187 120;
+    --color-amber-500: 214 163 92;
+    --color-amber-600: 214 163 92;
+    --color-amber-700: 255 186 26;
+    --color-amber-800: 145 89 48;
+    --color-amber-900: 79 52 34;
+
+    --color-ash-100: 235 235 239;
+    --color-ash-200: 228 228 233;
+    --color-ash-25: 252 252 253;
+    --color-ash-300: 221 221 227;
+    --color-ash-400: 211 212 219;
+    --color-ash-50: 249 249 251;
+    --color-ash-500: 185 187 198;
+    --color-ash-600: 139 141 152;
+    --color-ash-700: 126 128 138;
+    --color-ash-75: 242 242 245;
+    --color-ash-800: 96 100 108;
+    --color-ash-900: 28 32 36;
+
+    --color-primary-25: 251 253 255;
+    --color-primary-50: 245 249 255;
+    --color-primary-75: 233 243 255;
+    --color-primary-100: 218 236 255;
+    --color-primary-200: 201 226 255;
+    --color-primary-300: 181 213 255;
+    --color-primary-400: 155 195 252;
+    --color-primary-500: 117 171 247;
+    --color-primary-600: 39 129 246;
+    --color-primary-700: 16 115 233;
+    --color-primary-800: 8 109 224;
+    --color-primary-900: 11 50 101;
+
+    --color-ruby-100: 255 220 225;
+    --color-ruby-200: 255 206 214;
+    --color-ruby-25: 255 252 253;
+    --color-ruby-300: 248 191 200;
+    --color-ruby-400: 239 172 184;
+    --color-ruby-50: 255 247 248;
+    --color-ruby-500: 229 146 163;
+    --color-ruby-600: 229 70 102;
+    --color-ruby-700: 220 59 93;
+    --color-ruby-75: 254 234 237;
+    --color-ruby-800: 202 36 77;
+    --color-ruby-900: 100 23 43;
+
+    --color-teal-100: 224 248 243;
+    --color-teal-200: 204 243 234;
+    --color-teal-25: 250 254 253;
+    --color-teal-300: 184 234 224;
+    --color-teal-400: 161 222 210;
+    --color-teal-50: 243 251 249;
+    --color-teal-500: 83 185 171;
+    --color-teal-600: 18 165 148;
+    --color-teal-700: 13 155 138;
+    --color-teal-75: 236 249 255;
+    --color-teal-800: 0 133 115;
+    --color-teal-900: 13 61 56;
+
+    --color-green-25: 251 254 252;
+    --color-green-50: 244 251 246;
+    --color-green-75: 230 246 235;
+    --color-green-100: 214 241 223;
+    --color-green-200: 196 232 209;
+    --color-green-300: 173 221 192;
+    --color-green-400: 142 206 170;
+    --color-green-500: 91 185 139;
+    --color-green-600: 48 164 108;
+    --color-green-700: 43 154 102;
+    --color-green-800: 33 131 88;
+    --color-green-900: 25 59 45;
+
+    --color-mint-25: 249 254 253;
+    --color-mint-50: 242 251 249;
+    --color-mint-75: 221 249 242;
+    --color-mint-100: 200 244 233;
+    --color-mint-200: 179 236 222;
+    --color-mint-300: 156 224 208;
+    --color-mint-400: 126 207 189;
+    --color-mint-500: 76 187 165;
+    --color-mint-600: 134 234 212;
+    --color-mint-700: 125 224 203;
+    --color-mint-800: 2 120 100;
+    --color-mint-900: 22 67 60;
+
+    --color-sky-25: 249 254 255;
+    --color-sky-50: 241 250 253;
+    --color-sky-75: 225 246 253;
+    --color-sky-100: 209 240 250;
+    --color-sky-200: 190 231 245;
+    --color-sky-300: 169 218 237;
+    --color-sky-400: 141 202 227;
+    --color-sky-500: 96 179 215;
+    --color-sky-600: 124 226 254;
+    --color-sky-700: 116 218 248;
+    --color-sky-800: 0 116 158;
+    --color-sky-900: 29 62 86;
+
+    --color-indigo-25: 253 253 254;
+    --color-indigo-50: 247 249 255;
+    --color-indigo-75: 237 242 254;
+    --color-indigo-100: 225 233 255;
+    --color-indigo-200: 210 222 255;
+    --color-indigo-300: 193 208 255;
+    --color-indigo-400: 171 189 249;
+    --color-indigo-500: 141 164 239;
+    --color-indigo-600: 62 99 221;
+    --color-indigo-700: 51 88 212;
+    --color-indigo-800: 58 91 199;
+    --color-indigo-900: 31 45 92;
+
+    --color-iris-25: 253 253 255;
+    --color-iris-50: 248 248 255;
+    --color-iris-75: 240 241 254;
+    --color-iris-100: 230 231 255;
+    --color-iris-200: 218 220 255;
+    --color-iris-300: 203 205 255;
+    --color-iris-400: 184 186 248;
+    --color-iris-500: 155 158 240;
+    --color-iris-600: 91 91 214;
+    --color-iris-700: 81 81 205;
+    --color-iris-800: 87 83 198;
+    --color-iris-900: 39 41 98;
+
+    --color-violet-25: 253 252 254;
+    --color-violet-50: 250 248 255;
+    --color-violet-75: 244 240 254;
+    --color-violet-100: 235 228 255;
+    --color-violet-200: 225 217 255;
+    --color-violet-300: 212 202 254;
+    --color-violet-400: 194 181 245;
+    --color-violet-500: 170 153 236;
+    --color-violet-600: 110 86 207;
+    --color-violet-700: 101 77 196;
+    --color-violet-800: 101 80 185;
+    --color-violet-900: 47 38 95;
+
+    --color-pink-25: 255 252 254;
+    --color-pink-50: 254 247 251;
+    --color-pink-75: 254 233 245;
+    --color-pink-100: 251 220 239;
+    --color-pink-200: 246 206 231;
+    --color-pink-300: 239 191 221;
+    --color-pink-400: 231 172 208;
+    --color-pink-500: 221 147 194;
+    --color-pink-600: 214 64 159;
+    --color-pink-700: 207 56 151;
+    --color-pink-800: 194 41 138;
+    --color-pink-900: 101 18 73;
+
+    --color-orange-25: 254 252 251;
+    --color-orange-50: 255 247 237;
+    --color-orange-75: 255 239 214;
+    --color-orange-100: 255 223 181;
+    --color-orange-200: 255 209 154;
+    --color-orange-300: 255 193 130;
+    --color-orange-400: 245 174 115;
+    --color-orange-500: 236 148 85;
+    --color-orange-600: 247 107 21;
+    --color-orange-700: 239 95 0;
+    --color-orange-800: 204 78 0;
+    --color-orange-900: 88 45 29;
+  }
+  // scss-lint:disable QualifyingElement
+  body.dark {
+    --color-amber-25: 31 19 0;
+    --color-amber-50: 37 24 4;
+    --color-amber-75: 48 32 11;
+    --color-amber-100: 57 39 15;
+    --color-amber-200: 67 46 18;
+    --color-amber-300: 83 57 22;
+    --color-amber-400: 111 77 29;
+    --color-amber-500: 169 118 42;
+    --color-amber-600: 169 118 42;
+    --color-amber-700: 255 203 71;
+    --color-amber-800: 255 204 77;
+    --color-amber-900: 255 231 179;
+
+    --color-ash-100: 46 48 53;
+    --color-ash-200: 53 55 60;
+    --color-ash-25: 24 24 26;
+    --color-ash-300: 60 63 68;
+    --color-ash-400: 70 75 80;
+    --color-ash-50: 27 27 31;
+    --color-ash-500: 90 97 101;
+    --color-ash-600: 105 110 119;
+    --color-ash-700: 120 127 133;
+    --color-ash-75: 39 40 45;
+    --color-ash-800: 173 177 184;
+    --color-ash-900: 237 238 240;
+
+    --color-primary-25: 10 17 28;
+    --color-primary-50: 15 24 38;
+    --color-primary-75: 15 39 72;
+    --color-primary-100: 10 49 99;
+    --color-primary-200: 18 61 117;
+    --color-primary-300: 29 74 134;
+    --color-primary-400: 40 89 156;
+    --color-primary-500: 48 106 186;
+    --color-primary-600: 39 129 246;
+    --color-primary-700: 21 116 231;
+    --color-primary-800: 126 182 255;
+    --color-primary-900: 205 227 255;
+
+    --color-ruby-100: 78 19 37;
+    --color-ruby-200: 94 26 46;
+    --color-ruby-25: 25 17 19;
+    --color-ruby-300: 111 37 57;
+    --color-ruby-400: 136 52 71;
+    --color-ruby-50: 30 21 23;
+    --color-ruby-500: 179 68 90;
+    --color-ruby-600: 229 70 102;
+    --color-ruby-700: 236 90 114;
+    --color-ruby-75: 58 20 30;
+    --color-ruby-800: 255 148 157;
+    --color-ruby-900: 254 210 225;
+
+    --color-teal-100: 2 59 55;
+    --color-teal-200: 8 72 67;
+    --color-teal-25: 13 21 20;
+    --color-teal-300: 28 105 97;
+    --color-teal-400: 28 105 97;
+    --color-teal-50: 17 28 27;
+    --color-teal-500: 32 126 115;
+    --color-teal-600: 41 163 131;
+    --color-teal-700: 14 179 158;
+    --color-teal-75: 13 45 42;
+    --color-teal-800: 11 216 182;
+    --color-teal-900: 173 240 221;
+
+    --color-green-25: 14 21 18;
+    --color-green-50: 18 27 23;
+    --color-green-75: 19 45 33;
+    --color-green-100: 17 59 41;
+    --color-green-200: 23 73 51;
+    --color-green-300: 32 87 62;
+    --color-green-400: 40 104 74;
+    --color-green-500: 47 124 87;
+    --color-green-600: 48 164 108;
+    --color-green-700: 51 176 116;
+    --color-green-800: 61 214 140;
+    --color-green-900: 177 241 203;
+
+    --color-mint-25: 14 21 21;
+    --color-mint-50: 15 27 27;
+    --color-mint-75: 9 44 43;
+    --color-mint-100: 0 58 56;
+    --color-mint-200: 0 71 68;
+    --color-mint-300: 16 86 80;
+    --color-mint-400: 30 104 95;
+    --color-mint-500: 39 127 112;
+    --color-mint-600: 134 234 212;
+    --color-mint-700: 168 245 229;
+    --color-mint-800: 88 213 186;
+    --color-mint-900: 196 245 225;
+
+    --color-sky-25: 14 21 21;
+    --color-sky-50: 15 27 27;
+    --color-sky-75: 9 44 43;
+    --color-sky-100: 0 58 56;
+    --color-sky-200: 0 71 68;
+    --color-sky-300: 16 86 80;
+    --color-sky-400: 30 104 95;
+    --color-sky-500: 39 127 112;
+    --color-sky-600: 134 234 212;
+    --color-sky-700: 168 245 229;
+    --color-sky-800: 88 213 186;
+    --color-sky-900: 196 245 225;
+
+    --color-indigo-25: 17 19 31;
+    --color-indigo-50: 20 23 38;
+    --color-indigo-75: 24 36 73;
+    --color-indigo-100: 29 46 98;
+    --color-indigo-200: 37 57 116;
+    --color-indigo-300: 48 67 132;
+    --color-indigo-400: 58 79 151;
+    --color-indigo-500: 67 93 177;
+    --color-indigo-600: 62 99 221;
+    --color-indigo-700: 84 114 228;
+    --color-indigo-800: 158 177 255;
+    --color-indigo-900: 214 225 255;
+
+    --color-iris-25: 19 19 30;
+    --color-iris-50: 23 22 37;
+    --color-iris-75: 32 34 72;
+    --color-iris-100: 38 42 101;
+    --color-iris-200: 48 51 116;
+    --color-iris-300: 61 62 130;
+    --color-iris-400: 74 74 149;
+    --color-iris-500: 89 88 177;
+    --color-iris-600: 91 91 214;
+    --color-iris-700: 110 106 222;
+    --color-iris-800: 177 169 255;
+    --color-iris-900: 224 223 254;
+
+    --color-violet-25: 20 18 31;
+    --color-violet-50: 27 21 37;
+    --color-violet-75: 41 31 67;
+    --color-violet-100: 51 37 91;
+    --color-violet-200: 60 46 105;
+    --color-violet-300: 71 56 118;
+    --color-violet-400: 86 70 139;
+    --color-violet-500: 105 88 173;
+    --color-violet-600: 110 86 207;
+    --color-violet-700: 125 102 217;
+    --color-violet-800: 186 167 255;
+    --color-violet-900: 226 221 254;
+
+    --color-pink-25: 25 17 23;
+    --color-pink-50: 33 18 29;
+    --color-pink-75: 55 23 47;
+    --color-pink-100: 75 20 61;
+    --color-pink-200: 89 28 71;
+    --color-pink-300: 105 41 85;
+    --color-pink-400: 131 56 105;
+    --color-pink-500: 168 72 133;
+    --color-pink-600: 214 64 159;
+    --color-pink-700: 222 81 168;
+    --color-pink-800: 255 141 204;
+    --color-pink-900: 253 209 234;
+    --color-orange-25: 23 18 14;
+    --color-orange-50: 30 22 15;
+    --color-orange-75: 51 30 11;
+    --color-orange-100: 70 33 0;
+    --color-orange-200: 86 40 0;
+    --color-orange-300: 102 53 12;
+    --color-orange-400: 126 69 29;
+    --color-orange-500: 163 88 41;
+    --color-orange-600: 247 107 21;
+    --color-orange-700: 255 128 31;
+    --color-orange-800: 255 160 87;
+    --color-orange-900: 255 224 194;
+  }
+}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_base.scss b/app/javascript/dashboard/assets/scss/widgets/_base.scss
index 1ebcef53c806e..d5d2e227f6be8 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_base.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_base.scss
@@ -12,7 +12,6 @@ h6 {
 
 p {
   text-rendering: optimizeLegibility;
-  word-spacing: 0.12em;
 
   @apply mb-2 leading-[1.65] text-sm;
 
diff --git a/app/javascript/dashboard/components/ChannelSelector.vue b/app/javascript/dashboard/components/ChannelSelector.vue
index 33877de945610..dd9513fb6ab08 100644
--- a/app/javascript/dashboard/components/ChannelSelector.vue
+++ b/app/javascript/dashboard/components/ChannelSelector.vue
@@ -1,9 +1,9 @@
 <template>
   <button
-    class="sm:w-[50%] md:w-1/3 lg:w-1/4 bg-white dark:bg-slate-900 cursor-pointer flex flex-col transition-all duration-200 ease-in -m-px py-4 px-0 items-center border border-solid border-slate-25 dark:border-slate-800 hover:border-woot-500 dark:hover:border-woot-500 hover:shadow-md hover:z-50 disabled:opacity-60"
+    class="bg-white dark:bg-slate-900 cursor-pointer flex flex-col transition-all duration-200 ease-in -m-px py-4 px-0 items-center border border-solid border-slate-25 dark:border-slate-800 hover:border-woot-500 dark:hover:border-woot-500 hover:shadow-md hover:z-50 disabled:opacity-60"
     @click="$emit('click')"
   >
-    <img :src="src" :alt="title" class="w-[50%] my-4 mx-auto" />
+    <img :src="src" :alt="title" class="w-1/2 my-4 mx-auto" />
     <h3
       class="text-slate-800 dark:text-slate-100 text-base text-center capitalize"
     >
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 26c057f985c8f..348d8572adcd7 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -185,7 +185,7 @@ import ConversationBasicFilter from './widgets/conversation/ConversationBasicFil
 import ChatTypeTabs from './widgets/ChatTypeTabs.vue';
 import ConversationItem from './ConversationItem.vue';
 import timeMixin from '../mixins/time';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import conversationMixin from '../mixins/conversations';
 import wootConstants from 'dashboard/constants/globals';
 import advancedFilterTypes from './widgets/conversation/advancedFilterItems';
@@ -199,11 +199,6 @@ import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
 import countries from 'shared/constants/countries';
 import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';
-
-import {
-  hasPressedAltAndJKey,
-  hasPressedAltAndKKey,
-} from 'shared/helpers/KeyboardHelpers';
 import { conversationListPageURL } from '../helper/URLHelper';
 import {
   isOnMentionsView,
@@ -228,7 +223,7 @@ export default {
   mixins: [
     timeMixin,
     conversationMixin,
-    eventListenerMixins,
+    keyboardEventListenerMixins,
     alertMixin,
     filterMixin,
     uiSettingsMixin,
@@ -293,7 +288,6 @@ export default {
       foldersQuery: {},
       showAddFoldersModal: false,
       showDeleteFoldersModal: false,
-      selectedConversations: [],
       selectedInboxes: [],
       isContextMenuOpen: false,
       appliedFilter: [],
@@ -334,6 +328,7 @@ export default {
       inboxesList: 'inboxes/getInboxes',
       campaigns: 'campaigns/getAllCampaigns',
       labels: 'labels/getLabels',
+      selectedConversations: 'bulkActions/getSelectedConversationIds',
     }),
     hasAppliedFilters() {
       return this.appliedFilters.length !== 0;
@@ -691,30 +686,40 @@ export default {
         lastConversationIndex,
       };
     },
-    handleKeyEvents(e) {
-      if (hasPressedAltAndJKey(e)) {
-        const { allConversations, activeConversationIndex } =
-          this.getKeyboardListenerParams();
-        if (activeConversationIndex === -1) {
-          allConversations[0].click();
-        }
-        if (activeConversationIndex >= 1) {
-          allConversations[activeConversationIndex - 1].click();
-        }
+    handlePreviousConversation() {
+      const { allConversations, activeConversationIndex } =
+        this.getKeyboardListenerParams();
+      if (activeConversationIndex === -1) {
+        allConversations[0].click();
       }
-      if (hasPressedAltAndKKey(e)) {
-        const {
-          allConversations,
-          activeConversationIndex,
-          lastConversationIndex,
-        } = this.getKeyboardListenerParams();
-        if (activeConversationIndex === -1) {
-          allConversations[lastConversationIndex].click();
-        } else if (activeConversationIndex < lastConversationIndex) {
-          allConversations[activeConversationIndex + 1].click();
-        }
+      if (activeConversationIndex >= 1) {
+        allConversations[activeConversationIndex - 1].click();
+      }
+    },
+    handleNextConversation() {
+      const {
+        allConversations,
+        activeConversationIndex,
+        lastConversationIndex,
+      } = this.getKeyboardListenerParams();
+      if (activeConversationIndex === -1) {
+        allConversations[lastConversationIndex].click();
+      } else if (activeConversationIndex < lastConversationIndex) {
+        allConversations[activeConversationIndex + 1].click();
       }
     },
+    getKeyboardEvents() {
+      return {
+        'Alt+KeyJ': {
+          action: () => this.handlePreviousConversation(),
+          allowOnFocusedInput: true,
+        },
+        'Alt+KeyK': {
+          action: () => this.handleNextConversation(),
+          allowOnFocusedInput: true,
+        },
+      };
+    },
     resetAndFetchData() {
       this.appliedFilter = [];
       this.resetBulkActions();
@@ -794,7 +799,7 @@ export default {
       });
     },
     resetBulkActions() {
-      this.selectedConversations = [];
+      this.$store.dispatch('bulkActions/clearSelectedConversationIds');
       this.selectedInboxes = [];
     },
     onBasicFilterChange(value, type) {
@@ -825,12 +830,16 @@ export default {
       return this.selectedConversations.includes(id);
     },
     selectConversation(conversationId, inboxId) {
-      this.selectedConversations.push(conversationId);
+      this.$store.dispatch(
+        'bulkActions/setSelectedConversationIds',
+        conversationId
+      );
       this.selectedInboxes.push(inboxId);
     },
     deSelectConversation(conversationId, inboxId) {
-      this.selectedConversations = this.selectedConversations.filter(
-        item => item !== conversationId
+      this.$store.dispatch(
+        'bulkActions/removeSelectedConversationIds',
+        conversationId
       );
       this.selectedInboxes = this.selectedInboxes.filter(
         item => item !== inboxId
@@ -838,7 +847,10 @@ export default {
     },
     selectAllConversations(check) {
       if (check) {
-        this.selectedConversations = this.conversationList.map(item => item.id);
+        this.$store.dispatch(
+          'bulkActions/setSelectedConversationIds',
+          this.conversationList.map(item => item.id)
+        );
         this.selectedInboxes = this.conversationList.map(item => item.inbox_id);
       } else {
         this.resetBulkActions();
@@ -854,7 +866,7 @@ export default {
             assignee_id: agent.id,
           },
         });
-        this.selectedConversations = [];
+        this.$store.dispatch('bulkActions/clearSelectedConversationIds');
         if (conversationId) {
           this.showAlert(
             this.$t(
@@ -952,7 +964,7 @@ export default {
             add: labels,
           },
         });
-        this.selectedConversations = [];
+        this.$store.dispatch('bulkActions/clearSelectedConversationIds');
         if (conversationId) {
           this.showAlert(
             this.$t(
@@ -979,13 +991,13 @@ export default {
             team_id: team.id,
           },
         });
-        this.selectedConversations = [];
+        this.$store.dispatch('bulkActions/clearSelectedConversationIds');
         this.showAlert(this.$t('BULK_ACTION.TEAMS.ASSIGN_SUCCESFUL'));
       } catch (err) {
         this.showAlert(this.$t('BULK_ACTION.TEAMS.ASSIGN_FAILED'));
       }
     },
-    async onUpdateConversations(status) {
+    async onUpdateConversations(status, snoozedUntil) {
       try {
         await this.$store.dispatch('bulkActions/process', {
           type: 'Conversation',
@@ -993,8 +1005,9 @@ export default {
           fields: {
             status,
           },
+          snoozed_until: snoozedUntil,
         });
-        this.selectedConversations = [];
+        this.$store.dispatch('bulkActions/clearSelectedConversationIds');
         this.showAlert(this.$t('BULK_ACTION.UPDATE.UPDATE_SUCCESFUL'));
       } catch (err) {
         this.showAlert(this.$t('BULK_ACTION.UPDATE.UPDATE_FAILED'));
diff --git a/app/javascript/dashboard/components/CustomAttribute.vue b/app/javascript/dashboard/components/CustomAttribute.vue
index b50ad54cbcae1..2c0fb48f76aba 100644
--- a/app/javascript/dashboard/components/CustomAttribute.vue
+++ b/app/javascript/dashboard/components/CustomAttribute.vue
@@ -12,7 +12,7 @@
         </div>
         <div class="flex items-center justify-between w-full">
           <span
-            class="w-full font-medium text-sm mb-0"
+            class="w-full inline-flex gap-1.5 items-start font-medium whitespace-nowrap text-sm mb-0"
             :class="
               $v.editedValue.$error
                 ? 'text-red-400 dark:text-red-500'
@@ -20,6 +20,11 @@
             "
           >
             {{ label }}
+            <helper-text-popup
+              v-if="description"
+              :message="description"
+              class="mt-0.5"
+            />
           </span>
           <woot-button
             v-if="showCopyAndDeleteButton"
@@ -41,7 +46,7 @@
             ref="inputfield"
             v-model="editedValue"
             :type="inputType"
-            class="!h-8 ltr:rounded-r-none rtl:rounded-l-none !mb-0 !text-sm"
+            class="!h-8 ltr:!rounded-r-none rtl:!rounded-l-none !mb-0 !text-sm"
             autofocus="true"
             :class="{ error: $v.editedValue.$error }"
             @blur="$v.editedValue.$touch"
@@ -130,22 +135,25 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 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';
+import HelperTextPopup from 'dashboard/components/ui/HelperTextPopup.vue';
 import { isValidURL } from '../helper/URLHelper';
 import customAttributeMixin from '../mixins/customAttributeMixin';
+
 const DATE_FORMAT = 'yyyy-MM-dd';
 
 export default {
   components: {
     MultiselectDropdown,
+    HelperTextPopup,
   },
-  mixins: [customAttributeMixin, clickaway],
+  mixins: [customAttributeMixin],
   props: {
     label: { type: String, required: true },
+    description: { type: String, default: '' },
     values: { type: Array, default: () => [] },
     value: { type: [String, Number, Boolean], default: '' },
     showActions: { type: Boolean, default: false },
diff --git a/app/javascript/dashboard/components/FormSection.vue b/app/javascript/dashboard/components/FormSection.vue
new file mode 100644
index 0000000000000..8a22d5e8a0e30
--- /dev/null
+++ b/app/javascript/dashboard/components/FormSection.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="flex flex-col items-start w-full gap-6">
+    <div class="flex flex-col w-full gap-4">
+      <h4 v-if="title" class="text-lg font-medium text-ash-900">
+        {{ title }}
+      </h4>
+      <div class="flex flex-row items-center justify-between">
+        <div class="flex-grow h-px bg-ash-200" />
+      </div>
+      <p v-if="description" class="mb-0 text-sm font-normal text-ash-900">
+        {{ description }}
+      </p>
+    </div>
+    <div class="flex flex-col w-full gap-6">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineProps({
+  title: {
+    type: String,
+    default: '',
+  },
+  description: {
+    type: String,
+    default: '',
+  },
+});
+</script>
diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index 84e33cc427fdb..61375dc21fd78 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -88,15 +88,9 @@
 <script>
 import { getUnixTime } from 'date-fns';
 import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
 import alertMixin from 'shared/mixins/alertMixin';
 import CustomSnoozeModal from 'dashboard/components/CustomSnoozeModal.vue';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
-import {
-  hasPressedAltAndEKey,
-  hasPressedCommandPlusAltAndEKey,
-  hasPressedAltAndMKey,
-} from 'shared/helpers/KeyboardHelpers';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import { findSnoozeTime } from 'dashboard/helper/snoozeHelpers';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
@@ -114,7 +108,7 @@ export default {
     WootDropdownMenu,
     CustomSnoozeModal,
   },
-  mixins: [clickaway, alertMixin, eventListenerMixins],
+  mixins: [alertMixin, keyboardEventListenerMixins],
   props: { conversationId: { type: [String, Number], required: true } },
   data() {
     return {
@@ -159,37 +153,52 @@ export default {
     bus.$off(CMD_RESOLVE_CONVERSATION, this.onCmdResolveConversation);
   },
   methods: {
-    async handleKeyEvents(e) {
+    getKeyboardEvents() {
+      return {
+        'Alt+KeyM': {
+          action: () => this.$refs.arrowDownButton?.$el.click(),
+          allowOnFocusedInput: true,
+        },
+        'Alt+KeyE': this.resolveOrToast,
+        '$mod+Alt+KeyE': async event => {
+          const { all, activeIndex, lastIndex } = this.getConversationParams();
+          await this.resolveOrToast();
+
+          if (activeIndex < lastIndex) {
+            all[activeIndex + 1].click();
+          } else if (all.length > 1) {
+            all[0].click();
+            document.querySelector('.conversations-list').scrollTop = 0;
+          }
+
+          event.preventDefault();
+        },
+      };
+    },
+    getConversationParams() {
       const allConversations = document.querySelectorAll(
         '.conversations-list .conversation'
       );
-      if (hasPressedAltAndMKey(e)) {
-        if (this.$refs.arrowDownButton) {
-          this.$refs.arrowDownButton.$el.click();
-        }
-      }
-      if (hasPressedAltAndEKey(e)) {
-        const activeConversation = document.querySelector(
-          'div.conversations-list div.conversation.active'
-        );
-        const activeConversationIndex = [...allConversations].indexOf(
-          activeConversation
-        );
-        const lastConversationIndex = allConversations.length - 1;
-        try {
-          await this.toggleStatus(wootConstants.STATUS_TYPE.RESOLVED);
-        } catch (error) {
-          // error
-        }
-        if (hasPressedCommandPlusAltAndEKey(e)) {
-          if (activeConversationIndex < lastConversationIndex) {
-            allConversations[activeConversationIndex + 1].click();
-          } else if (allConversations.length > 1) {
-            allConversations[0].click();
-            document.querySelector('.conversations-list').scrollTop = 0;
-          }
-          e.preventDefault();
-        }
+
+      const activeConversation = document.querySelector(
+        'div.conversations-list div.conversation.active'
+      );
+      const activeConversationIndex = [...allConversations].indexOf(
+        activeConversation
+      );
+      const lastConversationIndex = allConversations.length - 1;
+
+      return {
+        all: allConversations,
+        activeIndex: activeConversationIndex,
+        lastIndex: lastConversationIndex,
+      };
+    },
+    async resolveOrToast() {
+      try {
+        await this.toggleStatus(wootConstants.STATUS_TYPE.RESOLVED);
+      } catch (error) {
+        // error
       }
     },
     onCmdSnoozeConversation(snoozeType) {
diff --git a/app/javascript/dashboard/components/index.js b/app/javascript/dashboard/components/index.js
index bc515cfdf56ea..2b624b6d98903 100644
--- a/app/javascript/dashboard/components/index.js
+++ b/app/javascript/dashboard/components/index.js
@@ -24,6 +24,7 @@ import SubmitButton from './buttons/FormSubmitButton';
 import Tabs from './ui/Tabs/Tabs';
 import TabsItem from './ui/Tabs/TabsItem';
 import Thumbnail from './widgets/Thumbnail.vue';
+import DatePicker from './ui/DatePicker/DatePicker.vue';
 
 const WootUIKit = {
   AvatarUploader,
@@ -51,6 +52,7 @@ const WootUIKit = {
   Tabs,
   TabsItem,
   Thumbnail,
+  DatePicker,
   install(Vue) {
     const keys = Object.keys(this);
     keys.pop(); // remove 'install' from keys
diff --git a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
index afada52b689d0..63f216058133c 100644
--- a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
+++ b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
@@ -47,7 +47,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
 import alertMixin from 'shared/mixins/alertMixin';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
@@ -67,7 +66,7 @@ export default {
     AvailabilityStatusBadge,
   },
 
-  mixins: [clickaway, alertMixin],
+  mixins: [alertMixin],
 
   data() {
     return {
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 1290ea602f546..0f3a1a85758dc 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -1,5 +1,5 @@
 <template>
-  <aside class="h-full flex">
+  <aside class="flex h-full">
     <primary-sidebar
       :logo-source="globalConfig.logoThumbnail"
       :installation-name="globalConfig.installationName"
@@ -36,15 +36,7 @@ import alertMixin from 'shared/mixins/alertMixin';
 
 import PrimarySidebar from './sidebarComponents/Primary.vue';
 import SecondarySidebar from './sidebarComponents/Secondary.vue';
-import {
-  hasPressedAltAndCKey,
-  hasPressedAltAndRKey,
-  hasPressedAltAndSKey,
-  hasPressedAltAndVKey,
-  hasPressedCommandAndForwardSlash,
-  isEscape,
-} from 'shared/helpers/KeyboardHelpers';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import router from '../../routes';
 
 export default {
@@ -52,7 +44,7 @@ export default {
     PrimarySidebar,
     SecondarySidebar,
   },
-  mixins: [adminMixin, alertMixin, eventListenerMixins],
+  mixins: [adminMixin, alertMixin, keyboardEventListenerMixins],
   props: {
     showSecondarySidebar: {
       type: Boolean,
@@ -173,30 +165,27 @@ export default {
     closeKeyShortcutModal() {
       this.$emit('close-key-shortcut-modal');
     },
-    handleKeyEvents(e) {
-      if (hasPressedCommandAndForwardSlash(e)) {
-        this.toggleKeyShortcutModal();
-      }
-      if (isEscape(e)) {
-        this.closeKeyShortcutModal();
-      }
-
-      if (hasPressedAltAndCKey(e)) {
-        if (!this.isCurrentRouteSameAsNavigation('home')) {
-          router.push({ name: 'home' });
-        }
-      } else if (hasPressedAltAndVKey(e)) {
-        if (!this.isCurrentRouteSameAsNavigation('contacts_dashboard')) {
-          router.push({ name: 'contacts_dashboard' });
-        }
-      } else if (hasPressedAltAndRKey(e)) {
-        if (!this.isCurrentRouteSameAsNavigation('settings_account_reports')) {
-          router.push({ name: 'settings_account_reports' });
-        }
-      } else if (hasPressedAltAndSKey(e)) {
-        if (!this.isCurrentRouteSameAsNavigation('agent_list')) {
-          router.push({ name: 'agent_list' });
-        }
+    getKeyboardEvents() {
+      return {
+        '$mod+Slash': this.toggleKeyShortcutModal,
+        '$mod+Escape': this.closeKeyShortcutModal,
+        'Alt+KeyC': {
+          action: () => this.navigateToRoute('home'),
+        },
+        'Alt+KeyV': {
+          action: () => this.navigateToRoute('contacts_dashboard'),
+        },
+        'Alt+KeyR': {
+          action: () => this.navigateToRoute('account_overview_reports'),
+        },
+        'Alt+KeyS': {
+          action: () => this.navigateToRoute('agent_list'),
+        },
+      };
+    },
+    navigateToRoute(routeName) {
+      if (!this.isCurrentRouteSameAsNavigation(routeName)) {
+        router.push({ name: routeName });
       }
     },
     isCurrentRouteSameAsNavigation(routeName) {
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
index 1c336cbb59fed..01dce6bf17d80 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
@@ -106,7 +106,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
 import Auth from '../../../api/auth';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
@@ -119,7 +118,6 @@ export default {
     WootDropdownItem,
     AvailabilityStatus,
   },
-  mixins: [clickaway],
   props: {
     show: {
       type: Boolean,
diff --git a/app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue b/app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue
new file mode 100644
index 0000000000000..225bb90f3e3a7
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue
@@ -0,0 +1,304 @@
+<script setup>
+import { ref, watch } from 'vue';
+import {
+  getActiveDateRange,
+  moveCalendarDate,
+  DATE_RANGE_TYPES,
+  CALENDAR_TYPES,
+  CALENDAR_PERIODS,
+} from './helpers/DatePickerHelper';
+import {
+  isValid,
+  startOfMonth,
+  subDays,
+  startOfDay,
+  endOfDay,
+  isBefore,
+  subMonths,
+  addMonths,
+  isSameMonth,
+  differenceInCalendarMonths,
+  setMonth,
+  setYear,
+  isAfter,
+} from 'date-fns';
+
+import DatePickerButton from './components/DatePickerButton.vue';
+import CalendarDateInput from './components/CalendarDateInput.vue';
+import CalendarDateRange from './components/CalendarDateRange.vue';
+import CalendarYear from './components/CalendarYear.vue';
+import CalendarMonth from './components/CalendarMonth.vue';
+import CalendarWeek from './components/CalendarWeek.vue';
+import CalendarFooter from './components/CalendarFooter.vue';
+
+const { LAST_7_DAYS, LAST_30_DAYS, CUSTOM_RANGE } = DATE_RANGE_TYPES;
+const { START_CALENDAR, END_CALENDAR } = CALENDAR_TYPES;
+const { WEEK, MONTH, YEAR } = CALENDAR_PERIODS;
+
+const showDatePicker = ref(false);
+const calendarViews = ref({ start: WEEK, end: WEEK });
+const currentDate = ref(new Date());
+const selectedStartDate = ref(startOfDay(subDays(currentDate.value, 6))); // LAST_7_DAYS
+const selectedEndDate = ref(endOfDay(currentDate.value));
+// Setting the start and end calendar
+const startCurrentDate = ref(startOfDay(selectedStartDate.value));
+const endCurrentDate = ref(
+  isSameMonth(selectedStartDate.value, selectedEndDate.value)
+    ? startOfMonth(addMonths(selectedEndDate.value, 1)) // Moves to the start of the next month if dates are in the same month (Mounted case LAST_7_DAYS)
+    : startOfMonth(selectedEndDate.value) // Always shows the month of the end date starting from the first (Mounted case LAST_7_DAYS)
+);
+const selectingEndDate = ref(false);
+const selectedRange = ref(LAST_7_DAYS);
+const hoveredEndDate = ref(null);
+
+const manualStartDate = ref(selectedStartDate.value);
+const manualEndDate = ref(selectedEndDate.value);
+
+const emit = defineEmits(['change']);
+
+// Watcher will set the start and end dates based on the selected range
+watch(selectedRange, newRange => {
+  if (newRange !== CUSTOM_RANGE) {
+    // If selecting a range other than last 7 days or last 30 days, set the start and end dates to the selected start and end dates
+    // If selecting last 7 days or last 30 days is, set the start date to the selected start date
+    // and the end date to one month ahead of the start date if the start date and end date are in the same month
+    // Otherwise set the end date to the selected end date
+    const isLastSevenOrThirtyDays =
+      newRange === LAST_7_DAYS || newRange === LAST_30_DAYS;
+    startCurrentDate.value = selectedStartDate.value;
+    endCurrentDate.value =
+      isLastSevenOrThirtyDays &&
+      isSameMonth(selectedStartDate.value, selectedEndDate.value)
+        ? startOfMonth(addMonths(selectedStartDate.value, 1))
+        : selectedEndDate.value;
+    selectingEndDate.value = false;
+  } else if (!selectingEndDate.value) {
+    // If selecting a custom range and not selecting an end date, set the start date to the selected start date
+    startCurrentDate.value = startOfDay(currentDate.value);
+  }
+});
+
+// Watcher will set the input values based on the selected start and end dates
+watch(
+  [selectedStartDate, selectedEndDate],
+  ([newStart, newEnd]) => {
+    if (isValid(newStart)) {
+      manualStartDate.value = newStart;
+    } else {
+      manualStartDate.value = selectedStartDate.value;
+    }
+
+    if (isValid(newEnd)) {
+      manualEndDate.value = newEnd;
+    } else {
+      manualEndDate.value = selectedEndDate.value;
+    }
+  },
+  { immediate: true }
+);
+
+// Watcher to ensure dates are always in logical order
+// This watch is will ensure that the start date is always before the end date
+watch(
+  [startCurrentDate, endCurrentDate],
+  ([newStart, newEnd], [oldStart, oldEnd]) => {
+    const monthDifference = differenceInCalendarMonths(newEnd, newStart);
+
+    if (newStart !== oldStart) {
+      if (isAfter(newStart, newEnd) || monthDifference === 0) {
+        // Adjust the end date forward if the start date is adjusted and is after the end date or in the same month
+        endCurrentDate.value = addMonths(newStart, 1);
+      }
+    }
+    if (newEnd !== oldEnd) {
+      if (isBefore(newEnd, newStart) || monthDifference === 0) {
+        // Adjust the start date backward if the end date is adjusted and is before the start date or in the same month
+        startCurrentDate.value = subMonths(newEnd, 1);
+      }
+    }
+  },
+  { immediate: true, deep: true }
+);
+
+const setDateRange = range => {
+  selectedRange.value = range.value;
+  const { start, end } = getActiveDateRange(range.value, currentDate.value);
+  selectedStartDate.value = start;
+  selectedEndDate.value = end;
+};
+
+const moveCalendar = (calendar, direction, period = MONTH) => {
+  const { start, end } = moveCalendarDate(
+    calendar,
+    startCurrentDate.value,
+    endCurrentDate.value,
+    direction,
+    period
+  );
+  startCurrentDate.value = start;
+  endCurrentDate.value = end;
+};
+
+const selectDate = day => {
+  selectedRange.value = CUSTOM_RANGE;
+  if (!selectingEndDate.value || day < selectedStartDate.value) {
+    selectedStartDate.value = day;
+    selectedEndDate.value = null;
+    selectingEndDate.value = true;
+  } else {
+    selectedEndDate.value = day;
+    selectingEndDate.value = false;
+  }
+};
+
+const setViewMode = (calendar, mode) => {
+  selectedRange.value = CUSTOM_RANGE;
+  calendarViews.value[calendar] = mode;
+};
+
+const openCalendar = (index, calendarType, period = MONTH) => {
+  const current =
+    calendarType === START_CALENDAR
+      ? startCurrentDate.value
+      : endCurrentDate.value;
+  const newDate =
+    period === MONTH
+      ? setMonth(startOfMonth(current), index)
+      : setYear(current, index);
+  if (calendarType === START_CALENDAR) {
+    startCurrentDate.value = newDate;
+  } else {
+    endCurrentDate.value = newDate;
+  }
+  setViewMode(calendarType, period === MONTH ? WEEK : MONTH);
+};
+
+const updateManualInput = (newDate, calendarType) => {
+  if (calendarType === START_CALENDAR) {
+    selectedStartDate.value = newDate;
+    startCurrentDate.value = newDate;
+  } else {
+    selectedEndDate.value = newDate;
+    endCurrentDate.value = newDate;
+  }
+  selectingEndDate.value = false;
+};
+
+const handleManualInputError = message => {
+  bus.$emit('newToastMessage', message);
+};
+
+const resetDatePicker = () => {
+  startCurrentDate.value = startOfDay(currentDate.value); // Resets to today at start of the day
+  endCurrentDate.value = addMonths(startOfDay(currentDate.value), 1); // Resets to one month ahead
+  selectedStartDate.value = startOfDay(subDays(currentDate.value, 6));
+  selectedEndDate.value = endOfDay(currentDate.value);
+  selectingEndDate.value = false;
+  selectedRange.value = LAST_7_DAYS;
+  // Reset view modes if they are being used to toggle between different calendar views
+  calendarViews.value = { start: WEEK, end: WEEK };
+};
+
+const emitDateRange = () => {
+  if (!isValid(selectedStartDate.value) || !isValid(selectedEndDate.value)) {
+    bus.$emit('newToastMessage', 'Please select a valid time range');
+  } else {
+    showDatePicker.value = false;
+    emit('dateRangeChanged', [selectedStartDate.value, selectedEndDate.value]);
+  }
+};
+</script>
+
+<template>
+  <div class="relative font-inter">
+    <DatePickerButton
+      :selected-start-date="selectedStartDate"
+      :selected-end-date="selectedEndDate"
+      :selected-range="selectedRange"
+      @open="showDatePicker = !showDatePicker"
+    />
+    <div
+      v-if="showDatePicker"
+      class="flex absolute top-9 ltr:left-0 rtl:right-0 z-30 shadow-md select-none w-[880px] h-[490px] rounded-2xl border border-slate-50 dark:border-slate-800 bg-white dark:bg-slate-800"
+    >
+      <CalendarDateRange
+        :selected-range="selectedRange"
+        @set-range="setDateRange"
+      />
+      <div
+        class="flex flex-col w-[680px] ltr:border-l rtl:border-r border-slate-50 dark:border-slate-700/50"
+      >
+        <div class="flex justify-around h-fit">
+          <!-- Calendars for Start and End Dates -->
+          <div
+            v-for="calendar in [START_CALENDAR, END_CALENDAR]"
+            :key="`${calendar}-calendar`"
+            class="flex flex-col items-center"
+          >
+            <CalendarDateInput
+              :calendar-type="calendar"
+              :date-value="
+                calendar === START_CALENDAR ? manualStartDate : manualEndDate
+              "
+              :compare-date="
+                calendar === START_CALENDAR ? manualEndDate : manualStartDate
+              "
+              :is-disabled="selectedRange !== CUSTOM_RANGE"
+              @update="
+                calendar === START_CALENDAR
+                  ? (manualStartDate = $event)
+                  : (manualEndDate = $event)
+              "
+              @validate="updateManualInput($event, calendar)"
+              @error="handleManualInputError($event)"
+            />
+            <div class="py-5 border-b border-slate-50 dark:border-slate-700/50">
+              <div
+                class="flex flex-col items-center gap-2 px-5 min-w-[340px] max-h-[352px]"
+                :class="
+                  calendar === START_CALENDAR &&
+                  'ltr:border-r rtl:border-l border-slate-50 dark:border-slate-700/50'
+                "
+              >
+                <CalendarYear
+                  v-if="calendarViews[calendar] === YEAR"
+                  :calendar-type="calendar"
+                  :start-current-date="startCurrentDate"
+                  :end-current-date="endCurrentDate"
+                  @select-year="openCalendar($event, calendar, YEAR)"
+                />
+                <CalendarMonth
+                  v-else-if="calendarViews[calendar] === MONTH"
+                  :calendar-type="calendar"
+                  :start-current-date="startCurrentDate"
+                  :end-current-date="endCurrentDate"
+                  @select-month="openCalendar($event, calendar)"
+                  @set-view="setViewMode"
+                  @prev="moveCalendar(calendar, 'prev', YEAR)"
+                  @next="moveCalendar(calendar, 'next', YEAR)"
+                />
+                <CalendarWeek
+                  v-else-if="calendarViews[calendar] === WEEK"
+                  :calendar-type="calendar"
+                  :current-date="currentDate"
+                  :start-current-date="startCurrentDate"
+                  :end-current-date="endCurrentDate"
+                  :selected-start-date="selectedStartDate"
+                  :selected-end-date="selectedEndDate"
+                  :selecting-end-date="selectingEndDate"
+                  :hovered-end-date="hoveredEndDate"
+                  @update-hovered-end-date="hoveredEndDate = $event"
+                  @select-date="selectDate"
+                  @set-view="setViewMode"
+                  @prev="moveCalendar(calendar, 'prev')"
+                  @next="moveCalendar(calendar, 'next')"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+        <CalendarFooter @change="emitDateRange" @clear="resetDatePicker" />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarAction.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarAction.vue
new file mode 100644
index 0000000000000..447a83bf3493a
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarAction.vue
@@ -0,0 +1,79 @@
+<script setup>
+import { CALENDAR_PERIODS } from '../helpers/DatePickerHelper';
+
+defineProps({
+  calendarType: {
+    type: String,
+    default: 'start',
+  },
+  firstButtonLabel: {
+    type: String,
+    default: '',
+  },
+  buttonLabel: {
+    type: String,
+    default: '',
+  },
+  viewMode: {
+    type: String,
+    default: '',
+  },
+});
+const emit = defineEmits(['prev', 'next', 'set-view']);
+
+const { YEAR } = CALENDAR_PERIODS;
+
+const onClickPrev = type => {
+  emit('prev', type);
+};
+
+const onClickNext = type => {
+  emit('next', type);
+};
+
+const onClickSetView = (type, mode) => {
+  emit('set-view', type, mode);
+};
+</script>
+
+<template>
+  <div class="flex items-start justify-between w-full h-9">
+    <button
+      class="p-1 rounded-lg hover:bg-slate-75 dark:hover:bg-slate-700/50 rtl:rotate-180"
+      @click="onClickPrev(calendarType)"
+    >
+      <fluent-icon
+        icon="chevron-left"
+        size="14"
+        class="text-slate-900 dark:text-slate-50"
+      />
+    </button>
+    <div class="flex items-center gap-1">
+      <button
+        v-if="firstButtonLabel"
+        class="p-0 text-sm font-medium text-center text-slate-800 dark:text-slate-50 hover:text-woot-600 dark:hover:text-woot-600"
+        @click="onClickSetView(calendarType, viewMode)"
+      >
+        {{ firstButtonLabel }}
+      </button>
+      <button
+        v-if="buttonLabel"
+        class="p-0 text-sm font-medium text-center text-slate-800 dark:text-slate-50"
+        :class="{ 'hover:text-woot-600 dark:hover:text-woot-600': viewMode }"
+        @click="onClickSetView(calendarType, YEAR)"
+      >
+        {{ buttonLabel }}
+      </button>
+    </div>
+    <button
+      class="p-1 rounded-lg hover:bg-slate-75 dark:hover:bg-slate-700/50 rtl:rotate-180"
+      @click="onClickNext(calendarType)"
+    >
+      <fluent-icon
+        icon="chevron-right"
+        size="14"
+        class="text-slate-900 dark:text-slate-50"
+      />
+    </button>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateInput.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateInput.vue
new file mode 100644
index 0000000000000..b9fe88993ed74
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateInput.vue
@@ -0,0 +1,74 @@
+<script setup>
+import { computed } from 'vue';
+import { parse, isValid, isAfter, isBefore } from 'date-fns';
+import {
+  getIntlDateFormatForLocale,
+  CALENDAR_TYPES,
+} from '../helpers/DatePickerHelper';
+
+const props = defineProps({
+  calendarType: {
+    type: String,
+    default: '',
+  },
+  dateValue: Date,
+  compareDate: Date,
+  isDisabled: Boolean,
+});
+
+const emit = defineEmits(['update', 'validate', 'error']);
+
+const { START_CALENDAR, END_CALENDAR } = CALENDAR_TYPES;
+
+const dateFormat = computed(() => getIntlDateFormatForLocale()?.toUpperCase());
+
+const localDateValue = computed({
+  get: () => props.dateValue?.toLocaleDateString(navigator.language) || '',
+  set: newValue => {
+    const format = getIntlDateFormatForLocale();
+    const parsedDate = parse(newValue, format, new Date());
+    if (isValid(parsedDate)) {
+      emit('update', parsedDate);
+    }
+  },
+});
+
+const validateDate = () => {
+  if (!isValid(props.dateValue)) {
+    emit('error', `Please enter the date in valid format: ${dateFormat.value}`);
+    return;
+  }
+
+  const { calendarType, compareDate, dateValue } = props;
+  const isStartCalendar = calendarType === START_CALENDAR;
+  const isEndCalendar = calendarType === END_CALENDAR;
+
+  if (compareDate && isStartCalendar && isAfter(dateValue, compareDate)) {
+    emit('error', 'Start date must be before the end date.');
+  } else if (compareDate && isEndCalendar && isBefore(dateValue, compareDate)) {
+    emit('error', 'End date must be after the start date.');
+  } else {
+    emit('validate', dateValue);
+  }
+};
+</script>
+
+<template>
+  <div class="h-[82px] flex flex-col items-start px-5 gap-1.5 pt-4 w-full">
+    <span class="text-sm font-medium text-slate-800 dark:text-slate-50">
+      {{
+        calendarType === START_CALENDAR
+          ? $t('DATE_PICKER.DATE_RANGE_INPUT.START')
+          : $t('DATE_PICKER.DATE_RANGE_INPUT.END')
+      }}
+    </span>
+    <input
+      v-model="localDateValue"
+      type="text"
+      class="reset-base border bg-slate-25 dark:bg-slate-900 ring-offset-ash-900 border-slate-50 dark:border-slate-700/50 w-full disabled:text-slate-200 dark:disabled:text-slate-700 disabled:cursor-not-allowed text-slate-800 dark:text-slate-50 px-1.5 py-1 text-sm rounded-xl h-10"
+      :placeholder="dateFormat"
+      :disabled="isDisabled"
+      @keypress.enter="validateDate"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateRange.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateRange.vue
new file mode 100644
index 0000000000000..38d4dd76f041c
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateRange.vue
@@ -0,0 +1,41 @@
+<script setup>
+import { dateRanges } from '../helpers/DatePickerHelper';
+
+defineProps({
+  selectedRange: {
+    type: String,
+    default: '',
+  },
+});
+
+const emit = defineEmits(['set-range']);
+
+const setDateRange = range => {
+  emit('set-range', range);
+};
+</script>
+
+<template>
+  <div class="w-[200px] flex flex-col items-start">
+    <h4
+      class="w-full px-5 py-4 text-sm font-medium capitalize text-start text-slate-600 dark:text-slate-200"
+    >
+      {{ $t('DATE_PICKER.DATE_RANGE_OPTIONS.TITLE') }}
+    </h4>
+    <div class="flex flex-col items-start w-full">
+      <button
+        v-for="range in dateRanges"
+        :key="range.label"
+        class="w-full px-5 py-3 text-sm font-medium truncate border-none rounded-none text-start hover:bg-slate-50 dark:hover:bg-slate-700"
+        :class="
+          range.value === selectedRange
+            ? 'text-slate-800 dark:text-slate-50 bg-slate-50 dark:bg-slate-700'
+            : 'text-slate-600 dark:text-slate-200'
+        "
+        @click="setDateRange(range)"
+      >
+        {{ $t(range.label) }}
+      </button>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarFooter.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarFooter.vue
new file mode 100644
index 0000000000000..828044e1cab03
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarFooter.vue
@@ -0,0 +1,28 @@
+<script setup>
+const emit = defineEmits(['clear', 'apply']);
+
+const onClickClear = () => {
+  emit('clear');
+};
+
+const onClickApply = () => {
+  emit('change');
+};
+</script>
+
+<template>
+  <div class="h-[56px] flex justify-between px-5 py-3 items-center">
+    <button
+      class="p-1.5 rounded-lg w-fit text-sm font-medium text-slate-600 dark:text-slate-200 hover:text-slate-800 dark:hover:text-slate-100"
+      @click="onClickClear"
+    >
+      {{ $t('DATE_PICKER.CLEAR_BUTTON') }}
+    </button>
+    <button
+      class="p-1.5 rounded-lg w-fit text-sm font-medium text-woot-500 dark:text-woot-300 hover:text-woot-700 dark:hover:text-woot-500"
+      @click="onClickApply"
+    >
+      {{ $t('DATE_PICKER.APPLY_BUTTON') }}
+    </button>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarMonth.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarMonth.vue
new file mode 100644
index 0000000000000..ee68e73410f84
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarMonth.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { computed } from 'vue';
+import { format, getMonth, setMonth, startOfMonth } from 'date-fns';
+import {
+  yearName,
+  CALENDAR_TYPES,
+  CALENDAR_PERIODS,
+} from '../helpers/DatePickerHelper';
+
+import CalendarAction from './CalendarAction.vue';
+
+const props = defineProps({
+  calendarType: {
+    type: String,
+    default: 'start',
+  },
+  startCurrentDate: Date,
+  endCurrentDate: Date,
+});
+
+const { START_CALENDAR } = CALENDAR_TYPES;
+const { MONTH, YEAR } = CALENDAR_PERIODS;
+
+const months = Array.from({ length: 12 }, (_, index) =>
+  format(setMonth(startOfMonth(new Date()), index), 'MMM')
+);
+
+const activeMonthIndex = computed(() => {
+  const date =
+    props.calendarType === START_CALENDAR
+      ? props.startCurrentDate
+      : props.endCurrentDate;
+  return getMonth(date);
+});
+
+const emit = defineEmits(['select-month', 'prev', 'next', 'set-view']);
+
+const setViewMode = (type, mode) => {
+  emit('set-view', type, mode);
+};
+
+const onClickPrev = () => {
+  emit('prev');
+};
+
+const onClickNext = () => {
+  emit('next');
+};
+
+const selectMonth = index => {
+  emit('select-month', index);
+};
+</script>
+
+<template>
+  <div class="flex flex-col w-full gap-2 max-h-[312px]">
+    <CalendarAction
+      :view-mode="YEAR"
+      :calendar-type="calendarType"
+      :button-label="
+        yearName(
+          calendarType === START_CALENDAR ? startCurrentDate : endCurrentDate,
+          MONTH
+        )
+      "
+      @set-view="setViewMode"
+      @prev="onClickPrev"
+      @next="onClickNext"
+    />
+
+    <div class="grid w-full grid-cols-3 gap-x-3 gap-y-2 auto-rows-[61px]">
+      <button
+        v-for="(month, index) in months"
+        :key="index"
+        class="p-2 text-sm font-medium text-center text-slate-800 dark:text-slate-50 w-[92px] h-10 rounded-lg py-2.5 px-2 hover:bg-slate-75 dark:hover:bg-slate-700"
+        :class="{
+          'bg-woot-600 dark:bg-woot-600 text-white dark:text-white hover:bg-woot-500 dark:bg-woot-700':
+            index === activeMonthIndex,
+        }"
+        @click="selectMonth(index)"
+      >
+        {{ month }}
+      </button>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarWeek.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarWeek.vue
new file mode 100644
index 0000000000000..c448e3eb1a6e1
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarWeek.vue
@@ -0,0 +1,172 @@
+<script setup>
+import {
+  monthName,
+  yearName,
+  getWeeksForMonth,
+  isToday,
+  dayIsInRange,
+  isCurrentMonth,
+  isLastDayOfMonth,
+  isHoveringDayInRange,
+  isHoveringNextDayInRange,
+  CALENDAR_TYPES,
+  CALENDAR_PERIODS,
+} from '../helpers/DatePickerHelper';
+
+import CalendarWeekLabel from './CalendarWeekLabel.vue';
+import CalendarAction from './CalendarAction.vue';
+
+const props = defineProps({
+  calendarType: {
+    type: String,
+    default: 'start',
+  },
+  currentDate: Date,
+  startCurrentDate: Date,
+  endCurrentDate: Date,
+  selectedStartDate: Date,
+  selectingEndDate: Boolean,
+  selectedEndDate: Date,
+  hoveredEndDate: Date,
+});
+
+const emit = defineEmits([
+  'update-hovered-end-date',
+  'select-date',
+  'prev',
+  'next',
+  'set-view',
+]);
+
+const { START_CALENDAR } = CALENDAR_TYPES;
+const { MONTH } = CALENDAR_PERIODS;
+
+const emitHoveredEndDate = day => {
+  emit('update-hovered-end-date', day);
+};
+
+const emitSelectDate = day => {
+  emit('select-date', day);
+};
+const onClickPrev = () => {
+  emit('prev');
+};
+
+const onClickNext = () => {
+  emit('next');
+};
+
+const setViewMode = (type, mode) => {
+  emit('set-view', type, mode);
+};
+
+const weeks = calendarType => {
+  return getWeeksForMonth(
+    calendarType === START_CALENDAR
+      ? props.startCurrentDate
+      : props.endCurrentDate
+  );
+};
+
+const isSelectedStartOrEndDate = day => {
+  return (
+    dayIsInRange(day, props.selectedStartDate, props.selectedStartDate) ||
+    dayIsInRange(day, props.selectedEndDate, props.selectedEndDate)
+  );
+};
+
+const isInRange = day => {
+  return dayIsInRange(day, props.selectedStartDate, props.selectedEndDate);
+};
+
+const isInCurrentMonth = day => {
+  return isCurrentMonth(
+    day,
+    props.calendarType === START_CALENDAR
+      ? props.startCurrentDate
+      : props.endCurrentDate
+  );
+};
+
+const isHoveringInRange = day => {
+  return isHoveringDayInRange(
+    day,
+    props.selectedStartDate,
+    props.selectingEndDate,
+    props.hoveredEndDate
+  );
+};
+
+const isNextDayInRange = day => {
+  return isHoveringNextDayInRange(
+    day,
+    props.selectedStartDate,
+    props.selectedEndDate,
+    props.hoveredEndDate
+  );
+};
+
+const dayClasses = day => ({
+  'text-slate-500 dark:text-slate-400 pointer-events-none':
+    !isInCurrentMonth(day),
+  'text-slate-800 dark:text-slate-50 hover:text-slate-800 dark:hover:text-white hover:bg-woot-100 dark:hover:bg-woot-700':
+    isInCurrentMonth(day),
+  'bg-woot-600 dark:bg-woot-600 text-white dark:text-white':
+    isSelectedStartOrEndDate(day) && isInCurrentMonth(day),
+  'bg-woot-50 dark:bg-woot-800':
+    (isInRange(day) || isHoveringInRange(day)) &&
+    !isSelectedStartOrEndDate(day) &&
+    isInCurrentMonth(day),
+  'outline outline-1 outline-woot-200 -outline-offset-1 dark:outline-woot-700 text-woot-600 dark:text-woot-400':
+    isToday(props.currentDate, day) && !isSelectedStartOrEndDate(day),
+});
+</script>
+
+<template>
+  <div class="flex flex-col w-full gap-2 max-h-[312px]">
+    <CalendarAction
+      :view-mode="MONTH"
+      :calendar-type="calendarType"
+      :first-button-label="
+        monthName(
+          calendarType === START_CALENDAR ? startCurrentDate : endCurrentDate
+        )
+      "
+      :button-label="
+        yearName(
+          calendarType === START_CALENDAR ? startCurrentDate : endCurrentDate
+        )
+      "
+      @prev="onClickPrev"
+      @next="onClickNext"
+      @set-view="setViewMode"
+    />
+    <CalendarWeekLabel />
+    <div
+      v-for="week in weeks(calendarType)"
+      :key="week[0].getTime()"
+      class="grid max-w-md grid-cols-7 gap-2 mx-auto overflow-hidden rounded-lg"
+    >
+      <div
+        v-for="day in week"
+        :key="day.getTime()"
+        class="flex relative items-center justify-center w-9 h-8 py-1.5 px-2 font-medium text-sm rounded-lg cursor-pointer"
+        :class="dayClasses(day)"
+        @mouseenter="emitHoveredEndDate(day)"
+        @mouseleave="emitHoveredEndDate(null)"
+        @click="emitSelectDate(day)"
+      >
+        {{ day.getDate() }}
+        <span
+          v-if="
+            (isInRange(day) || isHoveringInRange(day)) &&
+            isNextDayInRange(day) &&
+            !isLastDayOfMonth(day) &&
+            isInCurrentMonth(day)
+          "
+          class="absolute bottom-0 w-6 h-8 ltr:-right-4 rtl:-left-4 bg-woot-50 dark:bg-woot-800 -z-10"
+        />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarWeekLabel.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarWeekLabel.vue
new file mode 100644
index 0000000000000..ebfe9a37462b7
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarWeekLabel.vue
@@ -0,0 +1,15 @@
+<script setup>
+import { calendarWeeks } from '../helpers/DatePickerHelper';
+</script>
+
+<template>
+  <div class="max-w-md mx-auto grid grid-cols-7 gap-2">
+    <div
+      v-for="day in calendarWeeks"
+      :key="day.id"
+      class="flex items-center justify-center font-medium text-sm w-9 h-7 py-1.5 px-2"
+    >
+      {{ day.label }}
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarYear.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarYear.vue
new file mode 100644
index 0000000000000..1f5e7224f76d6
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarYear.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { getYear, addYears, subYears } from 'date-fns';
+import { CALENDAR_TYPES } from '../helpers/DatePickerHelper';
+
+import CalendarAction from './CalendarAction.vue';
+
+const props = defineProps({
+  calendarType: {
+    type: String,
+    default: 'start',
+  },
+  startCurrentDate: Date,
+  endCurrentDate: Date,
+});
+
+const { START_CALENDAR } = CALENDAR_TYPES;
+
+const calculateStartYear = date => {
+  const year = getYear(date);
+  return year - (year % 10); // Align with the beginning of a decade
+};
+
+const startYear = ref(
+  calculateStartYear(
+    props.calendarType === START_CALENDAR
+      ? props.startCurrentDate
+      : props.endCurrentDate
+  )
+);
+
+const years = computed(() =>
+  Array.from({ length: 10 }, (_, i) => startYear.value + i)
+);
+
+const firstYear = computed(() => years.value[0]);
+const lastYear = computed(() => years.value[years.value.length - 1]);
+
+const activeYear = computed(() => {
+  const date =
+    props.calendarType === START_CALENDAR
+      ? props.startCurrentDate
+      : props.endCurrentDate;
+  return getYear(date);
+});
+
+const onClickPrev = () => {
+  startYear.value = subYears(new Date(startYear.value, 0, 1), 10).getFullYear();
+};
+
+const onClickNext = () => {
+  startYear.value = addYears(new Date(startYear.value, 0, 1), 10).getFullYear();
+};
+
+const emit = defineEmits(['select-year']);
+
+const selectYear = year => {
+  emit('select-year', year);
+};
+</script>
+
+<template>
+  <div class="flex flex-col w-full gap-2 max-h-[312px]">
+    <CalendarAction
+      :calendar-type="calendarType"
+      :button-label="`${firstYear} - ${lastYear}`"
+      @prev="onClickPrev"
+      @next="onClickNext"
+    />
+
+    <div class="grid grid-cols-2 gap-x-3 gap-y-2 w-full auto-rows-[47px]">
+      <button
+        v-for="year in years"
+        :key="year"
+        class="p-2 text-sm font-medium text-center text-slate-800 dark:text-slate-50 w-[144px] h-10 rounded-lg py-2.5 px-2 hover:bg-slate-75 dark:hover:bg-slate-700"
+        :class="{
+          'bg-woot-600 dark:bg-woot-600 text-white dark:text-white hover:bg-woot-500 dark:hover:bg-woot-700':
+            year === activeYear,
+        }"
+        @click="selectYear(year)"
+      >
+        {{ year }}
+      </button>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/DatePickerButton.vue b/app/javascript/dashboard/components/ui/DatePicker/components/DatePickerButton.vue
new file mode 100644
index 0000000000000..c5ae54b6f46b9
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/components/DatePickerButton.vue
@@ -0,0 +1,71 @@
+<script setup>
+import { computed } from 'vue';
+import { dateRanges } from '../helpers/DatePickerHelper';
+import { format, isSameYear, isValid } from 'date-fns';
+
+const props = defineProps({
+  selectedStartDate: Date,
+  selectedEndDate: Date,
+  selectedRange: {
+    type: String,
+    default: '',
+  },
+});
+
+const formatDateRange = computed(() => {
+  const startDate = props.selectedStartDate;
+  const endDate = props.selectedEndDate;
+
+  if (!isValid(startDate) || !isValid(endDate)) {
+    return 'Select a date range';
+  }
+
+  const formatString = isSameYear(startDate, endDate)
+    ? 'MMM d' // Same year: "Apr 1"
+    : 'MMM d yyyy'; // Different years: "Apr 1 2025"
+
+  if (isSameYear(startDate, new Date()) && isSameYear(endDate, new Date())) {
+    // Both dates are in the current year
+    return `${format(startDate, 'MMM d')} - ${format(endDate, 'MMM d')}`;
+  }
+  // At least one date is not in the current year
+  return `${format(startDate, formatString)} - ${format(
+    endDate,
+    formatString
+  )}`;
+});
+
+const activeDateRange = computed(
+  () => dateRanges.find(range => range.value === props.selectedRange).label
+);
+
+const emit = defineEmits(['open']);
+
+const openDatePicker = () => {
+  emit('open');
+};
+</script>
+
+<template>
+  <button
+    class="inline-flex relative items-center rounded-lg gap-2 py-1.5 px-3 h-8 bg-slate-50 dark:bg-slate-800 hover:bg-slate-50 dark:hover:bg-slate-800 active:bg-slate-75 dark:active:bg-slate-800"
+    @click="openDatePicker"
+  >
+    <fluent-icon
+      class="text-slate-800 dark:text-slate-50"
+      icon="calendar"
+      size="16"
+    />
+    <span class="text-sm font-medium text-slate-800 dark:text-slate-50">
+      {{ $t(activeDateRange) }}
+    </span>
+    <span class="text-sm font-medium text-slate-600 dark:text-slate-200">
+      {{ formatDateRange }}
+    </span>
+    <fluent-icon
+      class="text-slate-800 dark:text-slate-50"
+      icon="chevron-down"
+      size="14"
+    />
+  </button>
+</template>
diff --git a/app/javascript/dashboard/components/ui/DatePicker/helpers/DatePickerHelper.js b/app/javascript/dashboard/components/ui/DatePicker/helpers/DatePickerHelper.js
new file mode 100644
index 0000000000000..85e41603fd455
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/helpers/DatePickerHelper.js
@@ -0,0 +1,219 @@
+import {
+  startOfDay,
+  subDays,
+  endOfDay,
+  subMonths,
+  addMonths,
+  subYears,
+  addYears,
+  startOfMonth,
+  isSameMonth,
+  format,
+  startOfWeek,
+  addDays,
+  eachDayOfInterval,
+  endOfMonth,
+  isSameDay,
+  isWithinInterval,
+} from 'date-fns';
+
+// Constants for calendar and date ranges
+export const calendarWeeks = [
+  { id: 1, label: 'M' },
+  { id: 2, label: 'T' },
+  { id: 3, label: 'W' },
+  { id: 4, label: 'T' },
+  { id: 5, label: 'F' },
+  { id: 6, label: 'S' },
+  { id: 7, label: 'S' },
+];
+
+export const dateRanges = [
+  { label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_7_DAYS', value: 'last7days' },
+  { label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_30_DAYS', value: 'last30days' },
+  {
+    label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_3_MONTHS',
+    value: 'last3months',
+  },
+  {
+    label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_6_MONTHS',
+    value: 'last6months',
+  },
+  { label: 'DATE_PICKER.DATE_RANGE_OPTIONS.LAST_YEAR', value: 'lastYear' },
+  { label: 'DATE_PICKER.DATE_RANGE_OPTIONS.CUSTOM_RANGE', value: 'custom' },
+];
+
+export const DATE_RANGE_TYPES = {
+  LAST_7_DAYS: 'last7days',
+  LAST_30_DAYS: 'last30days',
+  LAST_3_MONTHS: 'last3months',
+  LAST_6_MONTHS: 'last6months',
+  LAST_YEAR: 'lastYear',
+  CUSTOM_RANGE: 'custom',
+};
+
+export const CALENDAR_TYPES = {
+  START_CALENDAR: 'start',
+  END_CALENDAR: 'end',
+};
+
+export const CALENDAR_PERIODS = {
+  WEEK: 'week',
+  MONTH: 'month',
+  YEAR: 'year',
+};
+
+// Utility functions for date operations
+export const monthName = currentDate => format(currentDate, 'MMMM');
+export const yearName = currentDate => format(currentDate, 'yyyy');
+
+export const getIntlDateFormatForLocale = () => {
+  const year = 2222;
+  const month = 12;
+  const day = 15;
+  const date = new Date(year, month - 1, day);
+  const formattedDate = new Intl.DateTimeFormat(navigator.language).format(
+    date
+  );
+  return formattedDate
+    .replace(`${year}`, 'yyyy')
+    .replace(`${month}`, 'MM')
+    .replace(`${day}`, 'dd');
+};
+
+// Utility functions for calendar operations
+export const chunk = (array, size) =>
+  Array.from({ length: Math.ceil(array.length / size) }, (_, index) =>
+    array.slice(index * size, index * size + size)
+  );
+
+export const getWeeksForMonth = (date, weekStartsOn = 1) => {
+  const startOfTheMonth = startOfMonth(date);
+  const startOfTheFirstWeek = startOfWeek(startOfTheMonth, { weekStartsOn });
+  const endOfTheLastWeek = addDays(startOfTheFirstWeek, 41); // Covering six weeks to fill the calendar
+  return chunk(
+    eachDayOfInterval({ start: startOfTheFirstWeek, end: endOfTheLastWeek }),
+    7
+  );
+};
+
+export const moveCalendarDate = (
+  calendar,
+  startCurrentDate,
+  endCurrentDate,
+  direction,
+  period
+) => {
+  const adjustFunctions = {
+    month: { prev: subMonths, next: addMonths },
+    year: { prev: subYears, next: addYears },
+  };
+
+  const adjust = adjustFunctions[period][direction];
+
+  if (calendar === 'start') {
+    const newStart = adjust(startCurrentDate, 1);
+    return { start: newStart, end: endCurrentDate };
+  }
+  const newEnd = adjust(endCurrentDate, 1);
+  return { start: startCurrentDate, end: newEnd };
+};
+
+// Date comparison functions
+export const isToday = (currentDate, date) =>
+  date.getDate() === currentDate.getDate() &&
+  date.getMonth() === currentDate.getMonth() &&
+  date.getFullYear() === currentDate.getFullYear();
+
+export const isCurrentMonth = (day, referenceDate) =>
+  isSameMonth(day, referenceDate);
+
+export const isLastDayOfMonth = day => {
+  const lastDay = endOfMonth(day);
+  return day.getDate() === lastDay.getDate();
+};
+
+export const dayIsInRange = (date, startDate, endDate) => {
+  if (!startDate || !endDate) {
+    return false;
+  }
+  // Normalize dates to ignore time differences
+  let startOfDayStart = startOfDay(startDate);
+  let startOfDayEnd = startOfDay(endDate);
+  // Swap if start is greater than end
+  if (startOfDayStart > startOfDayEnd) {
+    [startOfDayStart, startOfDayEnd] = [startOfDayEnd, startOfDayStart];
+  }
+  // Check if the date is within the interval or is the same as the start date
+  return (
+    isSameDay(date, startOfDayStart) ||
+    isWithinInterval(date, {
+      start: startOfDayStart,
+      end: startOfDayEnd,
+    })
+  );
+};
+
+// Handling hovering states in date range pickers
+export const isHoveringDayInRange = (
+  day,
+  startDate,
+  endDate,
+  hoveredEndDate
+) => {
+  if (endDate && hoveredEndDate && startDate <= hoveredEndDate) {
+    // Ensure the start date is not after the hovered end date
+    return isWithinInterval(day, { start: startDate, end: hoveredEndDate });
+  }
+  return false;
+};
+
+export const isHoveringNextDayInRange = (
+  day,
+  startDate,
+  endDate,
+  hoveredEndDate
+) => {
+  if (startDate && !endDate && hoveredEndDate) {
+    // If a start date is selected, and we're hovering (but haven't clicked an end date yet)
+    const nextDay = addDays(day, 1);
+    return isWithinInterval(nextDay, { start: startDate, end: hoveredEndDate });
+  }
+  if (startDate && endDate) {
+    // Normal range checking between selected start and end dates
+    const nextDay = addDays(day, 1);
+    return isWithinInterval(nextDay, { start: startDate, end: endDate });
+  }
+  return false;
+};
+
+// Helper func to determine active date ranges based on user selection
+export const getActiveDateRange = (range, currentDate) => {
+  const ranges = {
+    last7days: () => ({
+      start: startOfDay(subDays(currentDate, 6)),
+      end: endOfDay(currentDate),
+    }),
+    last30days: () => ({
+      start: startOfDay(subDays(currentDate, 29)),
+      end: endOfDay(currentDate),
+    }),
+    last3months: () => ({
+      start: startOfDay(subMonths(currentDate, 3)),
+      end: endOfDay(currentDate),
+    }),
+    last6months: () => ({
+      start: startOfDay(subMonths(currentDate, 6)),
+      end: endOfDay(currentDate),
+    }),
+    lastYear: () => ({
+      start: startOfDay(subMonths(currentDate, 12)),
+      end: endOfDay(currentDate),
+    }),
+    custom: () => ({ start: currentDate, end: currentDate }),
+  };
+
+  return (
+    ranges[range] || (() => ({ start: currentDate, end: currentDate }))
+  )();
+};
diff --git a/app/javascript/dashboard/components/ui/DatePicker/helpers/specs/DatePickerHelper.spec.js b/app/javascript/dashboard/components/ui/DatePicker/helpers/specs/DatePickerHelper.spec.js
new file mode 100644
index 0000000000000..3510ee0f31096
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/DatePicker/helpers/specs/DatePickerHelper.spec.js
@@ -0,0 +1,309 @@
+import {
+  monthName,
+  yearName,
+  getIntlDateFormatForLocale,
+  getWeeksForMonth,
+  isToday,
+  isCurrentMonth,
+  isLastDayOfMonth,
+  dayIsInRange,
+  getActiveDateRange,
+  isHoveringDayInRange,
+  isHoveringNextDayInRange,
+  moveCalendarDate,
+  chunk,
+} from '../DatePickerHelper';
+
+describe('Date formatting functions', () => {
+  const testDate = new Date(2020, 4, 15); // May 15, 2020
+
+  beforeEach(() => {
+    jest.spyOn(navigator, 'language', 'get').mockReturnValue('en-US');
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('returns the correct month name from a date', () => {
+    expect(monthName(testDate)).toBe('May');
+  });
+
+  it('returns the correct year from a date', () => {
+    expect(yearName(testDate)).toBe('2020');
+  });
+
+  it('returns the correct date format for the current locale en-US', () => {
+    const expected = 'MM/dd/yyyy';
+    expect(getIntlDateFormatForLocale()).toBe(expected);
+  });
+
+  it('returns the correct date format for the current locale en-IN', () => {
+    jest.spyOn(navigator, 'language', 'get').mockReturnValue('en-IN');
+    const expected = 'dd/MM/yyyy';
+    expect(getIntlDateFormatForLocale()).toBe(expected);
+  });
+});
+
+describe('chunk', () => {
+  const array = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+
+  it('correctly chunks an array into smaller arrays of given size', () => {
+    const expected = [
+      [1, 2, 3],
+      [4, 5, 6],
+      [7, 8, 9],
+    ];
+    expect(chunk(array, 3)).toEqual(expected);
+  });
+
+  it('handles arrays that do not divide evenly by the chunk size', () => {
+    const expected = [[1, 2], [3, 4], [5, 6], [7, 8], [9]];
+    expect(chunk(array, 2)).toEqual(expected);
+  });
+});
+
+describe('getWeeksForMonth', () => {
+  it('returns the correct weeks array for a month starting on Monday', () => {
+    const date = new Date(2020, 3, 1); // April 2020
+    const weeks = getWeeksForMonth(date, 1);
+    expect(weeks.length).toBe(6);
+    expect(weeks[0][0]).toEqual(new Date(2020, 2, 30)); // Check if first day of the first week is correct
+  });
+});
+
+describe('moveCalendarDate', () => {
+  it('handles the year transition when moving the start date backward by one month from January', () => {
+    const startDate = new Date(2021, 0, 1);
+    const endDate = new Date(2021, 0, 31);
+    const result = moveCalendarDate(
+      'start',
+      startDate,
+      endDate,
+      'prev',
+      'month'
+    );
+    const expectedStartDate = new Date(2020, 11, 1);
+    expect(result.start.toISOString()).toEqual(expectedStartDate.toISOString());
+    expect(result.end.toISOString()).toEqual(endDate.toISOString());
+  });
+
+  it('handles the year transition when moving the start date forward by one month from January', () => {
+    const startDate = new Date(2020, 0, 1);
+    const endDate = new Date(2020, 1, 31);
+    const result = moveCalendarDate(
+      'start',
+      startDate,
+      endDate,
+      'next',
+      'month'
+    );
+    const expectedStartDate = new Date(2020, 1, 1);
+    expect(result.start.toISOString()).toEqual(expectedStartDate.toISOString());
+    expect(result.end.toISOString()).toEqual(endDate.toISOString());
+  });
+
+  it('handles the year transition when moving the end date forward by one month from December', () => {
+    const startDate = new Date(2021, 11, 1);
+    const endDate = new Date(2021, 11, 31);
+    const result = moveCalendarDate('end', startDate, endDate, 'next', 'month');
+    const expectedEndDate = new Date(2022, 0, 31);
+    expect(result.start).toEqual(startDate);
+    expect(result.end.toISOString()).toEqual(expectedEndDate.toISOString());
+  });
+  it('handles the year transition when moving the end date backward by one month from December', () => {
+    const startDate = new Date(2021, 11, 1);
+    const endDate = new Date(2021, 11, 31);
+    const result = moveCalendarDate('end', startDate, endDate, 'prev', 'month');
+    const expectedEndDate = new Date(2021, 10, 30);
+
+    expect(result.start).toEqual(startDate);
+    expect(result.end.toISOString()).toEqual(expectedEndDate.toISOString());
+  });
+});
+
+describe('isToday', () => {
+  it('returns true if the dates are the same', () => {
+    const today = new Date();
+    const alsoToday = new Date(today);
+    expect(isToday(today, alsoToday)).toBeTruthy();
+  });
+
+  it('returns false if the dates are not the same', () => {
+    const today = new Date();
+    const notToday = new Date(
+      today.getFullYear(),
+      today.getMonth(),
+      today.getDate() - 1
+    );
+    expect(isToday(today, notToday)).toBeFalsy();
+  });
+});
+
+describe('isCurrentMonth', () => {
+  const referenceDate = new Date(2020, 6, 15); // July 15, 2020
+
+  it('returns true if the day is in the same month as the reference date', () => {
+    const testDay = new Date(2020, 6, 1);
+    expect(isCurrentMonth(testDay, referenceDate)).toBeTruthy();
+  });
+
+  it('returns false if the day is not in the same month as the reference date', () => {
+    const testDay = new Date(2020, 5, 30);
+    expect(isCurrentMonth(testDay, referenceDate)).toBeFalsy();
+  });
+});
+
+describe('isLastDayOfMonth', () => {
+  it('returns true if the day is the last day of the month', () => {
+    const testDay = new Date(2020, 6, 31); // July 31, 2020
+    expect(isLastDayOfMonth(testDay)).toBeTruthy();
+  });
+
+  it('returns false if the day is not the last day of the month', () => {
+    const testDay = new Date(2020, 6, 30); // July 30, 2020
+    expect(isLastDayOfMonth(testDay)).toBeFalsy();
+  });
+});
+
+describe('dayIsInRange', () => {
+  it('returns true if the date is within the range', () => {
+    const start = new Date(2020, 1, 10);
+    const end = new Date(2020, 1, 20);
+    const testDate = new Date(2020, 1, 15);
+    expect(dayIsInRange(testDate, start, end)).toBeTruthy();
+  });
+
+  it('returns true if the date is the same as the start date', () => {
+    const start = new Date(2020, 1, 10);
+    const end = new Date(2020, 1, 20);
+    const testDate = new Date(2020, 1, 10);
+    expect(dayIsInRange(testDate, start, end)).toBeTruthy();
+  });
+
+  it('returns false if the date is outside the range', () => {
+    const start = new Date(2020, 1, 10);
+    const end = new Date(2020, 1, 20);
+    const testDate = new Date(2020, 1, 9);
+    expect(dayIsInRange(testDate, start, end)).toBeFalsy();
+  });
+});
+
+describe('isHoveringDayInRange', () => {
+  const startDate = new Date(2020, 6, 10);
+  const endDate = new Date(2020, 6, 20);
+  const hoveredEndDate = new Date(2020, 6, 15);
+
+  it('returns true if the day is within the start and hovered end dates', () => {
+    const testDay = new Date(2020, 6, 12);
+    expect(
+      isHoveringDayInRange(testDay, startDate, endDate, hoveredEndDate)
+    ).toBeTruthy();
+  });
+
+  it('returns false if the day is outside the hovered date range', () => {
+    const testDay = new Date(2020, 6, 16);
+    expect(
+      isHoveringDayInRange(testDay, startDate, endDate, hoveredEndDate)
+    ).toBeFalsy();
+  });
+});
+
+describe('isHoveringNextDayInRange', () => {
+  const startDate = new Date(2020, 6, 10);
+  const hoveredEndDate = new Date(2020, 6, 15);
+
+  it('returns true if the next day after the given day is within the start and hovered end dates', () => {
+    const testDay = new Date(2020, 6, 14);
+    expect(
+      isHoveringNextDayInRange(testDay, startDate, null, hoveredEndDate)
+    ).toBeTruthy();
+  });
+
+  it('returns false if the next day is outside the start and hovered end dates', () => {
+    const testDay = new Date(2020, 6, 15);
+    expect(
+      isHoveringNextDayInRange(testDay, startDate, null, hoveredEndDate)
+    ).toBeFalsy();
+  });
+});
+
+describe('getActiveDateRange', () => {
+  const currentDate = new Date(2020, 5, 15, 12, 0); // May 15, 2020, at noon
+
+  beforeAll(() => {
+    // Mocking the current date to ensure consistency in tests
+    jest.useFakeTimers().setSystemTime(currentDate.getTime());
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('returns the correct range for "last7days"', () => {
+    const range = getActiveDateRange('last7days', new Date());
+    const expectedStart = new Date(2020, 5, 9);
+    expectedStart.setHours(0, 0, 0, 0);
+    const expectedEnd = new Date();
+    expectedEnd.setHours(23, 59, 59, 999);
+
+    expect(range.start).toEqual(expectedStart);
+    expect(range.end).toEqual(expectedEnd);
+  });
+
+  it('returns the correct range for "last30days"', () => {
+    const range = getActiveDateRange('last30days', new Date());
+    const expectedStart = new Date(2020, 4, 17);
+    expectedStart.setHours(0, 0, 0, 0);
+    const expectedEnd = new Date();
+    expectedEnd.setHours(23, 59, 59, 999);
+
+    expect(range.start).toEqual(expectedStart);
+    expect(range.end).toEqual(expectedEnd);
+  });
+
+  it('returns the correct range for "last3months"', () => {
+    const range = getActiveDateRange('last3months', new Date());
+    const expectedStart = new Date(2020, 2, 15);
+    expectedStart.setHours(0, 0, 0, 0);
+    const expectedEnd = new Date();
+    expectedEnd.setHours(23, 59, 59, 999);
+
+    expect(range.start).toEqual(expectedStart);
+    expect(range.end).toEqual(expectedEnd);
+  });
+
+  it('returns the correct range for "last6months"', () => {
+    const range = getActiveDateRange('last6months', new Date());
+    const expectedStart = new Date(2019, 11, 15);
+    expectedStart.setHours(0, 0, 0, 0);
+    const expectedEnd = new Date();
+    expectedEnd.setHours(23, 59, 59, 999);
+
+    expect(range.start).toEqual(expectedStart);
+    expect(range.end).toEqual(expectedEnd);
+  });
+
+  it('returns the correct range for "lastYear"', () => {
+    const range = getActiveDateRange('lastYear', new Date());
+    const expectedStart = new Date(2019, 5, 15);
+    expectedStart.setHours(0, 0, 0, 0);
+    const expectedEnd = new Date();
+    expectedEnd.setHours(23, 59, 59, 999);
+
+    expect(range.start).toEqual(expectedStart);
+    expect(range.end).toEqual(expectedEnd);
+  });
+
+  it('returns the correct range for "custom date range"', () => {
+    const range = getActiveDateRange('custom', new Date());
+    expect(range.start).toEqual(new Date(currentDate));
+    expect(range.end).toEqual(new Date(currentDate));
+  });
+
+  it('handles an unknown range label gracefully', () => {
+    const range = getActiveDateRange('unknown', new Date());
+    expect(range.start).toEqual(new Date(currentDate));
+    expect(range.end).toEqual(new Date(currentDate));
+  });
+});
diff --git a/app/javascript/dashboard/components/ui/HelperTextPopup.vue b/app/javascript/dashboard/components/ui/HelperTextPopup.vue
new file mode 100644
index 0000000000000..fb14692f6d6f5
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/HelperTextPopup.vue
@@ -0,0 +1,24 @@
+<script setup>
+defineProps({
+  message: {
+    type: String,
+    default: '',
+  },
+});
+</script>
+<template>
+  <div class="relative group w-[inherit] whitespace-normal z-20">
+    <fluent-icon
+      icon="info"
+      size="14"
+      class="mt-0.5 text-slate-600 absolute dark:text-slate-400"
+    />
+    <div
+      class="bg-white dark:bg-slate-900 w-fit ltr:left-4 rtl:right-4 top-0 border p-2.5 group-hover:flex items-center hidden absolute border-slate-75 dark:border-slate-800 rounded-lg shadow-md"
+    >
+      <p class="text-slate-800 dark:text-slate-75 mb-0 text-xs">
+        {{ message }}
+      </p>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
index 2d7951b0582a4..a64743547c750 100644
--- a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
+++ b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
@@ -40,8 +40,7 @@ import AIAssistanceModal from './AIAssistanceModal.vue';
 import adminMixin from 'dashboard/mixins/aiMixin';
 import aiMixin from 'dashboard/mixins/isAdmin';
 import { CMD_AI_ASSIST } from 'dashboard/routes/dashboard/commands/commandBarBusEvents';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
-import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import AIAssistanceCTAButton from './AIAssistanceCTAButton.vue';
 
@@ -51,7 +50,7 @@ export default {
     AICTAModal,
     AIAssistanceCTAButton,
   },
-  mixins: [aiMixin, eventListenerMixins, adminMixin, uiSettingsMixin],
+  mixins: [aiMixin, keyboardEventListenerMixins, adminMixin, uiSettingsMixin],
   data: () => ({
     showAIAssistanceModal: false,
     showAICtaModal: false,
@@ -87,14 +86,17 @@ export default {
   },
 
   methods: {
-    onKeyDownHandler(event) {
-      const keyPattern = buildHotKeys(event);
-      const shouldRevertTheContent =
-        ['meta+z', 'ctrl+z'].includes(keyPattern) && !!this.initialMessage;
-      if (shouldRevertTheContent) {
-        this.$emit('replace-text', this.initialMessage);
-        this.initialMessage = '';
-      }
+    getKeyboardEvents() {
+      return {
+        '$mod+KeyZ': {
+          action: () => {
+            if (this.initialMessage) {
+              this.$emit('replace-text', this.initialMessage);
+              this.initialMessage = '';
+            }
+          },
+        },
+      };
     },
     hideAIAssistanceModal() {
       this.recordAnalytics('DISMISS_AI_SUGGESTION', {
diff --git a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
index f73474977329c..32af9e4991fe4 100644
--- a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
+++ b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
@@ -1,17 +1,17 @@
 <template>
-  <div class="preview-item__wrap flex overflow-auto max-h-[12.5rem]">
+  <div class="flex overflow-auto max-h-[12.5rem]">
     <div
-      v-for="(attachment, index) in attachments"
+      v-for="(attachment, index) in nonRecordedAudioAttachments"
       :key="attachment.id"
       class="preview-item flex items-center p-1 bg-slate-50 dark:bg-slate-800 gap-1 rounded-md w-[15rem] mb-1"
     >
       <div class="max-w-[4rem] flex-shrink-0 w-6 flex items-center">
         <img
           v-if="isTypeImage(attachment.resource)"
-          class="image-thumb"
+          class="object-cover w-6 h-6 rounded-sm"
           :src="attachment.thumb"
         />
-        <span v-else class="w-6 h-6 text-lg relative -top-px text-left">
+        <span v-else class="relative w-6 h-6 text-lg text-left -top-px">
           📄
         </span>
       </div>
@@ -23,73 +23,62 @@
         </span>
       </div>
       <div class="w-[30%] justify-center">
-        <span
-          class="item overflow-hidden text-xs text-ellipsis whitespace-nowrap"
-        >
+        <span class="overflow-hidden text-xs text-ellipsis whitespace-nowrap">
           {{ formatFileSize(attachment.resource) }}
         </span>
       </div>
       <div class="flex items-center justify-center">
         <woot-button
-          v-if="!isTypeAudio(attachment.resource)"
-          class="remove--attachment clear secondary"
+          class="!w-6 !h-6 text-sm rounded-md hover:bg-slate-50 dark:hover:bg-slate-800 clear secondary"
           icon="dismiss"
-          @click="() => onRemoveAttachment(index)"
+          @click="onRemoveAttachment(index)"
         />
       </div>
     </div>
   </div>
 </template>
-<script>
+
+<script setup>
+import { computed } from 'vue';
 import { formatBytes } from 'shared/helpers/FileHelper';
-export default {
-  props: {
-    attachments: {
-      type: Array,
-      default: () => [],
-    },
-    removeAttachment: {
-      type: Function,
-      default: () => {},
-    },
-  },
-  methods: {
-    onRemoveAttachment(index) {
-      this.removeAttachment(index);
-    },
-    formatFileSize(file) {
-      const size = file.byte_size || file.size;
-      return formatBytes(size, 0);
-    },
-    isTypeImage(file) {
-      const type = file.content_type || file.type;
-      return type.includes('image');
-    },
-    isTypeAudio(file) {
-      const type = file.content_type || file.type;
-      return type.includes('audio');
-    },
-    fileName(file) {
-      return file.filename || file.name;
-    },
+
+const props = defineProps({
+  attachments: {
+    type: Array,
+    default: () => [],
   },
+});
+
+const emits = defineEmits(['remove-attachment']);
+
+const nonRecordedAudioAttachments = computed(() => {
+  return props.attachments.filter(attachment => !attachment?.isRecordedAudio);
+});
+
+const recordedAudioAttachments = computed(() =>
+  props.attachments.filter(attachment => attachment.isRecordedAudio)
+);
+
+const onRemoveAttachment = itemIndex => {
+  emits(
+    'remove-attachment',
+    nonRecordedAudioAttachments.value
+      .filter((_, index) => index !== itemIndex)
+      .concat(recordedAudioAttachments.value)
+  );
 };
-</script>
-<style lang="scss" scoped>
-.image-thumb {
-  @apply w-6 h-6 object-cover rounded-sm;
-}
 
-.file-name-wrap,
-.file-size-wrap {
-  @apply flex items-center py-0 px-1;
+const formatFileSize = file => {
+  const size = file.byte_size || file.size;
+  return formatBytes(size, 0);
+};
 
-  > .item {
-    @apply m-0 overflow-hidden text-xs font-medium;
-  }
-}
+const isTypeImage = file => {
+  const type = file.content_type || file.type;
+  return type.includes('image');
+};
 
-.remove--attachment {
-  @apply w-6 h-6 rounded-md text-sm cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-800;
-}
-</style>
+const fileName = file => {
+  return file.filename || file.name;
+};
+</script>
diff --git a/app/javascript/dashboard/components/widgets/ChatTypeTabs.vue b/app/javascript/dashboard/components/widgets/ChatTypeTabs.vue
index 64db13f5c22bf..86e80748d70da 100644
--- a/app/javascript/dashboard/components/widgets/ChatTypeTabs.vue
+++ b/app/javascript/dashboard/components/widgets/ChatTypeTabs.vue
@@ -10,11 +10,10 @@
 </template>
 <script>
 import wootConstants from 'dashboard/constants/globals';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
-import { hasPressedAltAndNKey } from 'shared/helpers/KeyboardHelpers';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 
 export default {
-  mixins: [eventListenerMixins],
+  mixins: [keyboardEventListenerMixins],
   props: {
     items: {
       type: Array,
@@ -31,14 +30,18 @@ export default {
     },
   },
   methods: {
-    handleKeyEvents(e) {
-      if (hasPressedAltAndNKey(e)) {
-        if (this.activeTab === wootConstants.ASSIGNEE_TYPE.ALL) {
-          this.onTabChange(0);
-        } else {
-          this.onTabChange(this.activeTabIndex + 1);
-        }
-      }
+    getKeyboardEvents() {
+      return {
+        'Alt+KeyN': {
+          action: () => {
+            if (this.activeTab === wootConstants.ASSIGNEE_TYPE.ALL) {
+              this.onTabChange(0);
+            } else {
+              this.onTabChange(this.activeTabIndex + 1);
+            }
+          },
+        },
+      };
     },
     onTabChange(selectedTabIndex) {
       if (this.items[selectedTabIndex].key !== this.activeTab) {
diff --git a/app/javascript/dashboard/components/widgets/ColorPicker.vue b/app/javascript/dashboard/components/widgets/ColorPicker.vue
index 8e8ac89b52876..12b9124cfb74a 100644
--- a/app/javascript/dashboard/components/widgets/ColorPicker.vue
+++ b/app/javascript/dashboard/components/widgets/ColorPicker.vue
@@ -18,13 +18,11 @@
 
 <script>
 import { Chrome } from 'vue-color';
-import { mixin as clickaway } from 'vue-clickaway';
 
 export default {
   components: {
     Chrome,
   },
-  mixins: [clickaway],
   props: {
     value: {
       type: String,
diff --git a/app/javascript/dashboard/components/widgets/LabelSelector.vue b/app/javascript/dashboard/components/widgets/LabelSelector.vue
index 127610ac33dbb..97da49ac72f4c 100644
--- a/app/javascript/dashboard/components/widgets/LabelSelector.vue
+++ b/app/javascript/dashboard/components/widgets/LabelSelector.vue
@@ -31,15 +31,9 @@
 
 <script>
 import AddLabel from 'shared/components/ui/dropdown/AddLabel.vue';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import LabelDropdown from 'shared/components/ui/label/LabelDropdown.vue';
-import { mixin as clickaway } from 'vue-clickaway';
 import adminMixin from 'dashboard/mixins/isAdmin';
-import {
-  buildHotKeys,
-  isEscape,
-  isActiveElementTypeable,
-} from 'shared/helpers/KeyboardHelpers';
 
 export default {
   components: {
@@ -47,7 +41,7 @@ export default {
     LabelDropdown,
   },
 
-  mixins: [clickaway, adminMixin, eventListenerMixins],
+  mixins: [adminMixin, keyboardEventListenerMixins],
 
   props: {
     allLabels: {
@@ -88,17 +82,19 @@ export default {
     closeDropdownLabel() {
       this.showSearchDropdownLabel = false;
     },
-
-    handleKeyEvents(e) {
-      const keyPattern = buildHotKeys(e);
-
-      if (keyPattern === 'l' && !isActiveElementTypeable(e)) {
-        this.toggleLabels();
-        e.preventDefault();
-      } else if (isEscape(e) && this.showSearchDropdownLabel) {
-        this.closeDropdownLabel();
-        e.preventDefault();
-      }
+    getKeyboardEvents() {
+      return {
+        KeyL: {
+          action: e => {
+            this.toggleLabels();
+            e.preventDefault();
+          },
+        },
+        Escape: {
+          action: () => this.closeDropdownLabel(),
+          allowOnFocusedInput: true,
+        },
+      };
     },
   },
 };
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
index 16808ef791e82..aa566fd4db349 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
@@ -5,6 +5,7 @@
 </template>
 
 <script>
+import getUuid from 'widget/helpers/uuid';
 import 'video.js/dist/video-js.css';
 import 'videojs-record/dist/css/videojs.record.css';
 
@@ -28,9 +29,25 @@ import OpusRecorderEngine from 'videojs-record/dist/plugins/videojs.record.opus-
 
 import { format, addSeconds } from 'date-fns';
 import { AUDIO_FORMATS } from 'shared/constants/messages';
+import { convertWavToMp3 } from './utils/mp3ConversionUtils';
 
 WaveSurfer.microphone = MicrophonePlugin;
 
+const RECORDER_CONFIG = {
+  [AUDIO_FORMATS.WAV]: {
+    audioMimeType: 'audio/wav',
+    audioWorkerURL: waveWorker,
+  },
+  [AUDIO_FORMATS.MP3]: {
+    audioMimeType: 'audio/wav',
+    audioWorkerURL: waveWorker,
+  },
+  [AUDIO_FORMATS.OGG]: {
+    audioMimeType: 'audio/ogg',
+    audioWorkerURL: encoderWorker,
+  },
+};
+
 export default {
   name: 'WootAudioRecorder',
   mixins: [alertMixin],
@@ -39,6 +56,10 @@ export default {
       type: String,
       default: AUDIO_FORMATS.WAV,
     },
+    isAWhatsAppChannel: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -88,14 +109,7 @@ export default {
             audioSampleRate: 48000,
             audioBitRate: 128,
             audioEngine: 'opus-recorder',
-            ...(this.audioRecordFormat === AUDIO_FORMATS.WAV && {
-              audioMimeType: 'audio/wav',
-              audioWorkerURL: waveWorker,
-            }),
-            ...(this.audioRecordFormat === AUDIO_FORMATS.OGG && {
-              audioMimeType: 'audio/ogg',
-              audioWorkerURL: encoderWorker,
-            }),
+            ...RECORDER_CONFIG[this.audioRecordFormat],
           },
         },
       },
@@ -133,7 +147,11 @@ export default {
   methods: {
     deviceReady() {
       if (this.player.record().engine instanceof OpusRecorderEngine) {
-        if (this.audioRecordFormat === AUDIO_FORMATS.WAV) {
+        if (
+          [AUDIO_FORMATS.WAV, AUDIO_FORMATS.MP3].includes(
+            this.audioRecordFormat
+          )
+        ) {
           this.player.record().engine.audioType = 'audio/wav';
         }
       }
@@ -145,12 +163,16 @@ export default {
     stopRecord() {
       this.fireStateRecorderChanged('stopped');
     },
-    finishRecord() {
-      const file = new File(
-        [this.player.recordedData],
-        this.player.recordedData.name,
-        { type: this.player.recordedData.type }
-      );
+    async finishRecord() {
+      let recordedContent = this.player.recordedData;
+      let fileName = this.player.recordedData.name;
+      let type = this.player.recordedData.type;
+      if (this.audioRecordFormat === AUDIO_FORMATS.MP3) {
+        recordedContent = await convertWavToMp3(this.player.recordedData);
+        fileName = `${getUuid()}.mp3`;
+        type = AUDIO_FORMATS.MP3;
+      }
+      const file = new File([recordedContent], fileName, { type });
       this.fireRecorderBlob(file);
     },
     progressRecord() {
@@ -231,7 +253,20 @@ export default {
     @apply bg-transparent max-h-60 min-h-[3rem] pt-4 px-0 pb-0 resize-none;
   }
 }
-.video-js .vjs-control-bar {
-  background-color: transparent;
+
+// Added to override the default text and bg style to support dark and light mode.
+.video-js .vjs-control-bar,
+.vjs-record.video-js .vjs-control.vjs-record-indicator:before {
+  @apply text-slate-600 dark:text-slate-200 bg-transparent dark:bg-transparent;
+}
+
+// Added to fix  div overlays the screen and takes over the button clicks
+// https://github.com/collab-project/videojs-record/issues/688
+// https://github.com/collab-project/videojs-record/pull/709
+.vjs-record.video-js .vjs-control.vjs-record-indicator.vjs-hidden,
+.vjs-record.video-js .vjs-control.vjs-record-indicator,
+.vjs-record.video-js .vjs-control.vjs-record-indicator:before,
+.vjs-record.video-js .vjs-control.vjs-record-indicator:after {
+  @apply pointer-events-none;
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index caa6e235e59d6..61ee2c2debc83 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -78,10 +78,8 @@ const MAXIMUM_FILE_UPLOAD_SIZE = 4; // in MB
 import {
   hasPressedEnterAndNotCmdOrShift,
   hasPressedCommandAndEnter,
-  hasPressedAltAndPKey,
-  hasPressedAltAndLKey,
 } from 'shared/helpers/KeyboardHelpers';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import { isEditorHotKeyEnabled } from 'dashboard/mixins/uiSettings';
 import {
@@ -121,7 +119,7 @@ const createState = (
 export default {
   name: 'WootMessageEditor',
   components: { TagAgents, CannedResponse, VariableList },
-  mixins: [eventListenerMixins, uiSettingsMixin, alertMixin],
+  mixins: [keyboardEventListenerMixins, uiSettingsMixin, alertMixin],
   props: {
     value: { type: String, default: '' },
     editorId: { type: String, default: '' },
@@ -522,13 +520,21 @@ export default {
     isCmdPlusEnterToSendEnabled() {
       return isEditorHotKeyEnabled(this.uiSettings, 'cmd_enter');
     },
-    handleKeyEvents(e) {
-      if (hasPressedAltAndPKey(e)) {
-        this.focusEditorInputField();
-      }
-      if (hasPressedAltAndLKey(e)) {
-        this.focusEditorInputField();
-      }
+    getKeyboardEvents() {
+      return {
+        'Alt+KeyP': {
+          action: () => {
+            this.focusEditorInputField();
+          },
+          allowOnFocusedInput: true,
+        },
+        'Alt+KeyL': {
+          action: () => {
+            this.focusEditorInputField();
+          },
+          allowOnFocusedInput: true,
+        },
+      };
     },
     focusEditorInputField(pos = 'end') {
       const { tr } = this.editorView.state;
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue b/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
index da678306ad48f..df676e35c201e 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
@@ -25,7 +25,7 @@ import {
 } from '@chatwoot/prosemirror-schema';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import alertMixin from 'shared/mixins/alertMixin';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 
 const MAXIMUM_FILE_UPLOAD_SIZE = 4; // in MB
@@ -51,7 +51,7 @@ const createState = (
 };
 
 export default {
-  mixins: [eventListenerMixins, uiSettingsMixin, alertMixin],
+  mixins: [keyboardEventListenerMixins, uiSettingsMixin, alertMixin],
   props: {
     value: { type: String, default: '' },
     editorId: { type: String, default: '' },
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index dd907f83e0783..d0b31ec8b7dd0 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -136,8 +136,7 @@
 <script>
 import FileUpload from 'vue-upload-component';
 import * as ActiveStorage from 'activestorage';
-import { hasPressedAltAndAKey } from 'shared/helpers/KeyboardHelpers';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
@@ -154,7 +153,7 @@ import { mapGetters } from 'vuex';
 export default {
   name: 'ReplyBottomPanel',
   components: { FileUpload, VideoCallButton, AIAssistanceButton },
-  mixins: [eventListenerMixins, uiSettingsMixin, inboxMixin],
+  mixins: [keyboardEventListenerMixins, uiSettingsMixin, inboxMixin],
   props: {
     mode: {
       type: String,
@@ -340,10 +339,15 @@ export default {
     ActiveStorage.start();
   },
   methods: {
-    handleKeyEvents(e) {
-      if (hasPressedAltAndAKey(e)) {
-        this.$refs.upload.$children[1].$el.click();
-      }
+    getKeyboardEvents() {
+      return {
+        'Alt+KeyA': {
+          action: () => {
+            this.$refs.upload.$children[1].$el.click();
+          },
+          allowOnFocusedInput: true,
+        },
+      };
     },
     toggleMessageSignature() {
       this.setSignatureFlagForInbox(this.channelType, !this.sendWithSignature);
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
index 43f19e55ade0f..d916116acf5b9 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-black-50 flex justify-between dark:bg-slate-800">
+  <div class="flex justify-between bg-black-50 dark:bg-slate-800">
     <div class="button-group">
       <woot-button
         variant="clear"
@@ -20,7 +20,7 @@
         {{ $t('CONVERSATION.REPLYBOX.PRIVATE_NOTE') }}
       </woot-button>
     </div>
-    <div class="flex items-center my-0 mx-4">
+    <div class="flex items-center mx-4 my-0">
       <div v-if="isMessageLengthReachingThreshold" class="text-xs">
         <span :class="charLengthClass">
           {{ characterLengthWarning }}
@@ -48,14 +48,10 @@
 
 <script>
 import { REPLY_EDITOR_MODES, CHAR_LENGTH_WARNING } from './constants';
-import {
-  hasPressedAltAndPKey,
-  hasPressedAltAndLKey,
-} from 'shared/helpers/KeyboardHelpers';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 export default {
   name: 'ReplyTopPanel',
-  mixins: [eventListenerMixins],
+  mixins: [keyboardEventListenerMixins],
   props: {
     mode: {
       type: String,
@@ -99,13 +95,17 @@ export default {
     },
   },
   methods: {
-    handleKeyEvents(e) {
-      if (hasPressedAltAndPKey(e)) {
-        this.handleNoteClick();
-      }
-      if (hasPressedAltAndLKey(e)) {
-        this.handleReplyClick();
-      }
+    getKeyboardEvents() {
+      return {
+        'Alt+KeyP': {
+          action: () => this.handleNoteClick(),
+          allowOnFocusedInput: true,
+        },
+        'Alt+KeyL': {
+          action: () => this.handleReplyClick(),
+          allowOnFocusedInput: true,
+        },
+      };
     },
     handleReplyClick() {
       this.setReplyMode(REPLY_EDITOR_MODES.REPLY);
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/utils/mp3ConversionUtils.js b/app/javascript/dashboard/components/widgets/WootWriter/utils/mp3ConversionUtils.js
new file mode 100644
index 0000000000000..1cf9a998aeffc
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/WootWriter/utils/mp3ConversionUtils.js
@@ -0,0 +1,53 @@
+import lamejs from 'lamejs';
+/**
+ * Encodes a mono channel audio stream to MP3 format.
+ * @param {number} channels - Number of audio channels.
+ * @param {number} sampleRate - Sample rate in Hz.
+ * @param {Int16Array} samples - Audio samples to be encoded.
+ * @returns {Blob} - The MP3 encoded audio as a Blob.
+ */
+export const encodeToMP3 = (channels, sampleRate, samples) => {
+  const outputBuffer = [];
+  const encoder = new lamejs.Mp3Encoder(channels, sampleRate, 128);
+  const maxSamplesPerFrame = 1152;
+
+  for (let offset = 0; offset < samples.length; offset += maxSamplesPerFrame) {
+    const sliceEnd = Math.min(offset + maxSamplesPerFrame, samples.length);
+    const sampleSlice = samples.subarray(offset, sliceEnd);
+    const mp3Buffer = encoder.encodeBuffer(sampleSlice);
+
+    if (mp3Buffer.length > 0) {
+      outputBuffer.push(new Int8Array(mp3Buffer));
+    }
+  }
+
+  const remainingData = encoder.flush();
+  if (remainingData.length > 0) {
+    outputBuffer.push(new Int8Array(remainingData));
+  }
+
+  return new Blob(outputBuffer, { type: 'audio/mp3' });
+};
+
+/**
+ * Converts a WAV audio Blob to an MP3 format Blob.
+ * @param {Blob} blob - The audio data in WAV format as a Blob.
+ * @returns {Promise<Blob>} - A Blob containing the MP3 encoded audio.
+ */
+export const convertWavToMp3 = async blob => {
+  try {
+    const audioBuffer = await blob.arrayBuffer();
+    const wavHeader = lamejs.WavHeader.readHeader(new DataView(audioBuffer));
+    const samples = new Int16Array(
+      audioBuffer,
+      wavHeader.dataOffset,
+      wavHeader.dataLen / 2
+    );
+
+    return encodeToMP3(wavHeader.channels, wavHeader.sampleRate, samples);
+  } catch (error) {
+    // eslint-disable-next-line
+    console.log('Failed to convert WAV to MP3:', error);
+    throw new Error('Conversion from WAV to MP3 failed.');
+  }
+};
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
index f424fb693bf64..fbf99a631094d 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -45,7 +45,6 @@
 <script>
 import wootConstants from 'dashboard/constants/globals';
 import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
 import FilterItem from './FilterItem.vue';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 
@@ -53,7 +52,7 @@ export default {
   components: {
     FilterItem,
   },
-  mixins: [clickaway, uiSettingsMixin],
+  mixins: [uiSettingsMixin],
   data() {
     return {
       showActionsDropdown: false,
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 712efdee0bfbf..6e922bb868eb8 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -2,7 +2,7 @@
   <div
     class="relative flex items-start flex-grow-0 flex-shrink-0 w-auto max-w-full px-4 py-0 border-t-0 border-b-0 border-l-2 border-r-0 border-transparent border-solid cursor-pointer conversation hover:bg-slate-25 dark:hover:bg-slate-800 group"
     :class="{
-      'animate-card-select bg-slate-25 dark:bg-slate-800 border-woot-500':
+      'active animate-card-select bg-slate-25 dark:bg-slate-800 border-woot-500':
         isActiveChat,
       'unread-chat': hasUnread,
       'has-inbox-name': showInboxName,
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 165c34effb306..fc936e6832691 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -77,11 +77,10 @@
   </div>
 </template>
 <script>
-import { hasPressedAltAndOKey } from 'shared/helpers/KeyboardHelpers';
 import { mapGetters } from 'vuex';
 import agentMixin from '../../../mixins/agentMixin.js';
 import BackButton from '../BackButton.vue';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import InboxName from '../InboxName.vue';
 import MoreActions from './MoreActions.vue';
@@ -99,7 +98,7 @@ export default {
     Thumbnail,
     SLACardLabel,
   },
-  mixins: [inboxMixin, agentMixin, eventListenerMixins],
+  mixins: [inboxMixin, agentMixin, keyboardEventListenerMixins],
   props: {
     chat: {
       type: Object,
@@ -182,10 +181,12 @@ export default {
   },
 
   methods: {
-    handleKeyEvents(e) {
-      if (hasPressedAltAndOKey(e)) {
-        this.$emit('contact-panel-toggle');
-      }
+    getKeyboardEvents() {
+      return {
+        'Alt+KeyO': {
+          action: () => this.$emit('contact-panel-toggle'),
+        },
+      };
     },
   },
 };
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 3925312ee7a0b..20222a31ec04d 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -14,11 +14,7 @@
           @click="retrySendMessage"
         />
       </div>
-      <div
-        v-tooltip.top-start="messageToolTip"
-        :class="bubbleClass"
-        @contextmenu="openContextMenu($event)"
-      >
+      <div :class="bubbleClass" @contextmenu="openContextMenu($event)">
         <bubble-mail-head
           :email-attributes="contentAttributes.email"
           :cc="emailHeadAttributes.cc"
@@ -90,7 +86,7 @@
           :id="data.id"
           :sender="data.sender"
           :story-sender="storySender"
-          :external-error="externalError"
+          :external-error="errorMessageTooltip"
           :story-id="`${storyId}`"
           :is-a-tweet="isATweet"
           :is-a-whatsapp-channel="isAWhatsAppChannel"
@@ -412,14 +408,11 @@ export default {
           }
         : false;
     },
-    messageToolTip() {
-      if (this.isMessageDeleted) {
-        return false;
-      }
+    errorMessageTooltip() {
       if (this.isFailed) {
         return this.externalError || this.$t(`CONVERSATION.SEND_FAILED`);
       }
-      return false;
+      return '';
     },
     wrapClass() {
       return {
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 331017f96a737..17d875f56ecc9 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -116,13 +116,12 @@ import conversationMixin, {
 } from '../../../mixins/conversations';
 import inboxMixin, { INBOX_FEATURES } from 'shared/mixins/inboxMixin';
 import configMixin from 'shared/mixins/configMixin';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import aiMixin from 'dashboard/mixins/aiMixin';
 
 // utils
 import { getTypingUsersText } from '../../../helper/commons';
 import { calculateScrollTop } from './helpers/scrollTopCalculationHelper';
-import { isEscape } from 'shared/helpers/KeyboardHelpers';
 import { LocalStorage } from 'shared/helpers/localStorage';
 
 // constants
@@ -141,7 +140,7 @@ export default {
   mixins: [
     conversationMixin,
     inboxMixin,
-    eventListenerMixins,
+    keyboardEventListenerMixins,
     configMixin,
     aiMixin,
   ],
@@ -418,10 +417,12 @@ export default {
     closePopoutReplyBox() {
       this.isPopoutReplyBox = false;
     },
-    handleKeyEvents(e) {
-      if (isEscape(e)) {
-        this.closePopoutReplyBox();
-      }
+    getKeyboardEvents() {
+      return {
+        Escape: {
+          action: () => this.closePopoutReplyBox(),
+        },
+      };
     },
     addScrollListener() {
       this.conversationPanel = this.$el.querySelector('.conversation-panel');
diff --git a/app/javascript/dashboard/components/widgets/conversation/MoreActions.vue b/app/javascript/dashboard/components/widgets/conversation/MoreActions.vue
index 85136cedfb91c..78435144de6c7 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MoreActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MoreActions.vue
@@ -37,7 +37,6 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
 import alertMixin from 'shared/mixins/alertMixin';
 import EmailTranscriptModal from './EmailTranscriptModal.vue';
 import ResolveAction from '../../buttons/ResolveAction.vue';
@@ -52,7 +51,7 @@ export default {
     EmailTranscriptModal,
     ResolveAction,
   },
-  mixins: [alertMixin, clickaway],
+  mixins: [alertMixin],
   data() {
     return {
       showEmailActionsModal: false,
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index a0174bf289770..42fa74ec7ba0e 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -100,7 +100,7 @@
       <attachment-preview
         class="flex-col mt-4"
         :attachments="attachedFiles"
-        :remove-attachment="removeAttachment"
+        @remove-attachment="removeAttachment"
       />
     </div>
     <message-signature-missing-alert
@@ -153,8 +153,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
 import alertMixin from 'shared/mixins/alertMixin';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 
 import CannedResponse from './CannedResponse.vue';
 import ReplyToMessage from './ReplyToMessage.vue';
@@ -178,7 +178,6 @@ import {
   replaceVariablesInMessage,
 } from '@chatwoot/utils';
 import WhatsappTemplates from './WhatsappTemplates/Modal.vue';
-import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
 import { MESSAGE_MAX_LENGTH } from 'shared/helpers/MessageTypeHelper';
 import inboxMixin, { INBOX_FEATURES } from 'shared/mixins/inboxMixin';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
@@ -218,13 +217,13 @@ export default {
     ArticleSearchPopover,
   },
   mixins: [
-    clickaway,
     inboxMixin,
     uiSettingsMixin,
     alertMixin,
     messageFormatterMixin,
     rtlMixin,
     fileUploadMixin,
+    keyboardEventListenerMixins,
   ],
   props: {
     popoutReplyBox: {
@@ -502,11 +501,10 @@ export default {
       return `draft-${this.conversationIdByRoute}-${this.replyType}`;
     },
     audioRecordFormat() {
-      if (
-        this.isAWhatsAppChannel ||
-        this.isAPIInbox ||
-        this.isATelegramChannel
-      ) {
+      if (this.isAWhatsAppChannel || this.isATelegramChannel) {
+        return AUDIO_FORMATS.MP3;
+      }
+      if (this.isAPIInbox) {
         return AUDIO_FORMATS.OGG;
       }
       return AUDIO_FORMATS.WAV;
@@ -701,24 +699,41 @@ export default {
         this.$store.dispatch('draftMessages/delete', { key });
       }
     },
-    handleKeyEvents(e) {
-      const keyCode = buildHotKeys(e);
-      if (keyCode === 'escape') {
-        this.hideEmojiPicker();
-        this.hideMentions();
-      } else if (keyCode === 'meta+k') {
-        const ninja = document.querySelector('ninja-keys');
-        ninja.open();
-        e.preventDefault();
-      } else if (keyCode === 'enter' && this.isAValidEvent('enter')) {
-        this.onSendReply();
-        e.preventDefault();
-      } else if (
-        ['meta+enter', 'ctrl+enter'].includes(keyCode) &&
-        this.isAValidEvent('cmd_enter')
-      ) {
-        this.onSendReply();
-      }
+    getKeyboardEvents() {
+      return {
+        Escape: {
+          action: () => {
+            this.hideEmojiPicker();
+            this.hideMentions();
+          },
+          allowOnFocusedInput: true,
+        },
+        '$mod+KeyK': {
+          action: e => {
+            e.preventDefault();
+            const ninja = document.querySelector('ninja-keys');
+            ninja.open();
+          },
+          allowOnFocusedInput: true,
+        },
+        Enter: {
+          action: e => {
+            if (this.isAValidEvent('enter')) {
+              this.onSendReply();
+              e.preventDefault();
+            }
+          },
+          allowOnFocusedInput: true,
+        },
+        '$mod+Enter': {
+          action: () => {
+            if (this.isAValidEvent('cmd_enter')) {
+              this.onSendReply();
+            }
+          },
+          allowOnFocusedInput: true,
+        },
+      };
     },
     isAValidEvent(selectedKey) {
       return (
@@ -937,6 +952,13 @@ export default {
       this.bccEmails = '';
       this.toEmails = '';
     },
+    clearRecorder() {
+      this.isRecordingAudio = false;
+      // Only clear the recorded audio when we click toggle button.
+      this.attachedFiles = this.attachedFiles.filter(
+        file => !file?.isRecordedAudio
+      );
+    },
     toggleEmojiPicker() {
       this.showEmojiPicker = !this.showEmojiPicker;
     },
@@ -944,8 +966,7 @@ export default {
       this.isRecordingAudio = !this.isRecordingAudio;
       this.isRecorderAudioStopped = !this.isRecordingAudio;
       if (!this.isRecordingAudio) {
-        this.clearMessage();
-        this.clearEmailField();
+        this.clearRecorder();
       }
     },
     toggleAudioRecorderPlayPause() {
@@ -989,7 +1010,13 @@ export default {
       }
     },
     onFinishRecorder(file) {
-      return file && this.onFileUpload(file);
+      // Added a new key isRecordedAudio to the file to find it's and recorded audio
+      // Because to filter and show only non recorded audio and other attachments
+      const autoRecordedFile = {
+        ...file,
+        isRecordedAudio: true,
+      };
+      return file && this.onFileUpload(autoRecordedFile);
     },
     toggleTyping(status) {
       const conversationId = this.currentChat.id;
@@ -1015,13 +1042,12 @@ export default {
           isPrivate: this.isPrivate,
           thumb: reader.result,
           blobSignedId: blob ? blob.signed_id : undefined,
+          isRecordedAudio: file?.isRecordedAudio || false,
         });
       };
     },
-    removeAttachment(itemIndex) {
-      this.attachedFiles = this.attachedFiles.filter(
-        (item, index) => itemIndex !== index
-      );
+    removeAttachment(attachments) {
+      this.attachedFiles = attachments;
     },
     setReplyToInPayload(payload) {
       if (this.inReplyTo?.id) {
@@ -1226,6 +1252,7 @@ export default {
     }
   }
 }
+
 .send-button {
   @apply mb-0;
 }
@@ -1250,6 +1277,7 @@ export default {
 
 .emoji-dialog--rtl {
   @apply left-[unset] -right-80;
+
   &::before {
     transform: rotate(90deg);
     filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.08));
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
index 3a1fe87b271c4..e3135fa4729aa 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
@@ -9,7 +9,7 @@
           <woot-input
             v-model.trim="$v.toEmailsVal.$model"
             type="text"
-            class="[&>input]:mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
+            class="[&>input]:!mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
             :class="{ error: $v.toEmailsVal.$error }"
             :placeholder="$t('CONVERSATION.REPLYBOX.EMAIL_HEAD.CC.PLACEHOLDER')"
             @blur="onBlur"
@@ -25,7 +25,7 @@
         <div class="rounded-none flex-1 min-w-0 m-0 whitespace-nowrap">
           <woot-input
             v-model.trim="$v.ccEmailsVal.$model"
-            class="[&>input]:mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
+            class="[&>input]:!mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
             type="text"
             :class="{ error: $v.ccEmailsVal.$error }"
             :placeholder="$t('CONVERSATION.REPLYBOX.EMAIL_HEAD.CC.PLACEHOLDER')"
@@ -54,7 +54,7 @@
           <woot-input
             v-model.trim="$v.bccEmailsVal.$model"
             type="text"
-            class="[&>input]:mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
+            class="[&>input]:!mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
             :class="{ error: $v.bccEmailsVal.$error }"
             :placeholder="
               $t('CONVERSATION.REPLYBOX.EMAIL_HEAD.BCC.PLACEHOLDER')
diff --git a/app/javascript/dashboard/components/widgets/conversation/TagAgents.vue b/app/javascript/dashboard/components/widgets/conversation/TagAgents.vue
index faff2e0fa6051..a3a26db732b98 100644
--- a/app/javascript/dashboard/components/widgets/conversation/TagAgents.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/TagAgents.vue
@@ -75,9 +75,10 @@ export default {
   },
 
   methods: {
-    handleKeyboardEvent(e) {
-      this.processKeyDownEvent(e);
-      this.$el.scrollTop = 50 * this.selectedIndex;
+    adjustScroll() {
+      this.$nextTick(() => {
+        this.$el.scrollTop = 50 * this.selectedIndex;
+      });
     },
     onHover(index) {
       this.selectedIndex = index;
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
index a105b63aa682c..41e207cbf4f0c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
@@ -17,7 +17,7 @@
       @error="onImgError"
       @click="onClick"
     />
-    <audio v-else-if="isAudio" controls class="skip-context-menu">
+    <audio v-else-if="isAudio" controls class="skip-context-menu mb-0.5">
       <source :src="`${dataUrl}?t=${Date.now()}`" />
     </audio>
     <gallery-view
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
index 754c7995466ef..fda2a9faab60c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
@@ -7,8 +7,10 @@
       'bg-woot-600 text-woot-50': messageType === MESSAGE_TYPE.OUTGOING,
       '-mx-2': !parentHasAttachments,
     }"
+    @click="scrollToMessage"
   >
     <message-preview
+      class="cursor-pointer"
       :message="message"
       :show-message-type="false"
       :default-empty-message="$t('CONVERSATION.REPLY_MESSAGE_NOT_FOUND')"
@@ -19,6 +21,7 @@
 <script>
 import MessagePreview from 'dashboard/components/widgets/conversation/MessagePreview.vue';
 import { MESSAGE_TYPE } from 'shared/constants/messages';
+import { BUS_EVENTS } from 'shared/constants/busEvents';
 
 export default {
   name: 'ReplyTo',
@@ -42,5 +45,10 @@ export default {
   data() {
     return { MESSAGE_TYPE };
   },
+  methods: {
+    scrollToMessage() {
+      bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE, { messageId: this.message.id });
+    },
+  },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
index b7b1460405283..08f77be9a5fc7 100644
--- a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
@@ -180,14 +180,8 @@
   </woot-modal>
 </template>
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
-import {
-  isEscape,
-  hasPressedArrowLeftKey,
-  hasPressedArrowRightKey,
-} from 'shared/helpers/KeyboardHelpers';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import timeMixin from 'dashboard/mixins/time';
 
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
@@ -205,7 +199,7 @@ export default {
   components: {
     Thumbnail,
   },
-  mixins: [eventListenerMixins, clickaway, timeMixin],
+  mixins: [keyboardEventListenerMixins, timeMixin],
   props: {
     show: {
       type: Boolean,
@@ -304,20 +298,30 @@ export default {
       this.activeAttachment = attachment;
       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
-        );
-      }
+    getKeyboardEvents() {
+      return {
+        Escape: {
+          action: () => {
+            this.onClose();
+          },
+        },
+        ArrowLeft: {
+          action: () => {
+            this.onClickChangeAttachment(
+              this.allAttachments[this.activeImageIndex - 1],
+              this.activeImageIndex - 1
+            );
+          },
+        },
+        ArrowRight: {
+          action: () => {
+            this.onClickChangeAttachment(
+              this.allAttachments[this.activeImageIndex + 1],
+              this.activeImageIndex + 1
+            );
+          },
+        },
+      };
     },
     onClickDownload() {
       const { file_type: type, data_url: url } = this.activeAttachment;
diff --git a/app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue b/app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue
index bdffc7e7835a7..042e258380986 100644
--- a/app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue
@@ -49,9 +49,8 @@
 </template>
 
 <script>
-import { evaluateSLAStatus } from '../helpers/SLAHelper';
+import { evaluateSLAStatus } from '@chatwoot/utils';
 import SLAPopoverCard from './SLAPopoverCard.vue';
-import { mixin as clickaway } from 'vue-clickaway';
 
 const REFRESH_INTERVAL = 60000;
 
@@ -59,7 +58,6 @@ export default {
   components: {
     SLAPopoverCard,
   },
-  mixins: [clickaway],
   props: {
     chat: {
       type: Object,
@@ -139,7 +137,10 @@ export default {
       }, REFRESH_INTERVAL);
     },
     updateSlaStatus() {
-      this.slaStatus = evaluateSLAStatus(this.appliedSLA, this.chat);
+      this.slaStatus = evaluateSLAStatus({
+        appliedSla: this.appliedSLA,
+        chat: this.chat,
+      });
     },
     openSlaPopover() {
       if (!this.showExtendedInfo) return;
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index 1a4b4febe671a..4dd06f673aa31 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -101,14 +101,12 @@
 import { mapGetters } from 'vuex';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 import Spinner from 'shared/components/Spinner.vue';
-import { mixin as clickaway } from 'vue-clickaway';
 
 export default {
   components: {
     Thumbnail,
     Spinner,
   },
-  mixins: [clickaway],
   props: {
     selectedInboxes: {
       type: Array,
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index 699a42f5799f5..3b398b8c395c1 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -95,20 +95,40 @@
     <div v-if="allConversationsSelected" class="bulk-action__alert">
       {{ $t('BULK_ACTION.ALL_CONVERSATIONS_SELECTED_ALERT') }}
     </div>
+    <woot-modal
+      :show.sync="showCustomTimeSnoozeModal"
+      :on-close="hideCustomSnoozeModal"
+    >
+      <custom-snooze-modal
+        @close="hideCustomSnoozeModal"
+        @choose-time="customSnoozeTime"
+      />
+    </woot-modal>
   </div>
 </template>
 
 <script>
+import { getUnixTime } from 'date-fns';
+import { findSnoozeTime } from 'dashboard/helper/snoozeHelpers';
+import wootConstants from 'dashboard/constants/globals';
+import {
+  CMD_BULK_ACTION_SNOOZE_CONVERSATION,
+  CMD_BULK_ACTION_REOPEN_CONVERSATION,
+  CMD_BULK_ACTION_RESOLVE_CONVERSATION,
+} from 'dashboard/routes/dashboard/commands/commandBarBusEvents';
+
 import AgentSelector from './AgentSelector.vue';
 import UpdateActions from './UpdateActions.vue';
 import LabelActions from './LabelActions.vue';
 import TeamActions from './TeamActions.vue';
+import CustomSnoozeModal from 'dashboard/components/CustomSnoozeModal.vue';
 export default {
   components: {
     AgentSelector,
     UpdateActions,
     LabelActions,
     TeamActions,
+    CustomSnoozeModal,
   },
   props: {
     conversations: {
@@ -143,17 +163,56 @@ export default {
       showLabelActions: false,
       showTeamsList: false,
       popoverPositions: {},
+      showCustomTimeSnoozeModal: false,
     };
   },
+  mounted() {
+    bus.$on(CMD_BULK_ACTION_SNOOZE_CONVERSATION, this.onCmdSnoozeConversation);
+    bus.$on(CMD_BULK_ACTION_REOPEN_CONVERSATION, this.onCmdReopenConversation);
+    bus.$on(
+      CMD_BULK_ACTION_RESOLVE_CONVERSATION,
+      this.onCmdResolveConversation
+    );
+  },
+  destroyed() {
+    bus.$off(CMD_BULK_ACTION_SNOOZE_CONVERSATION, this.onCmdSnoozeConversation);
+    bus.$off(CMD_BULK_ACTION_REOPEN_CONVERSATION, this.onCmdReopenConversation);
+    bus.$off(
+      CMD_BULK_ACTION_RESOLVE_CONVERSATION,
+      this.onCmdResolveConversation
+    );
+  },
   methods: {
+    onCmdSnoozeConversation(snoozeType) {
+      if (snoozeType === wootConstants.SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME) {
+        this.showCustomTimeSnoozeModal = true;
+      } else {
+        this.updateConversations('snoozed', findSnoozeTime(snoozeType) || null);
+      }
+    },
+    onCmdReopenConversation() {
+      this.updateConversations('open', null);
+    },
+    onCmdResolveConversation() {
+      this.updateConversations('resolved', null);
+    },
+    customSnoozeTime(customSnoozedTime) {
+      this.showCustomTimeSnoozeModal = false;
+      if (customSnoozedTime) {
+        this.updateConversations('snoozed', getUnixTime(customSnoozedTime));
+      }
+    },
+    hideCustomSnoozeModal() {
+      this.showCustomTimeSnoozeModal = false;
+    },
     selectAll(e) {
       this.$emit('select-all-conversations', e.target.checked);
     },
     submit(agent) {
       this.$emit('assign-agent', agent);
     },
-    updateConversations(status) {
-      this.$emit('update-conversations', status);
+    updateConversations(status, snoozedUntil) {
+      this.$emit('update-conversations', status, snoozedUntil);
     },
     assignLabels(labels) {
       this.$emit('assign-labels', labels);
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
index 5118ec69cb5f3..80224532a2147 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
@@ -74,11 +74,9 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
 
 export default {
-  mixins: [clickaway],
   data() {
     return {
       query: '',
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
index bd02306e61dd6..fcfaa61df2c66 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
@@ -59,10 +59,8 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
 export default {
-  mixins: [clickaway],
   data() {
     return {
       query: '',
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
index 38e13ac3036f9..0653fc0cc8057 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
@@ -1,12 +1,98 @@
+<script setup>
+import { useI18n } from 'dashboard/composables/useI18n';
+import { ref } from 'vue';
+
+import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
+import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
+
+const { t } = useI18n();
+
+const emits = defineEmits(['update', 'close']);
+
+const props = defineProps({
+  selectedInboxes: {
+    type: Array,
+    default: () => [],
+  },
+  conversationCount: {
+    type: Number,
+    default: 0,
+  },
+  showResolve: {
+    type: Boolean,
+    default: true,
+  },
+  showReopen: {
+    type: Boolean,
+    default: true,
+  },
+  showSnooze: {
+    type: Boolean,
+    default: true,
+  },
+});
+
+const actions = ref([
+  { icon: 'checkmark', key: 'resolved' },
+  { icon: 'arrow-redo', key: 'open' },
+  { icon: 'send-clock', key: 'snoozed' },
+]);
+
+const updateConversations = key => {
+  if (key === 'snoozed') {
+    // If the user clicks on the snooze option from the bulk action change status dropdown.
+    // Open the snooze option for bulk action in the cmd bar.
+    const ninja = document.querySelector('ninja-keys');
+    ninja?.open({ parent: 'bulk_action_snooze_conversation' });
+  } else {
+    emits('update', key);
+  }
+};
+
+const onClose = () => {
+  emits('close');
+};
+
+const showAction = key => {
+  const actionsMap = {
+    resolved: props.showResolve,
+    open: props.showReopen,
+    snoozed: props.showSnooze,
+  };
+  return actionsMap[key] || false;
+};
+
+const actionLabel = key => {
+  const labelsMap = {
+    resolved: t('CONVERSATION.HEADER.RESOLVE_ACTION'),
+    open: t('CONVERSATION.HEADER.REOPEN_ACTION'),
+    snoozed: t('BULK_ACTION.UPDATE.SNOOZE_UNTIL'),
+  };
+  return labelsMap[key] || '';
+};
+</script>
+
 <template>
-  <div v-on-clickaway="onClose" class="actions-container">
-    <div class="triangle">
+  <div
+    v-on-clickaway="onClose"
+    class="absolute right-2 top-12 origin-top-right w-auto z-20 bg-white dark:bg-slate-800 rounded-lg border border-solid border-slate-50 dark:border-slate-700 shadow-md"
+  >
+    <div
+      class="right-[var(--triangle-position)] block z-10 absolute text-left -top-3"
+    >
       <svg height="12" viewBox="0 0 24 12" width="24">
-        <path d="M20 12l-8-8-12 12" fill-rule="evenodd" stroke-width="1px" />
+        <path
+          d="M20 12l-8-8-12 12"
+          fill-rule="evenodd"
+          stroke-width="1px"
+          class="fill-white dark:fill-slate-800 stroke-slate-50 dark:stroke-slate-600/50"
+        />
       </svg>
     </div>
-    <div class="header flex items-center justify-between">
-      <span>{{ $t('BULK_ACTION.UPDATE.CHANGE_STATUS') }}</span>
+    <div class="p-2.5 flex gap-1 items-center justify-between">
+      <span class="text-sm font-medium text-slate-600 dark:text-slate-100">
+        {{ $t('BULK_ACTION.UPDATE.CHANGE_STATUS') }}
+      </span>
       <woot-button
         size="tiny"
         variant="clear"
@@ -15,8 +101,8 @@
         @click="onClose"
       />
     </div>
-    <div class="container">
-      <woot-dropdown-menu>
+    <div class="px-2.5 pt-0 pb-2.5">
+      <woot-dropdown-menu class="m-0 list-none">
         <template v-for="action in actions">
           <woot-dropdown-item v-if="showAction(action.key)" :key="action.key">
             <woot-button
@@ -34,116 +120,3 @@
     </div>
   </div>
 </template>
-
-<script>
-import { mixin as clickaway } from 'vue-clickaway';
-import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
-import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
-
-export default {
-  components: {
-    WootDropdownItem,
-    WootDropdownMenu,
-  },
-  mixins: [clickaway],
-  props: {
-    selectedInboxes: {
-      type: Array,
-      default: () => [],
-    },
-    conversationCount: {
-      type: Number,
-      default: 0,
-    },
-    showResolve: {
-      type: Boolean,
-      default: true,
-    },
-    showReopen: {
-      type: Boolean,
-      default: true,
-    },
-    showSnooze: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  data() {
-    return {
-      query: '',
-      selectedAction: null,
-      actions: [
-        {
-          icon: 'checkmark',
-          key: 'resolved',
-        },
-        {
-          icon: 'arrow-redo',
-          key: 'open',
-        },
-        {
-          icon: 'send-clock',
-          key: 'snoozed',
-        },
-      ],
-    };
-  },
-  methods: {
-    updateConversations(key) {
-      this.$emit('update', key);
-    },
-    goBack() {
-      this.selectedAgent = null;
-    },
-    onClose() {
-      this.$emit('close');
-    },
-    showAction(key) {
-      const actionsMap = {
-        resolved: this.showResolve,
-        open: this.showReopen,
-        snoozed: this.showSnooze,
-      };
-      return actionsMap[key] || false;
-    },
-    actionLabel(key) {
-      const labelsMap = {
-        resolved: this.$t('CONVERSATION.HEADER.RESOLVE_ACTION'),
-        open: this.$t('CONVERSATION.HEADER.REOPEN_ACTION'),
-        snoozed: this.$t('BULK_ACTION.UPDATE.SNOOZE_UNTIL_NEXT_REPLY'),
-      };
-      return labelsMap[key] || '';
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.actions-container {
-  @apply absolute right-2 top-12 origin-top-right w-auto z-20 bg-white dark:bg-slate-800 rounded-lg border border-solid border-slate-50 dark:border-slate-700 shadow-md;
-
-  .header {
-    @apply p-2.5;
-
-    span {
-      @apply text-sm font-medium;
-    }
-  }
-  .container {
-    @apply px-2.5 pt-0 pb-2.5;
-  }
-
-  .triangle {
-    right: var(--triangle-position);
-    @apply block z-10 absolute text-left -top-3;
-
-    svg path {
-      @apply fill-white dark:fill-slate-800 stroke-slate-50 dark:stroke-slate-600/50;
-    }
-  }
-}
-
-ul {
-  @apply m-0 list-none;
-}
-</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/helpers/SLAHelper.js b/app/javascript/dashboard/components/widgets/conversation/helpers/SLAHelper.js
deleted file mode 100644
index ebfc21130a23c..0000000000000
--- a/app/javascript/dashboard/components/widgets/conversation/helpers/SLAHelper.js
+++ /dev/null
@@ -1,117 +0,0 @@
-const calculateThreshold = (timeOffset, threshold) => {
-  // Calculate the time left for the SLA to breach or the time since the SLA has missed
-  if (threshold === null) return null;
-  const currentTime = Math.floor(Date.now() / 1000);
-  return timeOffset + threshold - currentTime;
-};
-
-const findMostUrgentSLAStatus = SLAStatuses => {
-  // Sort the SLAs based on the threshold and return the most urgent SLA
-  SLAStatuses.sort(
-    (sla1, sla2) => Math.abs(sla1.threshold) - Math.abs(sla2.threshold)
-  );
-  return SLAStatuses[0];
-};
-
-const formatSLATime = seconds => {
-  const units = {
-    y: 31536000, // 60 * 60 * 24 * 365
-    mo: 2592000, // 60 * 60 * 24 * 30
-    d: 86400, // 60 * 60 * 24
-    h: 3600, // 60 * 60
-    m: 60,
-  };
-
-  if (seconds < 60) {
-    return '1m';
-  }
-
-  // we will only show two parts, two max granularity's, h-m, y-d, d-h, m, but no seconds
-  const parts = [];
-
-  Object.keys(units).forEach(unit => {
-    const value = Math.floor(seconds / units[unit]);
-    if (seconds < 60 && parts.length > 0) return;
-    if (parts.length === 2) return;
-    if (value > 0) {
-      parts.push(value + unit);
-      seconds -= value * units[unit];
-    }
-  });
-  return parts.join(' ');
-};
-
-const createSLAObject = (
-  type,
-  {
-    sla_first_response_time_threshold: frtThreshold,
-    sla_next_response_time_threshold: nrtThreshold,
-    sla_resolution_time_threshold: rtThreshold,
-    created_at: createdAt,
-  } = {},
-  {
-    first_reply_created_at: firstReplyCreatedAt,
-    waiting_since: waitingSince,
-    status,
-  } = {}
-) => {
-  // Mapping of breach types to their logic
-  const SLATypes = {
-    FRT: {
-      threshold: calculateThreshold(createdAt, frtThreshold),
-      //   Check FRT only if threshold is not null and first reply hasn't been made
-      condition:
-        frtThreshold !== null &&
-        (!firstReplyCreatedAt || firstReplyCreatedAt === 0),
-    },
-    NRT: {
-      threshold: calculateThreshold(waitingSince, nrtThreshold),
-      // Check NRT only if threshold is not null, first reply has been made and we are waiting since
-      condition:
-        nrtThreshold !== null && !!firstReplyCreatedAt && !!waitingSince,
-    },
-    RT: {
-      threshold: calculateThreshold(createdAt, rtThreshold),
-      // Check RT only if the conversation is open and threshold is not null
-      condition: status === 'open' && rtThreshold !== null,
-    },
-  };
-
-  const SLAStatus = SLATypes[type];
-  return SLAStatus ? { ...SLAStatus, type } : null;
-};
-
-const evaluateSLAConditions = (appliedSla, chat) => {
-  // Filter out the SLA based on conditions and update the object with the breach status(icon, isSlaMissed)
-  const SLATypes = ['FRT', 'NRT', 'RT'];
-  return SLATypes.map(type => createSLAObject(type, appliedSla, chat))
-    .filter(SLAStatus => SLAStatus && SLAStatus.condition)
-    .map(SLAStatus => ({
-      ...SLAStatus,
-      icon: SLAStatus.threshold <= 0 ? 'flame' : 'alarm',
-      isSlaMissed: SLAStatus.threshold <= 0,
-    }));
-};
-
-export const evaluateSLAStatus = (appliedSla, chat) => {
-  if (!appliedSla || !chat)
-    return { type: '', threshold: '', icon: '', isSlaMissed: false };
-
-  // Filter out the SLA and create the object for each breach
-  const SLAStatuses = evaluateSLAConditions(appliedSla, chat);
-
-  // Return the most urgent SLA which is latest to breach or has missed
-  const mostUrgent = findMostUrgentSLAStatus(SLAStatuses);
-  return mostUrgent
-    ? {
-        type: mostUrgent.type,
-        threshold: formatSLATime(
-          mostUrgent.threshold <= 0
-            ? -mostUrgent.threshold
-            : mostUrgent.threshold
-        ),
-        icon: mostUrgent.icon,
-        isSlaMissed: mostUrgent.isSlaMissed,
-      }
-    : { type: '', threshold: '', icon: '', isSlaMissed: false };
-};
diff --git a/app/javascript/dashboard/components/widgets/conversation/helpers/specs/SLAHelper.spec.js b/app/javascript/dashboard/components/widgets/conversation/helpers/specs/SLAHelper.spec.js
deleted file mode 100644
index c4e0e5c885828..0000000000000
--- a/app/javascript/dashboard/components/widgets/conversation/helpers/specs/SLAHelper.spec.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import { evaluateSLAStatus } from '../SLAHelper';
-
-beforeEach(() => {
-  jest
-    .spyOn(Date, 'now')
-    .mockImplementation(() => new Date('2024-01-01T00:00:00Z').getTime());
-});
-
-afterEach(() => {
-  jest.restoreAllMocks();
-});
-
-describe('SLAHelper', () => {
-  describe('evaluateSLAStatus', () => {
-    it('returns an empty object when sla or chat is not present', () => {
-      expect(evaluateSLAStatus(null, null)).toEqual({
-        type: '',
-        threshold: '',
-        icon: '',
-        isSlaMissed: false,
-      });
-    });
-
-    // Case when FRT SLA is missed
-    it('correctly identifies a missed FRT SLA', () => {
-      const appliedSla = {
-        sla_first_response_time_threshold: 600,
-        sla_next_response_time_threshold: 1200,
-        sla_resolution_time_threshold: 1800,
-        created_at: 1704066540,
-      };
-      const chatMissed = {
-        first_reply_created_at: 0,
-        waiting_since: 0,
-        status: 'open',
-      };
-      expect(evaluateSLAStatus(appliedSla, chatMissed)).toEqual({
-        type: 'FRT',
-        threshold: '1m',
-        icon: 'flame',
-        isSlaMissed: true,
-      });
-    });
-
-    // Case when FRT SLA is not missed
-    it('correctly identifies an FRT SLA not yet breached', () => {
-      const appliedSla = {
-        sla_first_response_time_threshold: 600,
-        sla_next_response_time_threshold: 1200,
-        sla_resolution_time_threshold: 1800,
-        created_at: 1704066660,
-      };
-      const chatNotMissed = {
-        first_reply_created_at: 0,
-        waiting_since: 0,
-        status: 'open',
-      };
-      expect(evaluateSLAStatus(appliedSla, chatNotMissed)).toEqual({
-        type: 'FRT',
-        threshold: '1m',
-        icon: 'alarm',
-        isSlaMissed: false,
-      });
-    });
-
-    // Case when NRT SLA is missed
-    it('correctly identifies a missed NRT SLA', () => {
-      const appliedSla = {
-        sla_first_response_time_threshold: 600,
-        sla_next_response_time_threshold: 1200,
-        sla_resolution_time_threshold: 1800,
-        created_at: 1704065200,
-      };
-      const chatMissed = {
-        first_reply_created_at: 1704066200,
-        waiting_since: 1704065940,
-        status: 'open',
-      };
-      expect(evaluateSLAStatus(appliedSla, chatMissed)).toEqual({
-        type: 'NRT',
-        threshold: '1m',
-        icon: 'flame',
-        isSlaMissed: true,
-      });
-    });
-
-    // Case when NRT SLA is not missed
-    it('correctly identifies an NRT SLA not yet breached', () => {
-      const appliedSla = {
-        sla_first_response_time_threshold: 600,
-        sla_next_response_time_threshold: 1200,
-        sla_resolution_time_threshold: 1800,
-        created_at: 1704065200 - 2000,
-      };
-      const chatNotMissed = {
-        first_reply_created_at: 1704066200,
-        waiting_since: 1704066060,
-        status: 'open',
-      };
-      expect(evaluateSLAStatus(appliedSla, chatNotMissed)).toEqual({
-        type: 'NRT',
-        threshold: '1m',
-        icon: 'alarm',
-        isSlaMissed: false,
-      });
-    });
-
-    // Case when RT SLA is missed
-    it('correctly identifies a missed RT SLA', () => {
-      const appliedSla = {
-        sla_first_response_time_threshold: 600,
-        sla_next_response_time_threshold: 1200,
-        sla_resolution_time_threshold: 1800,
-        created_at: 1704065340,
-      };
-      const chatMissed = {
-        first_reply_created_at: 1704066200,
-        waiting_since: 0,
-        status: 'open',
-      };
-      expect(evaluateSLAStatus(appliedSla, chatMissed)).toEqual({
-        type: 'RT',
-        threshold: '1m',
-        icon: 'flame',
-        isSlaMissed: true,
-      });
-    });
-
-    // Case when RT SLA is not missed
-    it('correctly identifies an RT SLA not yet breached', () => {
-      const appliedSla = {
-        sla_first_response_time_threshold: 600,
-        sla_next_response_time_threshold: 1200,
-        sla_resolution_time_threshold: 1800,
-        created_at: 1704065460,
-      };
-      const chatNotMissed = {
-        first_reply_created_at: 1704066200,
-        waiting_since: 0,
-        status: 'open',
-      };
-      expect(evaluateSLAStatus(appliedSla, chatNotMissed)).toEqual({
-        type: 'RT',
-        threshold: '1m',
-        icon: 'alarm',
-        isSlaMissed: false,
-      });
-    });
-  });
-});
diff --git a/app/javascript/dashboard/components/widgets/forms/Input.vue b/app/javascript/dashboard/components/widgets/forms/Input.vue
index 92023b918b093..9ddaf3e5c7dd2 100644
--- a/app/javascript/dashboard/components/widgets/forms/Input.vue
+++ b/app/javascript/dashboard/components/widgets/forms/Input.vue
@@ -15,6 +15,7 @@
     <span v-if="error" class="message">
       {{ error }}
     </span>
+    <slot name="masked" />
   </label>
 </template>
 
diff --git a/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue b/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
index 78409fe65bdaf..6b09acbacf860 100644
--- a/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
+++ b/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
@@ -1,9 +1,16 @@
 <template>
   <div class="phone-input--wrap relative">
-    <div class="phone-input" :class="{ 'has-error': error }">
+    <div
+      class="flex items-center dark:bg-slate-900 justify-start rounded-md border border-solid"
+      :class="
+        error
+          ? 'border border-solid border-red-400 dark:border-red-400 mb-1'
+          : 'mb-4 border-slate-200 dark:border-slate-600'
+      "
+    >
       <div
         class="cursor-pointer py-2 pr-1.5 pl-2 rounded-tl-md rounded-bl-md flex items-center justify-center gap-1.5 bg-slate-25 dark:bg-slate-700 h-10 w-14"
-        @click="toggleCountryDropdown"
+        @click.prevent="toggleCountryDropdown"
       >
         <h5 v-if="activeCountry" class="mb-0">
           {{ activeCountry.emoji }}
@@ -13,14 +20,15 @@
       </div>
       <span
         v-if="activeDialCode"
-        class="flex bg-white dark:bg-slate-900 font-medium text-slate-800 dark:text-slate-100 font-normal text-base leading-normal py-2 pl-2 pr-0"
+        class="flex bg-white dark:bg-slate-900 text-slate-800 dark:text-slate-100 font-normal text-base leading-normal py-2 pl-2 pr-0"
       >
         {{ activeDialCode }}
       </span>
       <input
+        ref="phoneNumberInput"
         :value="phoneNumber"
         type="tel"
-        class="phone-input--field"
+        class="!mb-0 !rounded-tl-none !rounded-bl-none !border-0 font-normal !w-full dark:!bg-slate-900 text-base !px-1.5 placeholder:font-normal"
         :placeholder="placeholder"
         :readonly="readonly"
         :style="styles"
@@ -28,24 +36,36 @@
         @blur="onBlur"
       />
     </div>
-    <div v-if="showDropdown" ref="dropdown" class="country-dropdown">
-      <div class="dropdown-search--wrap">
+    <div
+      v-if="showDropdown"
+      ref="dropdown"
+      v-on-clickaway="onOutsideClick"
+      tabindex="0"
+      class="z-10 absolute h-60 w-[12.5rem] shadow-md overflow-y-auto top-10 rounded px-0 pt-0 pb-1 bg-white dark:bg-slate-900"
+      @keydown.prevent.up="moveUp"
+      @keydown.prevent.down="moveDown"
+      @keydown.prevent.enter="
+        onSelectCountry(filteredCountriesBySearch[selectedIndex])
+      "
+    >
+      <div class="top-0 sticky bg-white dark:bg-slate-900 p-1">
         <input
           ref="searchbar"
           v-model="searchCountry"
           type="text"
           placeholder="Search"
-          class="dropdown-search"
+          class="!h-8 !mb-0 !text-sm !border !border-solid !border-slate-200 dark:!border-slate-600"
+          @input="onSearchCountry"
         />
       </div>
       <div
         v-for="(country, index) in filteredCountriesBySearch"
         ref="dropdownItem"
         :key="index"
-        class="country-dropdown--item"
+        class="flex items-center h-7 py-0 px-1 cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-700"
         :class="{
-          active: country.id === activeCountryCode,
-          focus: index === selectedIndex,
+          'bg-slate-50 dark:bg-slate-700': country.id === activeCountryCode,
+          'bg-slate-25 dark:bg-slate-800': index === selectedIndex,
         }"
         @click="onSelectCountry(country)"
       >
@@ -74,15 +94,8 @@
 <script>
 import countries from 'shared/constants/countries.js';
 import parsePhoneNumber from 'libphonenumber-js';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
-import {
-  hasPressedArrowUpKey,
-  hasPressedArrowDownKey,
-  isEnter,
-} from 'shared/helpers/KeyboardHelpers';
 
 export default {
-  mixins: [eventListenerMixins],
   props: {
     value: {
       type: [String, Number],
@@ -107,15 +120,6 @@ export default {
   },
   data() {
     return {
-      countries: [
-        {
-          name: 'Select Country',
-          dial_code: '',
-          emoji: '',
-          id: '',
-        },
-        ...countries,
-      ],
       selectedIndex: -1,
       showDropdown: false,
       searchCountry: '',
@@ -125,6 +129,20 @@ export default {
     };
   },
   computed: {
+    countries() {
+      return [
+        {
+          name: this.dropdownFirstItemName,
+          dial_code: '',
+          emoji: '',
+          id: '',
+        },
+        ...countries,
+      ];
+    },
+    dropdownFirstItemName() {
+      return this.activeCountryCode ? 'Clear selection' : 'Select Country';
+    },
     filteredCountriesBySearch() {
       return this.countries.filter(country => {
         const { name, dial_code, id } = country;
@@ -159,12 +177,8 @@ export default {
     },
   },
   mounted() {
-    window.addEventListener('mouseup', this.onOutsideClick);
     this.setActiveCountry();
   },
-  beforeDestroy() {
-    window.removeEventListener('mouseup', this.onOutsideClick);
-  },
   methods: {
     onOutsideClick(e) {
       if (
@@ -182,49 +196,42 @@ export default {
     onBlur(e) {
       this.$emit('blur', e.target.value);
     },
-    dropdownItem() {
-      return Array.from(
-        this.$refs.dropdown.querySelectorAll(
-          'div.country-dropdown div.country-dropdown--item'
-        )
-      );
+    onSearchCountry() {
+      // Reset selected index to 0
+      this.selectedIndex = 0;
     },
-    focusedItem() {
-      return Array.from(
-        this.$refs.dropdown.querySelectorAll('div.country-dropdown div.focus')
-      );
+    moveUp() {
+      if (!this.showDropdown) return;
+      this.selectedIndex = Math.max(this.selectedIndex - 1, 0);
+      this.scrollToSelected();
     },
-    focusedItemIndex() {
-      return Array.from(this.dropdownItem()).indexOf(this.focusedItem()[0]);
+    moveDown() {
+      if (!this.showDropdown) return;
+      this.selectedIndex = Math.min(
+        this.selectedIndex + 1,
+        this.filteredCountriesBySearch.length - 1
+      );
+      this.scrollToSelected();
     },
-    onKeyDownHandler(e) {
-      const { showDropdown, filteredCountriesBySearch, onSelectCountry } = this;
-      const { selectedIndex } = this;
-
-      if (showDropdown) {
-        if (hasPressedArrowDownKey(e)) {
-          e.preventDefault();
-          this.selectedIndex = Math.min(
-            selectedIndex + 1,
-            filteredCountriesBySearch.length - 1
-          );
-          this.$refs.dropdown.scrollTop = this.focusedItemIndex() * 28;
-        } else if (hasPressedArrowUpKey(e)) {
-          e.preventDefault();
-          this.selectedIndex = Math.max(selectedIndex - 1, 0);
-          this.$refs.dropdown.scrollTop = this.focusedItemIndex() * 28 - 56;
-        } else if (isEnter(e)) {
-          e.preventDefault();
-          onSelectCountry(filteredCountriesBySearch[selectedIndex]);
+    scrollToSelected() {
+      this.$nextTick(() => {
+        const dropdown = this.$refs.dropdown;
+        const selectedItem = this.$refs.dropdownItem[this.selectedIndex];
+        const dropdownSearchbarHeight = 40;
+        if (selectedItem) {
+          const selectedItemTop = selectedItem.offsetTop;
+          dropdown.scrollTop = selectedItemTop - dropdownSearchbarHeight;
         }
-      }
+      });
     },
     onSelectCountry(country) {
+      if (!country || !this.showDropdown) return;
       this.activeCountryCode = country.id;
       this.searchCountry = '';
       this.activeDialCode = country.dial_code;
       this.$emit('setCode', country.dial_code);
       this.closeDropdown();
+      this.$refs.phoneNumberInput.focus();
     },
     setActiveCountry() {
       const { phoneNumber } = this;
@@ -251,46 +258,3 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
-.phone-input--wrap {
-  .phone-input {
-    @apply flex items-center dark:bg-slate-900 justify-start mb-4 rounded-md border border-solid border-slate-200 dark:border-slate-600;
-
-    &.has-error {
-      @apply border border-solid border-red-400 dark:border-red-400;
-    }
-  }
-
-  .phone-input--field {
-    @apply mb-0 rounded-tl-none rounded-bl-none border-0 w-full dark:bg-slate-900 text-base px-1.5;
-
-    &::placeholder {
-      @apply font-normal;
-    }
-  }
-
-  .country-dropdown {
-    @apply z-10 absolute h-60 w-[12.5rem] shadow-md overflow-y-auto top-10 rounded px-0 pt-0 pb-1 bg-white dark:bg-slate-900;
-
-    .dropdown-search--wrap {
-      @apply top-0 sticky bg-white dark:bg-slate-900 p-1;
-
-      .dropdown-search {
-        @apply h-8 mb-0 text-sm border border-solid border-slate-200 dark:border-slate-600;
-      }
-    }
-
-    .country-dropdown--item {
-      @apply flex items-center h-7 py-0 px-1 cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-700;
-
-      &.active {
-        @apply bg-slate-50 dark:bg-slate-700;
-      }
-
-      &.focus {
-        @apply bg-slate-25 dark:bg-slate-800;
-      }
-    }
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
index fb28f00c0d9ff..b8780773f225c 100644
--- a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
+++ b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
@@ -84,9 +84,7 @@ export default {
     },
   },
   methods: {
-    handleKeyboardEvent(e) {
-      this.processKeyDownEvent(e);
-    },
+    adjustScroll() {},
     onHover(index) {
       this.selectedIndex = index;
     },
diff --git a/app/javascript/dashboard/components/widgets/mentions/mentionSelectionKeyboardMixin.js b/app/javascript/dashboard/components/widgets/mentions/mentionSelectionKeyboardMixin.js
index 418c5991b6a8c..bd5e9bee7c65e 100644
--- a/app/javascript/dashboard/components/widgets/mentions/mentionSelectionKeyboardMixin.js
+++ b/app/javascript/dashboard/components/widgets/mentions/mentionSelectionKeyboardMixin.js
@@ -1,12 +1,7 @@
-import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 
 export default {
-  mounted() {
-    document.addEventListener('keydown', this.handleKeyboardEvent);
-  },
-  beforeDestroy() {
-    document.removeEventListener('keydown', this.handleKeyboardEvent);
-  },
+  mixins: [keyboardEventListenerMixins],
   methods: {
     moveSelectionUp() {
       if (!this.selectedIndex) {
@@ -14,6 +9,7 @@ export default {
       } else {
         this.selectedIndex -= 1;
       }
+      this.adjustScroll();
     },
     moveSelectionDown() {
       if (this.selectedIndex === this.items.length - 1) {
@@ -21,19 +17,46 @@ export default {
       } else {
         this.selectedIndex += 1;
       }
+      this.adjustScroll();
     },
-    processKeyDownEvent(e) {
-      const keyPattern = buildHotKeys(e);
-      if (['arrowup', 'ctrl+p'].includes(keyPattern)) {
-        this.moveSelectionUp();
-        e.preventDefault();
-      } else if (['arrowdown', 'ctrl+n'].includes(keyPattern)) {
-        this.moveSelectionDown();
-        e.preventDefault();
-      } else if (keyPattern === 'enter') {
-        this.onSelect();
-        e.preventDefault();
-      }
+    getKeyboardEvents() {
+      return {
+        ArrowUp: {
+          action: e => {
+            this.moveSelectionUp();
+            e.preventDefault();
+          },
+          allowOnFocusedInput: true,
+        },
+        'Control+KeyP': {
+          action: e => {
+            this.moveSelectionUp();
+            e.preventDefault();
+          },
+          allowOnFocusedInput: true,
+        },
+        ArrowDown: {
+          action: e => {
+            this.moveSelectionDown();
+            e.preventDefault();
+          },
+          allowOnFocusedInput: true,
+        },
+        'Control+KeyN': {
+          action: e => {
+            this.moveSelectionDown();
+            e.preventDefault();
+          },
+          allowOnFocusedInput: true,
+        },
+        Enter: {
+          action: e => {
+            this.onSelect();
+            e.preventDefault();
+          },
+          allowOnFocusedInput: true,
+        },
+      };
     },
   },
 };
diff --git a/app/javascript/dashboard/components/widgets/mentions/specs/mentionSelectionKeyboardMixin.spec.js b/app/javascript/dashboard/components/widgets/mentions/specs/mentionSelectionKeyboardMixin.spec.js
index 296c65d194700..45a98c5b77c6a 100644
--- a/app/javascript/dashboard/components/widgets/mentions/specs/mentionSelectionKeyboardMixin.spec.js
+++ b/app/javascript/dashboard/components/widgets/mentions/specs/mentionSelectionKeyboardMixin.spec.js
@@ -1,64 +1,69 @@
-import mentionSelectionKeyboardMixin from '../mentionSelectionKeyboardMixin';
-import { shallowMount } from '@vue/test-utils';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
+
+const localVue = createLocalVue();
 
 const buildComponent = ({ data = {}, methods = {} }) => ({
   render() {},
   data() {
-    return data;
+    return { ...data, selectedIndex: 0, items: [1, 2, 3] };
   },
-  methods,
-  mixins: [mentionSelectionKeyboardMixin],
+  methods: { ...methods, onSelect: jest.fn(), adjustScroll: jest.fn() },
+  mixins: [keyboardEventListenerMixins],
 });
 
 describe('mentionSelectionKeyboardMixin', () => {
-  test('register listeners', () => {
-    jest.spyOn(document, 'addEventListener');
+  let wrapper;
+
+  beforeEach(() => {
     const Component = buildComponent({});
-    shallowMount(Component);
-    // undefined expected as the method is not defined in the component
-    expect(document.addEventListener).toHaveBeenCalledWith(
-      'keydown',
-      undefined
-    );
+    wrapper = shallowMount(Component, { localVue });
   });
 
-  test('processKeyDownEvent updates index on arrow up', () => {
-    const Component = buildComponent({
-      data: { selectedIndex: 0, items: [1, 2, 3] },
-    });
-    const wrapper = shallowMount(Component);
-    wrapper.vm.processKeyDownEvent({
-      ctrlKey: true,
-      key: 'p',
-      preventDefault: jest.fn(),
-    });
-    expect(wrapper.vm.selectedIndex).toBe(2);
+  it('ArrowUp and Control+KeyP update selectedIndex correctly', () => {
+    const preventDefault = jest.fn();
+    const keyboardEvents = wrapper.vm.getKeyboardEvents();
+
+    if (keyboardEvents && keyboardEvents.ArrowUp) {
+      keyboardEvents.ArrowUp.action({ preventDefault });
+      expect(wrapper.vm.selectedIndex).toBe(2);
+      expect(preventDefault).toHaveBeenCalled();
+    }
+
+    wrapper.setData({ selectedIndex: 1 });
+    if (keyboardEvents && keyboardEvents['Control+KeyP']) {
+      keyboardEvents['Control+KeyP'].action({ preventDefault });
+      expect(wrapper.vm.selectedIndex).toBe(0);
+      expect(preventDefault).toHaveBeenCalledTimes(2);
+    }
   });
 
-  test('processKeyDownEvent updates index on arrow down', () => {
-    const Component = buildComponent({
-      data: { selectedIndex: 0, items: [1, 2, 3] },
-    });
-    const wrapper = shallowMount(Component);
-    wrapper.vm.processKeyDownEvent({
-      key: 'ArrowDown',
-      preventDefault: jest.fn(),
-    });
-    expect(wrapper.vm.selectedIndex).toBe(1);
+  it('ArrowDown and Control+KeyN update selectedIndex correctly', () => {
+    const preventDefault = jest.fn();
+    const keyboardEvents = wrapper.vm.getKeyboardEvents();
+
+    if (keyboardEvents && keyboardEvents.ArrowDown) {
+      keyboardEvents.ArrowDown.action({ preventDefault });
+      expect(wrapper.vm.selectedIndex).toBe(1);
+      expect(preventDefault).toHaveBeenCalled();
+    }
+
+    wrapper.setData({ selectedIndex: 1 });
+    if (keyboardEvents && keyboardEvents['Control+KeyN']) {
+      keyboardEvents['Control+KeyN'].action({ preventDefault });
+      expect(wrapper.vm.selectedIndex).toBe(2);
+      expect(preventDefault).toHaveBeenCalledTimes(2);
+    }
   });
 
-  test('processKeyDownEvent calls select methods on Enter Key', () => {
-    const onSelectMockFn = jest.fn();
-    const Component = buildComponent({
-      data: { selectedIndex: 0, items: [1, 2, 3] },
-      methods: { onSelect: () => onSelectMockFn('enterKey pressed') },
-    });
-    const wrapper = shallowMount(Component);
-    wrapper.vm.processKeyDownEvent({
-      key: 'Enter',
-      preventDefault: jest.fn(),
-    });
-    expect(onSelectMockFn).toHaveBeenCalledWith('enterKey pressed');
-    wrapper.vm.onSelect();
+  it('Enter key triggers onSelect method', () => {
+    const preventDefault = jest.fn();
+    const keyboardEvents = wrapper.vm.getKeyboardEvents();
+
+    if (keyboardEvents && keyboardEvents.Enter) {
+      keyboardEvents.Enter.action({ preventDefault });
+      expect(wrapper.vm.onSelect).toHaveBeenCalled();
+      expect(preventDefault).toHaveBeenCalled();
+    }
   });
 });
diff --git a/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue b/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
index 75b18607df329..ffaab7e618f9b 100644
--- a/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
+++ b/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
@@ -87,7 +87,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import { SHORTCUT_KEYS } from './constants';
 import Hotkey from 'dashboard/components/base/Hotkey.vue';
 
@@ -95,7 +94,6 @@ export default {
   components: {
     Hotkey,
   },
-  mixins: [clickaway],
   props: {
     show: {
       type: Boolean,
diff --git a/app/javascript/dashboard/components/widgets/modal/constants.js b/app/javascript/dashboard/components/widgets/modal/constants.js
index 45a261767af0d..acee1f6fc8f1c 100644
--- a/app/javascript/dashboard/components/widgets/modal/constants.js
+++ b/app/javascript/dashboard/components/widgets/modal/constants.js
@@ -53,12 +53,6 @@ export const SHORTCUT_KEYS = [
     firstKey: 'Alt / ⌥',
     secondKey: 'S',
   },
-  {
-    id: 10,
-    label: 'SWITCH_CONVERSATION_STATUS',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'B',
-  },
   {
     id: 11,
     label: 'SWITCH_TO_PRIVATE_NOTE',
diff --git a/app/javascript/dashboard/composables/index.js b/app/javascript/dashboard/composables/index.js
new file mode 100644
index 0000000000000..4e600e7c3c037
--- /dev/null
+++ b/app/javascript/dashboard/composables/index.js
@@ -0,0 +1,12 @@
+import { getCurrentInstance } from 'vue';
+
+export const useTrack = () => {
+  const vm = getCurrentInstance();
+  if (!vm) throw new Error('must be called in setup');
+
+  return vm.proxy.$track;
+};
+
+export function useAlert(message, action) {
+  bus.$emit('newToastMessage', message, action);
+}
diff --git a/app/javascript/dashboard/composables/route.js b/app/javascript/dashboard/composables/route.js
new file mode 100644
index 0000000000000..896e7d9692c13
--- /dev/null
+++ b/app/javascript/dashboard/composables/route.js
@@ -0,0 +1,30 @@
+import { getCurrentInstance, reactive, watchEffect } from 'vue';
+
+/**
+ * Returns the current route location. Equivalent to using `$route` inside
+ * templates.
+ */
+export function useRoute() {
+  const instance = getCurrentInstance();
+  const route = reactive(Object.assign({}, instance.proxy.$root.$route));
+  watchEffect(() => {
+    Object.assign(route, instance.proxy.$root.$route);
+  });
+
+  return route;
+}
+
+/**
+ * Returns the router instance. Equivalent to using `$router` inside
+ * templates.
+ */
+export function useRouter() {
+  const instance = getCurrentInstance();
+  const router = instance.proxy.$root.$router;
+  watchEffect(() => {
+    if (router) {
+      Object.assign(router, instance.proxy.$root.$router);
+    }
+  });
+  return router;
+}
diff --git a/app/javascript/dashboard/composables/store.js b/app/javascript/dashboard/composables/store.js
new file mode 100644
index 0000000000000..f9edd184aca19
--- /dev/null
+++ b/app/javascript/dashboard/composables/store.js
@@ -0,0 +1,23 @@
+import { computed } from 'vue';
+import { getCurrentInstance } from 'vue';
+
+export const useStore = () => {
+  const vm = getCurrentInstance();
+  if (!vm) throw new Error('must be called in setup');
+  return vm.proxy.$store;
+};
+
+export const useStoreGetters = () => {
+  const store = useStore();
+  return Object.fromEntries(
+    Object.keys(store.getters).map(getter => [
+      getter,
+      computed(() => store.getters[getter]),
+    ])
+  );
+};
+
+export const mapGetter = key => {
+  const store = useStore();
+  return computed(() => store.getters[key]);
+};
diff --git a/app/javascript/dashboard/composables/useI18n.js b/app/javascript/dashboard/composables/useI18n.js
new file mode 100644
index 0000000000000..9bcdfe0207eaa
--- /dev/null
+++ b/app/javascript/dashboard/composables/useI18n.js
@@ -0,0 +1,32 @@
+import { computed, getCurrentInstance } from 'vue';
+import Vue from 'vue';
+import VueI18n from 'vue-i18n';
+
+let i18nInstance = VueI18n;
+
+export function useI18n() {
+  if (!i18nInstance) throw new Error('vue-i18n not initialized');
+
+  const i18n = i18nInstance;
+
+  const instance = getCurrentInstance();
+  const vm = instance?.proxy || instance || new Vue({});
+
+  const locale = computed({
+    get() {
+      return i18n.locale;
+    },
+    set(v) {
+      i18n.locale = v;
+    },
+  });
+
+  return {
+    locale,
+    t: vm.$t.bind(vm),
+    tc: vm.$tc.bind(vm),
+    d: vm.$d.bind(vm),
+    te: vm.$te.bind(vm),
+    n: vm.$n.bind(vm),
+  };
+}
diff --git a/app/javascript/dashboard/helper/scriptHelpers.js b/app/javascript/dashboard/helper/scriptHelpers.js
index 1169f2ee8b625..ef1917c1393e8 100644
--- a/app/javascript/dashboard/helper/scriptHelpers.js
+++ b/app/javascript/dashboard/helper/scriptHelpers.js
@@ -1,5 +1,4 @@
 import AnalyticsHelper from './AnalyticsHelper';
-import LogRocket from 'logrocket';
 import DashboardAudioNotificationHelper from './AudioAlerts/DashboardAudioNotificationHelper';
 
 export const CHATWOOT_SET_USER = 'CHATWOOT_SET_USER';
@@ -11,12 +10,6 @@ export const ANALYTICS_RESET = 'ANALYTICS_RESET';
 export const initializeAnalyticsEvents = () => {
   window.bus.$on(ANALYTICS_IDENTITY, ({ user }) => {
     AnalyticsHelper.identify(user);
-    if (window.logRocketProjectId) {
-      LogRocket.identify(user.id, {
-        email: user.email,
-        name: user.name,
-      });
-    }
   });
 };
 
diff --git a/app/javascript/dashboard/i18n/locale/am/bulkActions.json b/app/javascript/dashboard/i18n/locale/am/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/am/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/am/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/am/contact.json b/app/javascript/dashboard/i18n/locale/am/contact.json
index 24483ca1ad7ef..4db7fce93e026 100644
--- a/app/javascript/dashboard/i18n/locale/am/contact.json
+++ b/app/javascript/dashboard/i18n/locale/am/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/am/conversation.json b/app/javascript/dashboard/i18n/locale/am/conversation.json
index d6ea8f83d75c1..742a3657e8560 100644
--- a/app/javascript/dashboard/i18n/locale/am/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/am/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/am/datePicker.json b/app/javascript/dashboard/i18n/locale/am/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/am/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/am/generalSettings.json b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/am/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
index 8d1662f91f0e6..a168e82f02bb3 100644
--- a/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/am/settings.json b/app/javascript/dashboard/i18n/locale/am/settings.json
index bfc1a79df27cf..4dca590e96dc1 100644
--- a/app/javascript/dashboard/i18n/locale/am/settings.json
+++ b/app/javascript/dashboard/i18n/locale/am/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/am/sla.json b/app/javascript/dashboard/i18n/locale/am/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/am/sla.json
+++ b/app/javascript/dashboard/i18n/locale/am/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ar/automation.json b/app/javascript/dashboard/i18n/locale/ar/automation.json
index 4fd813c1314ef..36cff8c31fdce 100644
--- a/app/javascript/dashboard/i18n/locale/ar/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/automation.json
@@ -87,8 +87,8 @@
     },
     "CONDITION": {
       "DELETE_MESSAGE": "يجب أن يكون لديك على الأقل شرط واحد للحفظ",
-      "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes",
-      "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes"
+      "CONTACT_CUSTOM_ATTR_LABEL": "سمة مخصصة لجهة اتصال",
+      "CONVERSATION_CUSTOM_ATTR_LABEL": "سمة مخصصة للمحادثة"
     },
     "ACTION": {
       "DELETE_MESSAGE": "يجب أن يكون لديك على الأقل شرط واحد للحفظ",
@@ -111,7 +111,7 @@
       "UPLOAD_ERROR": "تعذر تحميل المرفق، الرجاء المحاولة مرة أخرى",
       "LABEL_IDLE": "ارفع المرفق",
       "LABEL_UPLOADING": "جاري الرفع...",
-      "LABEL_UPLOADED": "Successfully Uploaded",
+      "LABEL_UPLOADED": "تم الرفع بنجاح",
       "LABEL_UPLOAD_FAILED": "فشل الرفع"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
index 38af8fcedfd1b..7425dfe1fb6fe 100644
--- a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "جاري تحميل الوكلاء",
     "UPDATE": {
       "CHANGE_STATUS": "تغيير الحالة",
-      "SNOOZE_UNTIL_NEXT_REPLY": "غفوة حتى الرد القادم.",
+      "SNOOZE_UNTIL": "غفوة",
       "UPDATE_SUCCESFUL": "تم تحديث حالة المحادثة بنجاح.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
index 9d16ad34747d1..2278670e363ea 100644
--- a/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
@@ -1,8 +1,8 @@
 {
   "CANNED_MGMT": {
     "HEADER": "الردود السريعة",
-    "HEADER_BTN_TXT": "Add canned response",
-    "LOADING": "Fetching canned responses...",
+    "HEADER_BTN_TXT": "إضافة رد جاهز",
+    "LOADING": "جاري جلب الردود الجاهزة...",
     "SEARCH_404": "لا توجد عناصر مطابقة لهذا الاستعلام.",
     "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are pre-written reply templates that help you quickly respond to a conversation. To insert a canned response during a chat, agents can type a short code preceded by a '/' character. </p><p> You can manage your canned responses from this page or create new ones using the \"Add canned response\" button.</p><p>Open the <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Canned Responses handbook</a> in another tab for a helping hand.</p><p>Also, check out the all-new <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Canned Responses Library</a>.</p>",
     "LIST": {
@@ -10,66 +10,66 @@
       "TITLE": "إدارة الردود الجاهزة",
       "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
       "TABLE_HEADER": [
-        "Short code",
+        "كود مختصر",
         "المحتوى",
         "الإجراءات"
       ]
     },
     "ADD": {
-      "TITLE": "Add canned response",
+      "TITLE": "إضافة رد جاهز",
       "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
       "CANCEL_BUTTON_TEXT": "إلغاء",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short code",
-          "PLACEHOLDER": "Please enter a short code.",
-          "ERROR": "Short Code is required."
+          "LABEL": "كود مختصر",
+          "PLACEHOLDER": "من فضلك ادخل الكود مختصر.",
+          "ERROR": "الكود مختصر مطلوب."
         },
         "CONTENT": {
           "LABEL": "رسالة",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
-          "ERROR": "Message is required."
+          "PLACEHOLDER": "من فضلك ادخل نص لرسالة التي ترغب في حفظها كقالب لاستخدامها لاحقاُ.",
+          "ERROR": "الرسالة مطلوبة."
         },
         "SUBMIT": "إرسال"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned response added successfully.",
+        "SUCCESS_MESSAGE": "تم إضافة الرد المعد مسبقاً بنجاح.",
         "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
       }
     },
     "EDIT": {
-      "TITLE": "Edit canned response",
+      "TITLE": "تعديل الرد المعد مسبقاً",
       "CANCEL_BUTTON_TEXT": "إلغاء",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short code",
-          "PLACEHOLDER": "Please enter a shortcode.",
-          "ERROR": "Short code is required."
+          "LABEL": "كود مختصر",
+          "PLACEHOLDER": "من فضلك ادخل الكود مختصر.",
+          "ERROR": "الكود مختصر مطلوب."
         },
         "CONTENT": {
           "LABEL": "رسالة",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "PLACEHOLDER": "من فضلك ادخل نص لرسالة التي ترغب في حفظها كقالب لاستخدامها لاحقاُ.",
           "ERROR": "الرسالة مطلوبة."
         },
         "SUBMIT": "إرسال"
       },
       "BUTTON_TEXT": "تعديل",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response is updated successfully.",
+        "SUCCESS_MESSAGE": "تم تحديث الرد المعد مسبقاً بنجاح.",
         "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "حذف",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully.",
+        "SUCCESS_MESSAGE": "تم حذف الرد المعد مسبقاً بنجاح.",
         "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
       },
       "CONFIRM": {
         "TITLE": "تأكيد الحذف",
         "MESSAGE": "هل أنت متأكد من الحذف ",
-        "YES": "Yes, delete ",
-        "NO": "No, keep "
+        "YES": "نعم, حذف ",
+        "NO": "لا, قم بالابقاء عليه "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ar/chatlist.json b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
index 68f1e443df4dd..8dae1724326e7 100644
--- a/app/javascript/dashboard/i18n/locale/ar/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
@@ -43,7 +43,7 @@
     },
     "CHAT_TIME_STAMP": {
       "CREATED": {
-        "LATEST": "Created",
+        "LATEST": "مضاف",
         "OLDEST": "تم إنشاؤها في:"
       },
       "LAST_ACTIVITY": {
@@ -53,10 +53,10 @@
     },
     "SORT_ORDER_ITEMS": {
       "last_activity_at_asc": {
-        "TEXT": "Last activity: Oldest first"
+        "TEXT": "اخر نشاط: آلأقدم أولا"
       },
       "last_activity_at_desc": {
-        "TEXT": "Last activity: Newest first"
+        "TEXT": "اخر نشاط: الأحدث أولا"
       },
       "created_at_desc": {
         "TEXT": "Created at: Newest first"
@@ -111,7 +111,7 @@
         },
         "LAST_USER_MESSAGE_AT": {
           "NAME": "Last user message at",
-          "LABEL": "Last message"
+          "LABEL": "أخر رسالة"
         }
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index fc264238c8188..52b73f56d0644 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -15,7 +15,7 @@
     "INITIATED_FROM": "تم البدء من",
     "INITIATED_AT": "تم البدء في",
     "IP_ADDRESS": "عنوان IP",
-    "CREATED_AT_LABEL": "Created",
+    "CREATED_AT_LABEL": "أضيفت",
     "NEW_MESSAGE": "رسالة جديدة",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "لا توجد محادثات سابقة مرتبطة بجهة الاتصال هذه.",
@@ -39,16 +39,17 @@
     },
     "MERGE_CONTACT": "دمج جهة الاتصال",
     "CONTACT_ACTIONS": "إجراءات جهات الاتصال",
-    "MUTE_CONTACT": "Block Contact",
-    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTE_CONTACT": "احجب جهة الاتصال",
+    "UNMUTE_CONTACT": "إلغاء حجب جهة الاتصال",
     "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
-    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
+    "UNMUTED_SUCCESS": "تم إلغاء حجب جهة الاتصال بنجاح.",
     "SEND_TRANSCRIPT": "إرسال النص",
     "EDIT_LABEL": "تعديل",
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "سمات مخصصة",
       "CONTACT_LABELS": "تصنفيات جهات الاتصال",
-      "PREVIOUS_CONVERSATIONS": "المحادثات السابقة"
+      "PREVIOUS_CONVERSATIONS": "المحادثات السابقة",
+      "NO_RECORDS_FOUND": "لم يتم العثور على سمات"
     }
   },
   "EDIT_CONTACT": {
@@ -75,16 +76,17 @@
     "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
   },
   "EXPORT_CONTACTS": {
-    "BUTTON_LABEL": "Export",
-    "TITLE": "Export Contacts",
-    "DESC": "Export contacts to a CSV file.",
+    "BUTTON_LABEL": "تصدير",
+    "TITLE": "تصدير جهات الاتصال",
+    "DESC": "تصدير جهات الاتصال إلى ملف CSV.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
     "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى",
     "CONFIRM": {
-      "TITLE": "Export Contacts",
+      "TITLE": "تصدير جهات الاتصال",
       "MESSAGE": "Are you sure you want to export all contacts?",
-      "YES": "Yes, Export",
-      "NO": "No, Cancel"
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
+      "YES": "نعم, قم بالتصدير",
+      "NO": "نعم, إلغاء"
     }
   },
   "DELETE_NOTE": {
@@ -148,15 +150,15 @@
         "LABEL": "اسم الشركة"
       },
       "COUNTRY": {
-        "PLACEHOLDER": "Enter the country name",
+        "PLACEHOLDER": "إدخال اسم الدولة",
         "LABEL": "اسم الدولة",
         "SELECT_PLACEHOLDER": "اختر",
         "REMOVE": "حذف",
-        "SELECT_COUNTRY": "Select Country"
+        "SELECT_COUNTRY": "أختر الدولة"
       },
       "CITY": {
-        "PLACEHOLDER": "Enter the city name",
-        "LABEL": "City Name"
+        "PLACEHOLDER": "إدخال اسم المدينة",
+        "LABEL": "اسم المدينة"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
@@ -197,7 +199,7 @@
       },
       "INBOX": {
         "LABEL": "صندوق الوارد",
-        "PLACEHOLDER": "Choose source inbox",
+        "PLACEHOLDER": "اختر صندوق المصدر",
         "ERROR": "حدد صندوق الوارد"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index f217b39a1774a..f205d54abc411 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -149,7 +149,7 @@
       "PRIVATE_NOTE": "إضافة ملاحظة خاصة",
       "SEND": "إرسال",
       "CREATE": "إضافة ملاحظة",
-      "INSERT_READ_MORE": "Read more",
+      "INSERT_READ_MORE": "اقرأ المزيد",
       "DISMISS_REPLY": "Dismiss reply",
       "REPLYING_TO": "Replying to:",
       "TIP_FORMAT_ICON": "عرض محرر النصوص",
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "إنشاء سمة جديدة",
+    "NO_RECORDS_FOUND": "لم يتم العثور على سمات",
     "UPDATE": {
       "SUCCESS": "تم تحديث السمة المخصصة بنجاح",
       "ERROR": "غير قادر على تحديث السمة. الرجاء المحاولة مرة أخرى لاحقاً"
diff --git a/app/javascript/dashboard/i18n/locale/ar/csatMgmt.json b/app/javascript/dashboard/i18n/locale/ar/csatMgmt.json
index 1528669f1c1f4..636135f6572fa 100644
--- a/app/javascript/dashboard/i18n/locale/ar/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/csatMgmt.json
@@ -3,11 +3,11 @@
     "TITLE": "قيم محادثتك",
     "PLACEHOLDER": "أخبرنا المزيد...",
     "RATINGS": {
-      "POOR": "😞 Poor",
-      "FAIR": "😑 Fair",
-      "AVERAGE": "😐 Average",
-      "GOOD": "😀 Good",
-      "EXCELLENT": "😍 Excellent"
+      "POOR": "😞 سيئ",
+      "FAIR": "مقبول😑",
+      "AVERAGE": "😐 متوسط",
+      "GOOD": "😀 جيد",
+      "EXCELLENT": "😍 ممتاز"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/datePicker.json b/app/javascript/dashboard/i18n/locale/ar/datePicker.json
new file mode 100644
index 0000000000000..1fa696c1f18a4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "تطبيق",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "آخر 7 أيام",
+      "LAST_30_DAYS": "آخر 30 يوماً",
+      "LAST_3_MONTHS": "آخر 3 أشهر",
+      "LAST_6_MONTHS": "آخر 6 أشهر",
+      "LAST_YEAR": "العام الماضي",
+      "CUSTOM_RANGE": "تحديد نطاق المدة"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/general.json b/app/javascript/dashboard/i18n/locale/ar/general.json
index 25bb4dfb736d2..aed1f077ab41e 100644
--- a/app/javascript/dashboard/i18n/locale/ar/general.json
+++ b/app/javascript/dashboard/i18n/locale/ar/general.json
@@ -1,5 +1,5 @@
 {
   "GENERAL": {
-    "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items"
+    "SHOWING_RESULTS": "عرض{firstIndex}-{lastIndex} من {totalCount} إجماليي العناصر"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index 1669d99f531ea..14d2252f55a49 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -3,7 +3,7 @@
     "TITLE": "إعدادات الحساب",
     "SUBMIT": "تحديث الإعدادات",
     "BACK": "العودة",
-    "DISMISS": "Dismiss",
+    "DISMISS": "تجاهل",
     "UPDATE": {
       "ERROR": "تعذر تحديث الإعدادات، الرجاء المحاولة مرة أخرى!",
       "SUCCESS": "تم تحديث إعدادات الحساب بنجاح"
@@ -52,7 +52,7 @@
     "LEARN_MORE": "اعرف المزيد",
     "PAYMENT_PENDING": "Your payment is pending. Please update your payment information to continue using Chatwoot",
     "LIMITS_UPGRADE": "Your account has exceeded the usage limits, please upgrade your plan to continue using Chatwoot",
-    "OPEN_BILLING": "Open billing"
+    "OPEN_BILLING": "فتح الفواتير"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -107,16 +107,17 @@
       "GENERAL": "عام",
       "REPORTS": "التقارير",
       "CONVERSATION": "المحادثات",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "تغيير المحال إليه",
-      "CHANGE_PRIORITY": "Change Priority",
+      "CHANGE_PRIORITY": "تغيير الأولوية",
       "CHANGE_TEAM": "تغيير الفريق",
       "SNOOZE_CONVERSATION": "تأجيل المحادثة",
       "ADD_LABEL": "إضافة تسمية إلى المحادثة",
       "REMOVE_LABEL": "إزالة التسمية من المحادثة",
       "SETTINGS": "الإعدادات",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "APPEARANCE": "مظهر",
+      "SNOOZE_NOTIFICATION": "تأجيل التنبيهات"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "الذهاب إلى لوحة المحادثة",
@@ -139,7 +140,7 @@
       "ADD_LABELS_TO_CONVERSATION": "إضافة تسمية إلى المحادثة",
       "ASSIGN_AN_AGENT": "تعيين وكيل",
       "AI_ASSIST": "AI Assist",
-      "ASSIGN_PRIORITY": "Assign priority",
+      "ASSIGN_PRIORITY": "تعيين الأولوية",
       "ASSIGN_A_TEAM": "تعيين فريق",
       "MUTE_CONVERSATION": "كتم المحادثة",
       "UNMUTE_CONVERSATION": "إلغاء كتم المحادثة",
@@ -151,21 +152,21 @@
       "UNTIL_NEXT_REPLY": "حتى الرد القادم",
       "UNTIL_NEXT_WEEK": "حتى الأسبوع القادم",
       "UNTIL_TOMORROW": "حتى الغد",
-      "UNTIL_NEXT_MONTH": "Until next month",
-      "AN_HOUR_FROM_NOW": "Until an hour from now",
-      "CUSTOM": "Custom...",
-      "CHANGE_APPEARANCE": "Change Appearance",
+      "UNTIL_NEXT_MONTH": "حتي الشهر القادم",
+      "AN_HOUR_FROM_NOW": "حتي ساعة من الأن",
+      "CUSTOM": "مخصص...",
+      "CHANGE_APPEARANCE": "تغيير المظهر",
       "LIGHT_MODE": "Light",
-      "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "DARK_MODE": "مظلم",
+      "SYSTEM_MODE": "نظام",
+      "SNOOZE_NOTIFICATION": "تأجيل التنبيهات"
     }
   },
   "DASHBOARD_APPS": {
     "LOADING_MESSAGE": "تحميل تطبيق لوحة التحكم..."
   },
   "COMMON": {
-    "OR": "Or",
+    "OR": "أو",
     "CLICK_HERE": "اضغط هنا"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 8b6e42b4543c9..23c977988670c 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "إضافة موظفين إلى صندوق الوارد الخاص بقناة التواصل التي تم إنشاؤها."
       },
       {
-        "title": "مرحى!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "أصبح كل شيء جاهزاً الآن!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "اختر صفحة من القائمة",
         "INBOX_NAME": "اسم صندوق الوارد لقناة التواصل",
         "ADD_NAME": "قم بتعيين اسم لصندوق الوارد الخاص بقناتك الجديدة",
-        "PICK_NAME": "اختر اسم لقناة التواصل الخاصة بك",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "اختر قيمة"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "رابط Webhook",
-          "PLACEHOLDER": "أدخل رابط Webhook",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "الرجاء إدخال عنوان URL صالح"
         },
         "CHANNEL_DOMAIN": {
@@ -112,14 +112,14 @@
           "ERROR": "هذا الحقل مطلوب"
         },
         "API_KEY": {
-          "USE_API_KEY": "Use API Key Authentication",
-          "LABEL": "API Key SID",
-          "PLACEHOLDER": "Please enter your API Key SID",
+          "USE_API_KEY": "استخدم مفتاح مصادقة API",
+          "LABEL": "مفتاح API SID",
+          "PLACEHOLDER": "الرجاء إدخال معرف مفتاح واجهة برمجة التطبيقات API الخاص بك",
           "ERROR": "هذا الحقل مطلوب"
         },
         "API_KEY_SECRET": {
-          "LABEL": "API Key Secret",
-          "PLACEHOLDER": "Please enter your API Key Secret",
+          "LABEL": "مفتاح سر API",
+          "PLACEHOLDER": "الرجاء إدخال سر مفتاح API الخاص بك",
           "ERROR": "هذا الحقل مطلوب"
         },
         "MESSAGING_SERVICE_SID": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "مفتاح API",
-            "PLACEHOLDER": "الرجاء إدخال مفتاح API الخاص بك",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "هذا الحقل مطلوب"
           },
           "API_SECRET": {
             "LABEL": "سرية API",
-            "PLACEHOLDER": "الرجاء إدخال مفتاح API الخاص بك",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "هذا الحقل مطلوب"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "رمز التحقق من Webhook",
-          "PLACEHOLDER": "أدخل رمز التحقق الذي تريد إعداده لفيسبوك على شبكة الويب.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "الرجاء إدخال اسم صالح."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "رابط Webhook",
-          "SUBTITLE": "تكوين عنوان URL حيث تريد تلقي ردود المكالمات على الأحداث.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "رابط Webhook"
         },
         "SUBMIT_BUTTON": "إنشاء قناة API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "قناة البريد الالكتروني",
-        "DESC": "ربط البريد الإلكتروني الخاص بك.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "اسم القناة",
           "PLACEHOLDER": "الرجاء إدخال اسم القناة",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "موظف الدعم",
         "DESC": "هنا يمكنك إضافة موظفين لإدارة صندوق الوارد الخاص بقناة تواصلك التي تم إنشاؤها حديثاً. الموظفين الذين يتم تحديدهم هنا هم فقط من يمكنهم الوصول إلى صندوق الوارد الخاص بتلك القناة. الموظفين الذين ليسوا جزءاً من صندوق الوارد هذا لن يكونوا قادرين على رؤية أو الرد على الرسائل في قناة التواصل هذه عند تسجيل الدخول. <br> <b>ملحوظة:</b> كمسؤول، إذا كنت بحاجة إلى الوصول إلى جميع صناديق الوارد، يجب عليك إضافة نفسك كموظف لجميع صناديق الوارد الخاصة بقنوات التواصل التي تنشئها.",
-        "VALIDATION_ERROR": "إضافة وكيل واحد على الأقل إلى علبة الوارد الجديدة",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "اختر وكلاء لصندوق الوارد"
       },
       "DETAILS": {
@@ -357,7 +357,7 @@
         "DESC": "لقد تم بنجاح ربط صفحة فيسبوك الخاصة بك مع Chatwoot. في المرة القادمة التي يرسل فيها العملاء رسالة إلى صفحتك، ستظهر المحادثة تلقائيًا على صندوق الوارد الخاص بك هنا.<br>نحن نزودك أيضًا بالكود النصي لصندوق دردشة الماسنجر والذي يمكنك إضافته بسهولة إلى الموقع الخاص بك لاستقبال الرسائل من الزوار كذلك. بمجرد أن يتم ذلك على موقع الويب الخاص بك، يمكن للعملاء مراسلتك من موقع الويب الخاص بك بدون الحاجة لأي أدوات خارجية وستظهر المحادثة هنا على Chatwoot.<br>رائع، أليس كذلك؟ نحن بالتأكيد نحاول أن نكون الأفضل :)"
       },
       "EMAIL_PROVIDER": {
-        "TITLE": "Select your email provider",
+        "TITLE": "حدد مزود البريد الإلكتروني الخاص بك",
         "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
       },
       "MICROSOFT": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,7 +508,7 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "السماح بالرسائل بعد حل المحادثة",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "السماح للمستخدمين النهائيين بإرسال رسائل حتى بعد تسوية المحادثة.",
       "WHATSAPP_SECTION_SUBHEADER": "يتم استخدام مفتاح API هذا للتكامل مع واتسب APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "مفتاح API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "لتمكين SMTP ، الرجاء تكوين IMAP.",
       "UPDATE": "تحديث الإعدادات",
       "TOGGLE_AVAILABILITY": "تمكين تكوين IMAP لهذا البريد الوارد",
-      "TOGGLE_HELP": "تمكين IMAP سيساعد المستخدم على تلقي البريد الإلكتروني",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "تم تحديث إعدادات IMAP بنجاح",
         "ERROR_MESSAGE": "غير قادر على تحديث إعدادات IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index 6112b3b1df7d3..7bd05d20d1f0f 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -131,7 +131,7 @@
         "KEY_PLACEHOLDER": "Enter your OpenAI API key",
         "BUTTONS": {
           "NEED_HELP": "تحتاج مساعدة؟",
-          "DISMISS": "Dismiss",
+          "DISMISS": "تجاهل",
           "FINISH": "Finish Setup"
         },
         "DISMISS_MESSAGE": "You can setup OpenAI integration later Whenever you want.",
diff --git a/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
index f97a5d6d2ce79..4dd3c382ff554 100644
--- a/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
@@ -46,7 +46,7 @@
         "DISMISS": "Dismiss suggestion"
       },
       "POWERED_BY": "Chatwoot AI",
-      "DISMISS": "Dismiss",
+      "DISMISS": "تجاهل",
       "ADD_SELECTED_LABELS": "Add selected labels",
       "ADD_SELECTED_LABEL": "Add selected label",
       "ADD_ALL_LABELS": "Add all labels"
diff --git a/app/javascript/dashboard/i18n/locale/ar/login.json b/app/javascript/dashboard/i18n/locale/ar/login.json
index 4577fff091f46..0120d68be319e 100644
--- a/app/javascript/dashboard/i18n/locale/ar/login.json
+++ b/app/javascript/dashboard/i18n/locale/ar/login.json
@@ -16,9 +16,9 @@
       "UNAUTH": "اسم المستخدم / كلمة المرور غير صحيحة. الرجاء المحاولة مرة أخرى"
     },
     "OAUTH": {
-      "GOOGLE_LOGIN": "Login with Google",
-      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
-      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+      "GOOGLE_LOGIN": "تسجيل الدخول بواسطة جوجل",
+      "BUSINESS_ACCOUNTS_ONLY": "الرجاء استخدام عنوان البريد الإلكتروني الخاص بشركتك لتسجيل الدخول",
+      "NO_ACCOUNT_FOUND": "لم نتمكن من العثور على حساب لعنوان البريد الإلكتروني الخاص بك."
     },
     "FORGOT_PASSWORD": "نسيت كلمة المرور؟",
     "CREATE_NEW_ACCOUNT": "إنشاء حساب جديد",
diff --git a/app/javascript/dashboard/i18n/locale/ar/search.json b/app/javascript/dashboard/i18n/locale/ar/search.json
index efd6cb572af42..297245baa7649 100644
--- a/app/javascript/dashboard/i18n/locale/ar/search.json
+++ b/app/javascript/dashboard/i18n/locale/ar/search.json
@@ -17,7 +17,7 @@
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "رد آلي",
-    "READ_MORE": "Read more",
+    "READ_MORE": "اقرأ المزيد",
     "WROTE": "wrote:",
     "FROM": "من",
     "EMAIL": "البريد الإلكتروني"
diff --git a/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
index aac8f2436c5d5..58b2e62a242a9 100644
--- a/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
@@ -1,13 +1,13 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set new password",
+    "TITLE": "تعيين كلمة مرور جديدة",
     "PASSWORD": {
       "LABEL": "كلمة المرور",
       "PLACEHOLDER": "كلمة المرور",
-      "ERROR": "Password is too short."
+      "ERROR": "كلمة المرور قصيرة جداً."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
+      "LABEL": "تأكيد كلمة المرور",
       "PLACEHOLDER": "تأكيد كلمة المرور",
       "ERROR": "كلمة المرور غير متطابقة."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index 880bc67af1966..14e13f3213355 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "تم تغيير كلمة المرور بنجاح",
     "AFTER_EMAIL_CHANGED": "تم تحديث ملفك الشخصي بنجاح، الرجاء تسجيل الدخول مرة أخرى حيث أنه قد تم تغيير بيانات تسجيل الدخول الخاصة بك",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "صورة الملف الشخصي",
       "ERROR": "الرجاء إصلاح الأخطاء في النموذج",
       "REMOVE_IMAGE": "حذف",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "رمز المصادقة",
-        "NOTE": "يمكن استخدام هذا رمز المصادقة إذا كنت تبني تطبيقات API للتكامل مع Chatwoot"
+        "NOTE": "يمكن استخدام هذا رمز المصادقة إذا كنت تبني تطبيقات API للتكامل مع Chatwoot",
+        "COPY": "نسخ"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "الإشعارات الصوتية",
         "NOTE": "تمكين التنبيهات الصوتية في لوحة التحكم للرسائل والمحادثات الجديدة.",
+        "ALERT_TYPES": {
+          "NONE": "لا شيء",
+          "MINE": "Assigned",
+          "ALL": "الكل"
+        },
         "ALERT_TYPE": {
-          "TITLE": "أحداث التنبيه:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "لا شيء",
           "ASSIGNED": "المحادثات المسندة",
           "ALL_CONVERSATIONS": "كل المحادثات"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "البريد الإلكتروني",
+        "PUSH": "الإشعارات الفورية",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "يتم تحديث إعدادات الإشعارات بنجاح",
         "UPDATE_ERROR": "حدث خطأ أثناء تحديث الإعدادات، الرجاء المحاولة مرة أخرى"
@@ -158,7 +182,7 @@
     "SELECTOR_SUBTITLE": "اختر حساباً من القائمة التالية",
     "PROFILE_SETTINGS": "إعدادات الملف الشخصي",
     "KEYBOARD_SHORTCUTS": "اختصارات لوحة المفاتيح",
-    "APPEARANCE": "Change Appearance",
+    "APPEARANCE": "تغيير المظهر",
     "SUPER_ADMIN_CONSOLE": "وحدة تحكم المدير المتميز",
     "LOGOUT": "تسجيل الخروج"
   },
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "الذهاب إلى شريط التقارير الجانبي",
       "MOVE_TO_NEXT_TAB": "نقل إلى علامة التبويب التالية في قائمة المحادثات",
       "GO_TO_SETTINGS": "انتقل إلى الإعدادات",
-      "SWITCH_CONVERSATION_STATUS": "التبديل إلى حالة المحادثة التالية",
       "SWITCH_TO_PRIVATE_NOTE": "التبديل إلى الملاحظة الخاصة",
       "SWITCH_TO_REPLY": "التبديل إلى الرد",
       "TOGGLE_SNOOZE_DROPDOWN": "تبديل القائمة المنسدلة"
diff --git a/app/javascript/dashboard/i18n/locale/ar/sla.json b/app/javascript/dashboard/i18n/locale/ar/sla.json
index 66335e645ab2a..8dcb4bde0e008 100644
--- a/app/javascript/dashboard/i18n/locale/ar/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ar/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/bg/bulkActions.json b/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
index 76693323f7b88..5b225f3cdf14e 100644
--- a/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index c341c843248d0..5a74a3ce75f70 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Персонализирани атрибути",
       "CONTACT_LABELS": "Етикети на контакта",
-      "PREVIOUS_CONVERSATIONS": "Предишни разговори"
+      "PREVIOUS_CONVERSATIONS": "Предишни разговори",
+      "NO_RECORDS_FOUND": "Няма намерени атрибути"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index 0e8f25233d948..6ef7ee90c56ac 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "Няма намерени атрибути",
     "UPDATE": {
       "SUCCESS": "Атрибута е обновен успешно",
       "ERROR": "Атрибута не бе обновен. Моля, опитайте отново по-късно"
diff --git a/app/javascript/dashboard/i18n/locale/bg/datePicker.json b/app/javascript/dashboard/i18n/locale/bg/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index dfb875f849def..69a6f4bba6828 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Разговор",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index 56859a3576a8a..3410fe61864e0 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Телефон",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -223,7 +223,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Телефон",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Агенти",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновяване",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 26fd853211fc3..f06a19771e67f 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "Нито един",
+          "MINE": "Assigned",
+          "ALL": "Всички"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Нито един",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Имейл",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/bg/sla.json b/app/javascript/dashboard/i18n/locale/bg/sla.json
index ed8827e609e11..4c64466815aba 100644
--- a/app/javascript/dashboard/i18n/locale/bg/sla.json
+++ b/app/javascript/dashboard/i18n/locale/bg/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
index 5b8453224dedc..96eaa0a3e1195 100644
--- a/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
@@ -1,17 +1,17 @@
 {
   "FILTER": {
     "TITLE": "Filtre de converses",
-    "SUBTITLE": "Add your filters below and hit 'Apply filters' to cut through the chat clutter.",
-    "EDIT_CUSTOM_FILTER": "Edit Folder",
-    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your folder.",
-    "ADD_NEW_FILTER": "Add filter",
-    "FILTER_DELETE_ERROR": "Oops, looks like we can't save nothing! Please add at least one filter to save it.",
+    "SUBTITLE": "Afegiu els vostres filtres a continuació i premeu 'Aplicar filtres' per eliminar el desordre del xat.",
+    "EDIT_CUSTOM_FILTER": "Edita la carpeta",
+    "CUSTOM_VIEWS_SUBTITLE": "Afegeix o elimina filtres i actualitza la teva carpeta.",
+    "ADD_NEW_FILTER": "Afegeix un filtre",
+    "FILTER_DELETE_ERROR": "Vaja, sembla que no podem desar res! Afegiu almenys un filtre per desar-lo.",
     "SUBMIT_BUTTON_LABEL": "Aplicar filtres",
-    "UPDATE_BUTTON_LABEL": "Update folder",
+    "UPDATE_BUTTON_LABEL": "Actualitza la carpeta",
     "CANCEL_BUTTON_LABEL": "Cancel·la",
-    "CLEAR_BUTTON_LABEL": "Clear filters",
-    "FOLDER_LABEL": "Folder Name",
-    "FOLDER_QUERY_LABEL": "Folder Query",
+    "CLEAR_BUTTON_LABEL": "Esborra els filtres",
+    "FOLDER_LABEL": "Nom de la carpeta",
+    "FOLDER_QUERY_LABEL": "Consulta de carpeta",
     "EMPTY_VALUE_ERROR": "El valor és necessari.",
     "TOOLTIP_LABEL": "Filtre de converses",
     "QUERY_DROPDOWN_LABELS": {
@@ -27,8 +27,8 @@
       "is_not_present": "No és present",
       "is_greater_than": "És més gran que",
       "is_less_than": "És més petit que",
-      "days_before": "Is x days before",
-      "starts_with": "Starts with"
+      "days_before": "És x dies abans",
+      "starts_with": "Comença amb"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "Cert",
@@ -36,66 +36,66 @@
     },
     "ATTRIBUTES": {
       "STATUS": "Estat",
-      "ASSIGNEE_NAME": "Assignee name",
-      "INBOX_NAME": "Inbox name",
-      "TEAM_NAME": "Team name",
-      "CONVERSATION_IDENTIFIER": "Conversation identifier",
-      "CAMPAIGN_NAME": "Campaign name",
+      "ASSIGNEE_NAME": "Nom assignat",
+      "INBOX_NAME": "Nom de la safata d'entrada",
+      "TEAM_NAME": "Nom de l'equip",
+      "CONVERSATION_IDENTIFIER": "Identificador de conversa",
+      "CAMPAIGN_NAME": "Nom de la campanya",
       "LABELS": "Etiquetes",
-      "BROWSER_LANGUAGE": "Browser language",
-      "PRIORITY": "Priority",
-      "COUNTRY_NAME": "Country name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "BROWSER_LANGUAGE": "Idioma del navegador",
+      "PRIORITY": "Prioritat",
+      "COUNTRY_NAME": "Nom del país",
+      "REFERER_LINK": "Enllaç de referència",
+      "CUSTOM_ATTRIBUTE_LIST": "Llista",
       "CUSTOM_ATTRIBUTE_TEXT": "Llista",
       "CUSTOM_ATTRIBUTE_NUMBER": "Número",
       "CUSTOM_ATTRIBUTE_LINK": "Enllaç",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-      "CREATED_AT": "Created at",
-      "LAST_ACTIVITY": "Last activity"
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Casella de selecció",
+      "CREATED_AT": "Creat a",
+      "LAST_ACTIVITY": "Última activitat"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard filters",
-      "ADDITIONAL_FILTERS": "Additional filters",
-      "CUSTOM_ATTRIBUTES": "Custom attributes"
+      "STANDARD_FILTERS": "Filtres estàndard",
+      "ADDITIONAL_FILTERS": "Filtres addicionals",
+      "CUSTOM_ATTRIBUTES": "Atributs personalitzats"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Name your filter to refer it later.",
-        "ERROR_MESSAGE": "Name is required.",
-        "SAVE_BUTTON": "Save filter",
+        "TITLE": "Vols desar aquest filtre?",
+        "LABEL": "Anomena aquest filtre",
+        "PLACEHOLDER": "Anomena el teu filtre per referir-lo més endavant.",
+        "ERROR_MESSAGE": "El nom és obligatori.",
+        "SAVE_BUTTON": "Desa el filtre",
         "CANCEL_BUTTON": "Cancel·la",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully.",
-          "ERROR_MESSAGE": "Error while creating folder."
+          "SUCCESS_MESSAGE": "Carpeta creada correctament.",
+          "ERROR_MESSAGE": "S'ha produït un error en crear la carpeta."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully.",
-          "ERROR_MESSAGE": "Error while creating segment."
+          "SUCCESS_MESSAGE": "Segment creat correctament.",
+          "ERROR_MESSAGE": "S'ha produït un error en crear el segment."
         }
       },
       "EDIT": {
-        "EDIT_BUTTON": "Edit folder"
+        "EDIT_BUTTON": "Editar la carpeta"
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Suprimir el filtre",
         "MODAL": {
           "CONFIRM": {
-            "TITLE": "Confirm deletion",
-            "MESSAGE": "Are you sure to delete the filter ",
-            "YES": "Yes, delete",
-            "NO": "No, keep it"
+            "TITLE": "Confirmar la supressió",
+            "MESSAGE": "Esteu segur que suprimiu el filtre ",
+            "YES": "Sí, esborra",
+            "NO": "No, guarda-ho"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully.",
-          "ERROR_MESSAGE": "Error while deleting folder."
+          "SUCCESS_MESSAGE": "La carpeta s'ha suprimit correctament.",
+          "ERROR_MESSAGE": "S'ha produït un error en suprimir la carpeta."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully.",
-          "ERROR_MESSAGE": "Error while deleting segment."
+          "SUCCESS_MESSAGE": "El segment s'ha suprimit correctament.",
+          "ERROR_MESSAGE": "S'ha produït un error en suprimir el segment."
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ca/agentBots.json b/app/javascript/dashboard/i18n/locale/ca/agentBots.json
index 05c65ed721411..a36ed40025c7d 100644
--- a/app/javascript/dashboard/i18n/locale/ca/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/ca/agentBots.json
@@ -1,7 +1,7 @@
 {
   "AGENT_BOTS": {
     "HEADER": "Bots",
-    "LOADING_EDITOR": "Loading editor...",
+    "LOADING_EDITOR": "S'està carregant l'editor...",
     "HEADER_BTN_TXT": "Add bot configuration",
     "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try.</p> <p> You can manage your bots from this page or create new ones using the 'Add bot configuraton' button.</p> <p> Open the <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">Agent bots handbook</a> in another tab for a helping hand.</p>",
     "CSML_BOT_EDITOR": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
index 829bcc7efd42d..33d2d85066231 100644
--- a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agents",
     "HEADER_BTN_TXT": "Afegir Agent",
     "LOADING": "S'està recollint la llista d'agents",
-    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> Un <b>Agent</b> és membre del vostre equip d’atenció al client. </p><p> Els agents podran veure i respondre missatges dels teus usuaris. La llista mostra tots els agents que hi ha actualment al teu compte.</p><p> Fer clic a <b>Afegeix Agent</b> per afegir un agent nou. L’agent que afegeixes rebrà un correu electrònic amb un enllaç de confirmació per activar el seu compte, després del qual podrà accedir a Chatwoot i respondre als missatges. </p><p> L’accés a les funcions de Chatwoot es basa en els següents rols.</p><p> <b>Agent</b> - Els agents amb aquesta funció només poden accedir a les bústies d’entrada, als informes i a les converses. Poden assignar converses a altres agents o a ells mateixos i resoldre converses.</p><p> <b>Administrador</b> - L'administrador tindrà accés a totes les funcions de Chatwoot habilitades per al teu compte, inclosa la configuració, juntament amb tots els privilegis dels agents normals.</p>",
+    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> Un <b>Agent</b> és membre del vostre equip d’atenció al client. </p><p> Els agents podran veure i respondre missatges dels teus usuaris. La llista mostra tots els agents que hi ha actualment al teu compte.</p><p> Fer clic a <b>Afegeix Agent</b> per afegir un agent nou. L´agent que afegeixes rebrà un correu electrònic amb un enllaç de confirmació per activar el seu compte, després del qual podrà accedir a Chatwoot i respondre als missatges. </p><p> L´accés a les funcions de Chatwoot es basa en els següents rols.</p><p> <b>Agent</b> - Els agents amb aquesta funció només poden accedir a les bústies d´entrada, als informes i a les converses. Poden assignar converses a altres agents o a ells mateixos i resoldre converses.</p><p> <b>Administrador</b> - L´administrador tindrà accés a totes les funcions de Chatwoot habilitades per al teu compte, inclosa la configuració, juntament amb tots els privilegis dels agents normals.</p>",
     "AGENT_TYPES": {
       "ADMINISTRATOR": "Administrador/a",
       "AGENT": "Agent"
@@ -31,7 +31,7 @@
         "AGENT_TYPE": {
           "LABEL": "Tipus d'Agent",
           "PLACEHOLDER": "Selecciona un tipus",
-          "ERROR": "El tipus d'Agent és necessari"
+          "ERROR": "El rol és necessari"
         },
         "EMAIL": {
           "LABEL": "Adreça de correu electrònic",
@@ -76,8 +76,8 @@
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Disponibilitat",
-          "PLACEHOLDER": "Please select an availability status",
-          "ERROR": "Availability is required"
+          "PLACEHOLDER": "Seleccioneu un estat de disponibilitat",
+          "ERROR": "Es requereix disponibilitat"
         },
         "SUBMIT": "Editar l'agent"
       },
@@ -111,7 +111,7 @@
         "PLACEHOLDER": {
           "AGENT": "Cerca agents",
           "TEAM": "Cerca equips",
-          "INPUT": "Search for agents"
+          "INPUT": "Cerca agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ca/auditLogs.json b/app/javascript/dashboard/i18n/locale/ca/auditLogs.json
index 6cb1c776f8c3a..e3dd7c68c1f2f 100644
--- a/app/javascript/dashboard/i18n/locale/ca/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/ca/auditLogs.json
@@ -11,7 +11,7 @@
       "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
       "TABLE_HEADER": [
         "User",
-        "Action",
+        "Temps",
         "Adreça IP"
       ]
     },
diff --git a/app/javascript/dashboard/i18n/locale/ca/bulkActions.json b/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
index 9cd87b5d68635..4595a205bf688 100644
--- a/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ca/campaign.json b/app/javascript/dashboard/i18n/locale/ca/campaign.json
index e3d69bc29ef6d..182e49bd6cfb3 100644
--- a/app/javascript/dashboard/i18n/locale/ca/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ca/campaign.json
@@ -98,7 +98,7 @@
         "CREATED_AT": "Created at"
       },
       "BUTTONS": {
-        "ADD": "Add",
+        "ADD": "Afegir",
         "EDIT": "Edita",
         "DELETE": "Esborrar"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
index 187c3ac277a89..f0129c7bc51e0 100644
--- a/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
@@ -1,75 +1,75 @@
 {
   "CANNED_MGMT": {
     "HEADER": "Respostes predeterminades",
-    "HEADER_BTN_TXT": "Add canned response",
-    "LOADING": "Fetching canned responses...",
+    "HEADER_BTN_TXT": "Afegir resposta predeterminada",
+    "LOADING": "S'estan recollint les respostes predeterminades...",
     "SEARCH_404": "No hi ha cap resposta que coincideixi amb aquesta consulta.",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are pre-written reply templates that help you quickly respond to a conversation. To insert a canned response during a chat, agents can type a short code preceded by a '/' character. </p><p> You can manage your canned responses from this page or create new ones using the \"Add canned response\" button.</p><p>Open the <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Canned Responses handbook</a> in another tab for a helping hand.</p><p>Also, check out the all-new <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Canned Responses Library</a>.</p>",
+    "SIDEBAR_TXT": "<p><b>Respostes predeterminades</b> </p><p> Les respostes predeterminades són plantilles de respostes escrites prèviament que us ajuden a respondre ràpidament a una conversa. Per inserir una resposta predefinida durant un xat, els agents poden escriure un codi curt precedit d'un caràcter '/'. </p><p> Pots gestionar les teves respostes predefinides des d'aquesta pàgina o crear-ne de noves mitjançant el botó \"Afegeix una resposta predefinida\".</p><p>Obre el <a target=\"_blank\" href=\"https: //www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Manual de respostes llaunes</a> en una altra pestanya per ajudar-te.</p><p>També, fes una ullada al nou <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank \">Biblioteca de respostes predeterminades</a>.</p>",
     "LIST": {
       "404": "No hi ha respostes predeterminades disponibles en aquest compte.",
       "TITLE": "Gestiona les respostes predeterminades",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
+      "DESC": "Les respostes predeterminades són plantilles de resposta predefinides que es poden utilitzar per enviar ràpidament respostes a les converses.",
       "TABLE_HEADER": [
-        "Short code",
+        "Codi curt",
         "Contingut",
         "Accions"
       ]
     },
     "ADD": {
-      "TITLE": "Add canned response",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
+      "TITLE": "Afegir resposta predeterminada",
+      "DESC": "Les respostes predeterminades són plantilles de resposta predefinides que es poden utilitzar per enviar ràpidament respostes a les converses.",
       "CANCEL_BUTTON_TEXT": "Cancel·la",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short code",
-          "PLACEHOLDER": "Please enter a short code.",
-          "ERROR": "Short Code is required."
+          "LABEL": "Codi curt",
+          "PLACEHOLDER": "Introduïu un codi curt.",
+          "ERROR": "És necessari el codi curt."
         },
         "CONTENT": {
           "LABEL": "Missatge",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
-          "ERROR": "Message is required."
+          "PLACEHOLDER": "Escriviu el missatge que voleu desar com a plantilla per utilitzar-lo més tard.",
+          "ERROR": "El missatge és obligatori."
         },
         "SUBMIT": "Envia"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned response added successfully.",
+        "SUCCESS_MESSAGE": "Resposta predeterminada afegida correctament.",
         "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
       }
     },
     "EDIT": {
-      "TITLE": "Edit canned response",
+      "TITLE": "Edita la resposta predeterminada",
       "CANCEL_BUTTON_TEXT": "Cancel·la",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short code",
-          "PLACEHOLDER": "Please enter a shortcode.",
-          "ERROR": "Short code is required."
+          "LABEL": "Codi curt",
+          "PLACEHOLDER": "Introduïu un codi curt.",
+          "ERROR": "És necessari el codi curt."
         },
         "CONTENT": {
           "LABEL": "Missatge",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
-          "ERROR": "Message is required."
+          "PLACEHOLDER": "Escriviu el missatge que voleu desar com a plantilla per utilitzar-lo més tard.",
+          "ERROR": "El missatge és obligatori."
         },
         "SUBMIT": "Envia"
       },
       "BUTTON_TEXT": "Edita",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response is updated successfully.",
+        "SUCCESS_MESSAGE": "Resposta predeterminada actualitzada correctament.",
         "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Esborra",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully.",
+        "SUCCESS_MESSAGE": "Resposta predeterminada eliminada correctament.",
         "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
       },
       "CONFIRM": {
-        "TITLE": "Confirm deletion",
+        "TITLE": "Confirma l'esborrat",
         "MESSAGE": "N'estas segur ",
-        "YES": "Yes, delete ",
-        "NO": "No, keep "
+        "YES": "Sí, esborra ",
+        "NO": "No, mantén-la "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/chatlist.json b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
index 1608a5a8b3250..971ae7f33ccf5 100644
--- a/app/javascript/dashboard/i18n/locale/ca/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
@@ -8,7 +8,7 @@
     },
     "TAB_HEADING": "Converses",
     "MENTION_HEADING": "Mencions",
-    "UNATTENDED_HEADING": "Unattended",
+    "UNATTENDED_HEADING": "Sense assistència",
     "SEARCH": {
       "INPUT": "Cerca persones, xats, respostes desades .."
     },
@@ -36,27 +36,27 @@
       }
     },
     "VIEW_FILTER": "Veure",
-    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "SORT_TOOLTIP_LABEL": "Ordena les converses",
     "CHAT_SORT": {
       "STATUS": "Estat",
-      "ORDER_BY": "Order by"
+      "ORDER_BY": "Ordena per"
     },
     "CHAT_TIME_STAMP": {
       "CREATED": {
-        "LATEST": "Created",
-        "OLDEST": "Created at:"
+        "LATEST": "Creat",
+        "OLDEST": "Creat per:"
       },
       "LAST_ACTIVITY": {
-        "NOT_ACTIVE": "Last activity:",
-        "ACTIVE": "Last activity"
+        "NOT_ACTIVE": "Darrera activitat:",
+        "ACTIVE": "Darrera activitat"
       }
     },
     "SORT_ORDER_ITEMS": {
       "last_activity_at_asc": {
-        "TEXT": "Last activity: Oldest first"
+        "TEXT": "Última activitat: Més antic primer"
       },
       "last_activity_at_desc": {
-        "TEXT": "Last activity: Newest first"
+        "TEXT": "Última activitat: La més nova primer"
       },
       "created_at_desc": {
         "TEXT": "Created at: Newest first"
@@ -99,15 +99,15 @@
     },
     "CHAT_SORT_BY_FILTER": {
       "TITLE": "Sort conversation",
-      "DROPDOWN_TITLE": "Sort by",
+      "DROPDOWN_TITLE": "Ordenat per",
       "ITEMS": {
         "LATEST": {
           "NAME": "Last activity at",
           "LABEL": "Last activity"
         },
         "CREATED_AT": {
-          "NAME": "Created at",
-          "LABEL": "Created at"
+          "NAME": "Creat per",
+          "LABEL": "Creat per"
         },
         "LAST_USER_MESSAGE_AT": {
           "NAME": "Last user message at",
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index c55917c9e0b4e..7ba57c201c854 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -15,7 +15,7 @@
     "INITIATED_FROM": "Iniciada des de",
     "INITIATED_AT": "Iniciada a les",
     "IP_ADDRESS": "Adreça IP",
-    "CREATED_AT_LABEL": "Created",
+    "CREATED_AT_LABEL": "Creat",
     "NEW_MESSAGE": "Nou missatge",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "No hi han converses prèvies associades a aquest contacte.",
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Atributs personalitzats",
       "CONTACT_LABELS": "Etiquetes de contactes",
-      "PREVIOUS_CONVERSATIONS": "Converses prèvies"
+      "PREVIOUS_CONVERSATIONS": "Converses prèvies",
+      "NO_RECORDS_FOUND": "No s'han trobat atributs"
     }
   },
   "EDIT_CONTACT": {
@@ -75,16 +76,17 @@
     "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
   },
   "EXPORT_CONTACTS": {
-    "BUTTON_LABEL": "Export",
-    "TITLE": "Export Contacts",
-    "DESC": "Export contacts to a CSV file.",
+    "BUTTON_LABEL": "Exporta",
+    "TITLE": "Exporta contactes",
+    "DESC": "Exporta contactes a través d'un fitxer CSV.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
     "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar",
     "CONFIRM": {
-      "TITLE": "Export Contacts",
-      "MESSAGE": "Are you sure you want to export all contacts?",
-      "YES": "Yes, Export",
-      "NO": "No, Cancel"
+      "TITLE": "Exporta contactes",
+      "MESSAGE": "Esteu segur que voleu exportar tots els contactes?",
+      "FILTERED_MESSAGE": "Esteu segur que voleu exportar tots els contactes filtrats?",
+      "YES": "Sí, Exporta",
+      "NO": "No, cancel·la"
     }
   },
   "DELETE_NOTE": {
@@ -150,13 +152,13 @@
       "COUNTRY": {
         "PLACEHOLDER": "Enter the country name",
         "LABEL": "Nom del país",
-        "SELECT_PLACEHOLDER": "Select",
+        "SELECT_PLACEHOLDER": "Selecciona",
         "REMOVE": "Suprimeix",
-        "SELECT_COUNTRY": "Select Country"
+        "SELECT_COUNTRY": "Selecciona país"
       },
       "CITY": {
-        "PLACEHOLDER": "Enter the city name",
-        "LABEL": "City Name"
+        "PLACEHOLDER": "Introdueix el nom de la ciutat",
+        "LABEL": "Nom de la ciutat"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
@@ -179,8 +181,8 @@
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+        "SUCCESS_MESSAGE": "L'avatar del contacte s'ha suprimit correctament",
+        "ERROR_MESSAGE": "No s'ha pogut esborrar l'avatar de contacte. Torneu-ho a provar."
       }
     },
     "SUCCESS_MESSAGE": "Contacte guardat correctament",
@@ -189,30 +191,30 @@
   "NEW_CONVERSATION": {
     "BUTTON_LABEL": "Inicia la conversa",
     "TITLE": "Nova conversació",
-    "DESC": "Start a new conversation by sending a new message.",
+    "DESC": "Inicia una conversa nova enviant un missatge nou.",
     "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "Per"
       },
       "INBOX": {
         "LABEL": "Inbox",
-        "PLACEHOLDER": "Choose source inbox",
+        "PLACEHOLDER": "Trieu la safata d'entrada d'origen",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
+        "LABEL": "Assumpte",
+        "PLACEHOLDER": "Assumpte",
         "ERROR": "Subject can't be empty"
       },
       "MESSAGE": {
         "LABEL": "Missatge",
         "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "ERROR": "El missatge no pot estar buit"
       },
       "ATTACHMENTS": {
-        "SELECT": "Choose files",
-        "HELP_TEXT": "Drag and drop files here or choose files to attach"
+        "SELECT": "Trieu fitxers",
+        "HELP_TEXT": "Arrossegueu i deixeu anar fitxers aquí o trieu fitxers per adjuntar"
       },
       "SUBMIT": "Send message",
       "CANCEL": "Cancel·la",
@@ -226,10 +228,10 @@
     "FIELDS": "Contact fields",
     "SEARCH_BUTTON": "Cercar",
     "SEARCH_INPUT_PLACEHOLDER": "Cerca de contactes",
-    "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
-    "FILTER_CONTACTS_EDIT": "Edit segment",
+    "FILTER_CONTACTS": "Filtre",
+    "FILTER_CONTACTS_SAVE": "Desa el filtre",
+    "FILTER_CONTACTS_DELETE": "Suprimir el filtre",
+    "FILTER_CONTACTS_EDIT": "Edita segment",
     "LIST": {
       "LOADING_MESSAGE": "Carregant contactes...",
       "404": "No hi ha cap contacte que coincideixi amb la vostra cerca 🔍",
@@ -240,8 +242,8 @@
         "CONVERSATIONS": "Converses",
         "LAST_ACTIVITY": "Last Activity",
         "CREATED_AT": "Created At",
-        "COUNTRY": "Country",
-        "CITY": "City",
+        "COUNTRY": "País",
+        "CITY": "Ciutat",
         "SOCIAL_PROFILES": "Social Profiles",
         "COMPANY": "Companyia",
         "EMAIL_ADDRESS": "Adreça de correu electrònic"
@@ -255,93 +257,93 @@
   },
   "REMINDER": {
     "ADD_BUTTON": {
-      "BUTTON": "Add",
-      "TITLE": "Shift + Enter to create a task"
+      "BUTTON": "Afegir",
+      "TITLE": "Shift + Enter per crear una tasca"
     },
     "FOOTER": {
-      "DUE_DATE": "Due date",
-      "LABEL_TITLE": "Set type"
+      "DUE_DATE": "Data de venciment",
+      "LABEL_TITLE": "Establir tipus"
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
+    "FETCHING_NOTES": "S'estan obtenint notes...",
     "NOT_AVAILABLE": "There are no notes created for this contact",
     "HEADER": {
       "TITLE": "Notes"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "afegeix una nota"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "BUTTON": "Afegir",
+      "PLACEHOLDER": "Afegeix una nota",
+      "TITLE": "Shift + Enter per crear una nota"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "Suprimeix la nota"
     }
   },
   "EVENTS": {
     "HEADER": {
-      "TITLE": "Activities"
+      "TITLE": "Activitats"
     },
     "BUTTON": {
       "PILL_BUTTON_NOTES": "notes",
-      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_EVENTS": "esdeveniment",
       "PILL_BUTTON_CONVO": "converses"
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
-    "BUTTON": "Add custom attribute",
-    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "ADD_BUTTON_TEXT": "Afegir atributs",
+    "BUTTON": "Afegir atributs personalitzats",
+    "NOT_AVAILABLE": "No hi ha atributs personalitzats disponibles per a aquest contacte.",
     "COPY_SUCCESSFUL": "S'ha copiat al porta-retalls amb èxit",
-    "SHOW_MORE": "Show all attributes",
-    "SHOW_LESS": "Show less attributes",
+    "SHOW_MORE": "Mostra tots els atributs",
+    "SHOW_LESS": "Mostra menys atributs",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
-      "EDIT": "Edit attribute"
+      "COPY": "Copia l'atribut",
+      "DELETE": "Suprimeix l'atribut",
+      "EDIT": "Edita l'atribut"
     },
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "Crear atribut personalitzat",
+      "DESC": "Afegeix informació personalitzada a aquest contacte."
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "Afegir atribut",
       "CANCEL": "Cancel·la",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "Personalitza el nom de l'atribut",
+        "PLACEHOLDER": "P. ex.: identificador de Shopify",
+        "ERROR": "El nom de l'atribut personalitzat no és vàlid"
       },
       "VALUE": {
         "LABEL": "Attribute value",
         "PLACEHOLDER": "Eg: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
-        "SUCCESS": "Attribute added successfully",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "TITLE": "Crear nou atribut ",
+        "SUCCESS": "Atribut afegit correctament",
+        "ERROR": "No es pot afegir l'atribut. Si us plau, intenta-ho més tard"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "Atribut actualitzat correctament",
+        "ERROR": "No es pot actualitzar l'atribut. Si us plau, intenta-ho més tard"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "Atribut esborrat correctament",
+        "ERROR": "No es pot esborrar l'atribut. Si us plau, intenta-ho més tard"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "TITLE": "Afegir atributs",
+        "PLACEHOLDER": "Cerca atributs",
+        "NO_RESULT": "No s'han trobat atributs"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "Selecciona valor",
+          "SEARCH_INPUT_PLACEHOLDER": "Cerca valor",
+          "NO_RESULT": "No s'ha trobat cap resultat"
         }
       }
     },
@@ -364,7 +366,7 @@
       "HELP_LABEL": "To be kept"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
+      "TITLE": "Resum",
       "DELETE_WARNING": "Contact of <strong>%{primaryContactName}</strong> will be deleted.",
       "ATTRIBUTE_WARNING": "Contact details of <strong>%{primaryContactName}</strong> will be copied to <strong>%{parentContactName}</strong>."
     },
@@ -372,13 +374,13 @@
       "ERROR": "ERROR_MESSAGE"
     },
     "FORM": {
-      "SUBMIT": " Merge contacts",
+      "SUBMIT": " Fusiona contactes",
       "CANCEL": "Cancel·la",
       "CHILD_CONTACT": {
-        "ERROR": "Select a child contact to merge"
+        "ERROR": "Seleccioneu un contacte fill per fusionar"
       },
-      "SUCCESS_MESSAGE": "Contact merged successfully",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "SUCCESS_MESSAGE": "Contacte fusionat correctament",
+      "ERROR_MESSAGE": "No s'ha pogut fusionar els contactes, torna-ho a provar!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/contactFilters.json b/app/javascript/dashboard/i18n/locale/ca/contactFilters.json
index 75c3c44c96cef..d70dc97d47310 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contactFilters.json
@@ -28,24 +28,24 @@
       "is_not_present": "No és present",
       "is_greater_than": "És més gran que",
       "is_lesser_than": "Is lesser than",
-      "days_before": "Is x days before"
+      "days_before": "És x dies abans"
     },
     "ATTRIBUTES": {
       "NAME": "Nom",
       "EMAIL": "Correu electrònic",
       "PHONE_NUMBER": "Número de telèfon",
       "IDENTIFIER": "Identifier",
-      "CITY": "City",
-      "COUNTRY": "Country",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CITY": "Ciutat",
+      "COUNTRY": "País",
+      "CUSTOM_ATTRIBUTE_LIST": "Llista",
       "CUSTOM_ATTRIBUTE_TEXT": "Llista",
       "CUSTOM_ATTRIBUTE_NUMBER": "Número",
       "CUSTOM_ATTRIBUTE_LINK": "Enllaç",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Casella de selecció",
       "CREATED_AT": "Created At",
       "LAST_ACTIVITY": "Last Activity",
       "REFERER_LINK": "Referrer link",
-      "BLOCKED": "Blocked"
+      "BLOCKED": "Blocat"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "Standard Filters",
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index c09e5fe30ad3a..8b1b7e5fa1d52 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -1,11 +1,11 @@
 {
   "CONVERSATION": {
     "SELECT_A_CONVERSATION": "Si us plau, selecciona una conversa al panell de l’esquerra",
-    "CSAT_REPLY_MESSAGE": "Please rate the conversation",
-    "404": "Sorry, we cannot find the conversation. Please try again",
-    "SWITCH_VIEW_LAYOUT": "Switch the layout",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "CSAT_REPLY_MESSAGE": "Si us plau, valoreu la conversa",
+    "404": "Ho sentim, no podem trobar la conversa. Torneu-ho a provar",
+    "SWITCH_VIEW_LAYOUT": "Canvia el disseny",
+    "DASHBOARD_APP_TAB_MESSAGES": "Missatges",
+    "UNVERIFIED_SESSION": "La identitat d'aquest usuari no està verificada",
     "NO_MESSAGE_1": "Uh oh! Sembla que no hi ha missatges de clients a la safata d'entrada.",
     "NO_MESSAGE_2": " per enviar un missatge a la vostra pàgina!",
     "NO_INBOX_1": "Hola! Sembla que encara no heu afegit cap safata d'entrada.",
@@ -13,15 +13,15 @@
     "NO_INBOX_AGENT": "Uh Oh! Sembla que no ets a cap safata d'entrada. Si us plau, poseu-vos en contacte amb l'administrador",
     "SEARCH_MESSAGES": "Cerca missatges a les converses",
     "EMPTY_STATE": {
-      "CMD_BAR": "to open command menu",
-      "KEYBOARD_SHORTCUTS": "to view keyboard shortcuts"
+      "CMD_BAR": "per obrir el menú d'ordres",
+      "KEYBOARD_SHORTCUTS": "per veure les dreceres del teclat"
     },
     "SEARCH": {
       "TITLE": "Cerca missatges",
-      "RESULT_TITLE": "Search Results",
+      "RESULT_TITLE": "Resultats de la cerca",
       "LOADING_MESSAGE": "S'estan restringint les dades...",
       "PLACEHOLDER": "Escriu qualsevol text per cercar missatges",
-      "NO_MATCHING_RESULTS": "No results found."
+      "NO_MATCHING_RESULTS": "No s'han trobat resultats."
     },
     "UNREAD_MESSAGES": "Missatges no Llegits",
     "UNREAD_MESSAGE": "Missatge no Llegit",
@@ -30,15 +30,15 @@
     "LOADING_CONVERSATIONS": "S'estan carregant les converses",
     "CANNOT_REPLY": "No pots respondre degut a",
     "24_HOURS_WINDOW": "Restricció de finestra de missatges de 24 hores",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
-    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
+    "NOT_ASSIGNED_TO_YOU": "Aquesta conversa no està assignada a tu. Vols assignar-te-la?",
+    "ASSIGN_TO_ME": "Assigna'm",
+    "TWILIO_WHATSAPP_CAN_REPLY": "Només pots respondre a aquesta conversa mitjançant una plantilla de missatge a causa de",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restricció de finestra de missatges de 24 hores",
     "REPLYING_TO": "Estas responent a:",
     "REMOVE_SELECTION": "Elimina la selecció",
     "DOWNLOAD": "Descarrega",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
-    "SAVE_CONTACT": "Save",
+    "UNKNOWN_FILE_TYPE": "Fitxer desconegut",
+    "SAVE_CONTACT": "Desar",
     "UPLOADING_ATTACHMENTS": "Pujant fitxers adjunts...",
     "REPLIED_TO_STORY": "Replied to your story",
     "UNSUPPORTED_MESSAGE": "This message is unsupported.",
@@ -89,7 +89,7 @@
       "CANCEL": "Cancel·la"
     },
     "PRIORITY": {
-      "TITLE": "Priority",
+      "TITLE": "Prioritat",
       "OPTIONS": {
         "NONE": "Ningú",
         "URGENT": "Urgent",
@@ -280,28 +280,29 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No s'han trobat atributs",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "Atribut actualitzat correctament",
+      "ERROR": "No es pot actualitzar l'atribut. Si us plau, intenta-ho més tard"
     },
     "ADD": {
-      "TITLE": "Add",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "TITLE": "Afegir",
+      "SUCCESS": "Atribut afegit correctament",
+      "ERROR": "No es pot afegir l'atribut. Si us plau, intenta-ho més tard"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Atribut esborrat correctament",
+      "ERROR": "No es pot esborrar l'atribut. Si us plau, intenta-ho més tard"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "Afegir atributs",
+      "PLACEHOLDER": "Cerca atributs",
+      "NO_RESULT": "No s'han trobat atributs"
     }
   },
   "EMAIL_HEADER": {
     "FROM": "From",
-    "TO": "To",
+    "TO": "Per",
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
diff --git a/app/javascript/dashboard/i18n/locale/ca/datePicker.json b/app/javascript/dashboard/i18n/locale/ca/datePicker.json
new file mode 100644
index 0000000000000..19333d4fd3cdf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Últims 7 dies",
+      "LAST_30_DAYS": "Últims 30 dies",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/emoji.json b/app/javascript/dashboard/i18n/locale/ca/emoji.json
index f89f088b63d01..4da107aac0c74 100644
--- a/app/javascript/dashboard/i18n/locale/ca/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ca/emoji.json
@@ -1,7 +1,7 @@
 {
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search",
+    "PLACEHOLDER": "Cerca emojis",
+    "NOT_FOUND": "Cap emoji coincideix amb la teva cerca",
     "REMOVE": "Suprimeix"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/general.json b/app/javascript/dashboard/i18n/locale/ca/general.json
index 25bb4dfb736d2..c67a5f9e7adfa 100644
--- a/app/javascript/dashboard/i18n/locale/ca/general.json
+++ b/app/javascript/dashboard/i18n/locale/ca/general.json
@@ -1,5 +1,5 @@
 {
   "GENERAL": {
-    "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items"
+    "SHOWING_RESULTS": "Es mostren {firstIndex}-{lastIndex} de {totalCount} elements"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index 77b60aa944232..b1717a408a308 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -3,7 +3,7 @@
     "TITLE": "Configuració del compte",
     "SUBMIT": "Actualització de la configuració",
     "BACK": "Enrere",
-    "DISMISS": "Dismiss",
+    "DISMISS": "Descartar",
     "UPDATE": {
       "ERROR": "No s'ha pogut actualitzar la configuració, torna-ho a provar!",
       "SUCCESS": "La configuració del compte s'ha actualitzat correctament"
@@ -15,8 +15,8 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "ID del compte",
+        "NOTE": "Aquest identificador és necessari si esteu creant una integració basada en API"
       },
       "NAME": {
         "LABEL": "Nom del compte",
@@ -24,7 +24,7 @@
         "ERROR": "Introduïu un nom de compte vàlid"
       },
       "LANGUAGE": {
-        "LABEL": "Site language",
+        "LABEL": "Idioma del lloc",
         "PLACEHOLDER": "El nom del vostre compte",
         "ERROR": ""
       },
@@ -41,7 +41,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "El nombre de dies després que un ticket es resolgui automàticament si no hi ha activitat",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Introduïu una durada de resolució automàtica vàlida (mínim 1 dia i màxim 999 dies)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuïtat de converses amb correus electrònics està habilitada per al vostre compte.",
@@ -49,8 +49,8 @@
       }
     },
     "UPDATE_CHATWOOT": "L'actualització %{latestChatwootVersion} per Chatwoot està disponible. Si us plau, actualitza l'instancia.",
-    "LEARN_MORE": "Learn more",
-    "PAYMENT_PENDING": "Your payment is pending. Please update your payment information to continue using Chatwoot",
+    "LEARN_MORE": "Aprèn més",
+    "PAYMENT_PENDING": "El teu pagament està pendent. Actualitzeu la vostra informació de pagament per continuar utilitzant Chatwoot",
     "LIMITS_UPGRADE": "Your account has exceeded the usage limits, please upgrade your plan to continue using Chatwoot",
     "OPEN_BILLING": "Open billing"
   },
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Informes",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
index 232cf94241a9d..a387032ed5036 100644
--- a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
@@ -460,7 +460,7 @@
       "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
       "SELF_HOSTED_DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Please contact your administrator to enable this feature.",
       "BUTTON": {
-        "LEARN_MORE": "Learn more",
+        "LEARN_MORE": "Aprèn més",
         "UPGRADE": "Upgrade"
       },
       "FEATURES": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/inbox.json b/app/javascript/dashboard/i18n/locale/ca/inbox.json
index d7311ebdd2031..56c87c2666df0 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inbox.json
@@ -42,7 +42,7 @@
       "SORT_OPTIONS": {
         "NEWEST": "Newest",
         "OLDEST": "Oldest",
-        "PRIORITY": "Priority"
+        "PRIORITY": "Prioritat"
       },
       "DISPLAY_OPTIONS": {
         "SNOOZED": "Posposat",
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 832808d3c4efa..7858187573752 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Afegir agents a la safata d'entrada creada."
       },
       {
-        "title": "Llest!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Ja estàs preparat!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Selecciona una pàgina de la llista",
         "INBOX_NAME": "Nom de la safata d'entrada",
         "ADD_NAME": "Afegeix un nom per a la safata d'entrada",
-        "PICK_NAME": "Tria un nom a la safata d'entrada",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Tria un valor"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Introduïu una URL vàlid"
         },
         "CHANNEL_DOMAIN": {
@@ -83,7 +83,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Activa la salutació del canal",
-          "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
+          "HELP_TEXT": "Envia automàticament missatges de salutació quan els clients inicien una conversa i envien el seu primer missatge.",
           "ENABLED": "Habilita",
           "DISABLED": "Inhabilita"
         },
@@ -169,18 +169,18 @@
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
+            "LABEL": "ID del compte",
             "PLACEHOLDER": "Please enter your Bandwidth Account ID",
             "ERROR": "Aquest camp és obligatori"
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Aquest camp és obligatori"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Aquest camp és obligatori"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "SUBTITLE": "Configura l'URL on vulguis rebre callbacks en esdeveniments.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL del webhook"
         },
         "SUBMIT_BUTTON": "Crea un canal API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Correu electrònic del Canal",
-        "DESC": "Integra la teva safata d’entrada de correu electrònic.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nom del canal",
           "PLACEHOLDER": "Introduïu el nom del canal",
@@ -340,12 +340,12 @@
       },
       "AUTH": {
         "TITLE": "Choose a channel",
-        "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+        "DESC": "Chatwoot admet widgets de xat en directe, Facebook Messenger, WhatsApp, correus electrònics, etc., com a canals. Si voleu crear un canal personalitzat, podeu crear-lo mitjançant el canal API. Per començar, tria un dels canals següents."
       },
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Aquí podeu afegir agents per gestionar la vostra safata d'entrada de nova creació. Només aquests agents seleccionats tindran accés a la vostra safata d'entrada. Els agents que no formen part d'aquesta safata d'entrada no podran veure ni respondre als missatges d'aquesta safata d'entrada quan s’inicien. <br><b>PD:</b> Com a administrador, si necessiteu accés a totes les bústies d’entrada, heu d’afegir-vos com a agent a totes les bústies de sortida que creeu.",
-        "VALIDATION_ERROR": "Afageix almenys un agent a la teva safata d'entrada",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Tria agents per la safata d'entrada"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -420,7 +420,7 @@
         "BUSINESS_NAME": {
           "BUTTON_TEXT": "+ Configure your business name",
           "PLACEHOLDER": "Enter your business name",
-          "SAVE_BUTTON_TEXT": "Save"
+          "SAVE_BUTTON_TEXT": "Desar"
         }
       },
       "ALLOW_MESSAGES_AFTER_RESOLVED": {
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualitza",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index 1be0b5cbc16b1..f732cb103f431 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -68,7 +68,7 @@
           "TITLE": "Confirma l'esborrat",
           "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Si, esborra ",
-          "NO": "No, manten-la"
+          "NO": "No, mantén-la"
         }
       }
     },
@@ -79,8 +79,8 @@
         "MESSAGE": "Are you sure you want to delete the integration? Doing so will result in the loss of access to conversations on your Slack workspace."
       },
       "HELP_TEXT": {
-        "TITLE": "Using Slack Integration",
-        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>",
+        "TITLE": "Com utilitzar la integració de Slack?",
+        "BODY": "Amb aquesta integració, totes les teves converses entrants se sincronitzaran amb el canal ***%{selectedChannelName}*** del teu espai de treball de Slack. Podeu gestionar totes les converses dels vostres clients directament des del canal i no perdreu cap missatge.\n\nAquestes són les principals característiques de la integració:\n\n**Respondre a converses des de Slack:** Per respondre a una conversa al ***%{selectedChannelName}*** canal de Slack, només has d'escriure el teu missatge i enviar-lo com a fil. Això crearà una resposta al client mitjançant Chatwoot. Així de senzill!\n\n  **Crear notes privades:** si vols crear notes privades en lloc de respostes, comença el teu missatge amb ***`nota:`***. Això garanteix que el vostre missatge es mantingui privat i no serà visible per al client.\n\n**Associar un perfil d'agent:** si la persona que va respondre a Slack té un perfil d'agent a Chatwoot amb el mateix correu electrònic, les respostes s'associaran amb aquest perfil d'agent automàticament. Això vol dir que podeu fer un seguiment fàcilment qui va dir què i quan. D'altra banda, quan el contestador no té un perfil d'agent associat, les respostes apareixeran des del perfil del bot al client.",
         "SELECTED": "selected"
       },
       "SELECT_CHANNEL": {
@@ -131,7 +131,7 @@
         "KEY_PLACEHOLDER": "Enter your OpenAI API key",
         "BUTTONS": {
           "NEED_HELP": "Need help?",
-          "DISMISS": "Dismiss",
+          "DISMISS": "Descartar",
           "FINISH": "Finish Setup"
         },
         "DISMISS_MESSAGE": "You can setup OpenAI integration later Whenever you want.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
index 12c66de110d9a..b197e881427b3 100644
--- a/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
@@ -46,7 +46,7 @@
         "DISMISS": "Dismiss suggestion"
       },
       "POWERED_BY": "Chatwoot AI",
-      "DISMISS": "Dismiss",
+      "DISMISS": "Descartar",
       "ADD_SELECTED_LABELS": "Add selected labels",
       "ADD_SELECTED_LABEL": "Add selected label",
       "ADD_ALL_LABELS": "Add all labels"
diff --git a/app/javascript/dashboard/i18n/locale/ca/login.json b/app/javascript/dashboard/i18n/locale/ca/login.json
index 787445e5b3f25..f7892513a5b5c 100644
--- a/app/javascript/dashboard/i18n/locale/ca/login.json
+++ b/app/javascript/dashboard/i18n/locale/ca/login.json
@@ -3,7 +3,7 @@
     "TITLE": "Entra a Chatwoot",
     "EMAIL": {
       "LABEL": "Correu electrònic",
-      "PLACEHOLDER": "Correu electrònic p.e.: someone@exemple.com",
+      "PLACEHOLDER": "exemple@nomdelacompanyia.com",
       "ERROR": "Introduïu una adreça de correu electrònic vàlida"
     },
     "PASSWORD": {
@@ -16,9 +16,9 @@
       "UNAUTH": "Nom d'usuari / contrasenya incorrecte. Torna-ho a provar-ho"
     },
     "OAUTH": {
-      "GOOGLE_LOGIN": "Login with Google",
-      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
-      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+      "GOOGLE_LOGIN": "Inicieu sessió amb Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Si us plau, utilitzeu l'adreça de correu electrònic de la vostra empresa per iniciar sessió",
+      "NO_ACCOUNT_FOUND": "No hem trobat cap compte per a la vostra adreça de correu electrònic."
     },
     "FORGOT_PASSWORD": "Has oblidat la contrasenya?",
     "CREATE_NEW_ACCOUNT": "Crear un nou compte",
diff --git a/app/javascript/dashboard/i18n/locale/ca/report.json b/app/javascript/dashboard/i18n/locale/ca/report.json
index 73dbc655e542c..0817e45626a05 100644
--- a/app/javascript/dashboard/i18n/locale/ca/report.json
+++ b/app/javascript/dashboard/i18n/locale/ca/report.json
@@ -92,7 +92,7 @@
       "DAY": "Day",
       "WEEK": "Week",
       "MONTH": "Month",
-      "YEAR": "Month"
+      "YEAR": "Any"
     },
     "GROUP_BY_DAY_OPTIONS": [
       {
@@ -140,7 +140,7 @@
     ],
     "BUSINESS_HOURS": "Business Hours",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "Esborra els filtres",
       "EMPTY_LIST": "No s'ha trobat agents"
     }
   },
@@ -232,7 +232,7 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "First Response Time",
-        "DESC": "( Promig )",
+        "DESC": "(Mitjana)",
         "INFO_TEXT": "Total number of conversations used for computation:",
         "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
@@ -511,52 +511,52 @@
     "SATURDAY": "Saturday"
   },
   "SLA_REPORTS": {
-    "HEADER": "SLA Reports",
-    "NO_RECORDS": "SLA applied conversations are not available.",
-    "LOADING": "Loading SLA data...",
-    "DOWNLOAD_SLA_REPORTS": "Download SLA reports",
-    "DOWNLOAD_FAILED": "Failed to download SLA Reports",
+    "HEADER": "Informes SLA",
+    "NO_RECORDS": "Les converses aplicades per l'SLA no estan disponibles.",
+    "LOADING": "S'estan carregant dades del SLA...",
+    "DOWNLOAD_SLA_REPORTS": "Descarregar informes SLA",
+    "DOWNLOAD_FAILED": "No s'han pogut baixar els informes SLA",
     "DROPDOWN": {
-      "ADD_FIlTER": "Add filter",
-      "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "ADD_FIlTER": "Afegeix un filtre",
+      "CLEAR_ALL": "Esborrar tot",
+      "CLEAR_FILTER": "Esborra els filtres",
       "EMPTY_LIST": "No s'ha trobat agents",
-      "NO_FILTER": "No filters available",
-      "SEARCH": "Search filter",
+      "NO_FILTER": "No hi ha filtres disponibles",
+      "SEARCH": "Cerca filtre",
       "INPUT_PLACEHOLDER": {
-        "SLA": "SLA name",
-        "AGENTS": "Agent name",
-        "INBOXES": "Inbox name",
+        "SLA": "Nom del SLA",
+        "AGENTS": "Nom de l'Agent",
+        "INBOXES": "Nom de la safata d'entrada",
         "LABELS": "Nom de l'etiqueta",
-        "TEAMS": "Team name"
+        "TEAMS": "Nom de l'equip"
       },
-      "SLA": "SLA Policy",
-      "INBOXES": "Inbox",
+      "SLA": "Política SLA",
+      "INBOXES": "Safata d'entrada",
       "AGENTS": "Agent",
-      "LABELS": "Label",
-      "TEAMS": "Team"
+      "LABELS": "Etiqueta",
+      "TEAMS": "Equip"
     },
     "METRICS": {
       "HIT_RATE": {
-        "LABEL": "Hit Rate",
-        "TOOLTIP": "Percentage of SLAs created were completed successfully"
+        "LABEL": "Proporció d'encerts",
+        "TOOLTIP": "El percentatge de SLA creats s'ha completat correctament"
       },
       "NO_OF_MISSES": {
-        "LABEL": "Number of Misses",
-        "TOOLTIP": "Total SLA misses in a certain period"
+        "LABEL": "Nombre de faltes",
+        "TOOLTIP": "SLA total faltes en un període determinat"
       },
       "NO_OF_CONVERSATIONS": {
-        "LABEL": "Number of Conversations",
-        "TOOLTIP": "Total number of conversations with SLA"
+        "LABEL": "Número de Converses",
+        "TOOLTIP": "Nombre total de converses amb SLA"
       }
     },
     "TABLE": {
       "HEADER": {
-        "POLICY": "Policy",
-        "CONVERSATION": "Conversation",
+        "POLICY": "Política",
+        "CONVERSATION": "Converses",
         "AGENT": "Agent"
       },
-      "VIEW_DETAILS": "View Details"
+      "VIEW_DETAILS": "Veure Detalls"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/search.json b/app/javascript/dashboard/i18n/locale/ca/search.json
index a114145eefefd..ba89f20ecbf9e 100644
--- a/app/javascript/dashboard/i18n/locale/ca/search.json
+++ b/app/javascript/dashboard/i18n/locale/ca/search.json
@@ -4,12 +4,12 @@
       "ALL": "Totes",
       "CONTACTS": "Contactes",
       "CONVERSATIONS": "Converses",
-      "MESSAGES": "Messages"
+      "MESSAGES": "Missatges"
     },
     "SECTION": {
       "CONTACTS": "Contactes",
       "CONVERSATIONS": "Converses",
-      "MESSAGES": "Messages"
+      "MESSAGES": "Missatges"
     },
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 52294d4334cb0..3c50095122367 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "La teva contrasenya ha estat canviada correctament",
     "AFTER_EMAIL_CHANGED": "El vostre perfil s'ha actualitzat correctament. Torneu a iniciar la sessió ja que les vostres credencials d'inici de sessió han canviat",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Imatge del Perfil",
       "ERROR": "Corregiu els errors del formulari",
       "REMOVE_IMAGE": "Suprimeix",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token d'accés",
-        "NOTE": "Aquest token es pot utilitzar si creeu una integració basada en l'API"
+        "NOTE": "Aquest token es pot utilitzar si creeu una integració basada en l'API",
+        "COPY": "Copia"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "Ningú",
+          "MINE": "Assigned",
+          "ALL": "Totes"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Ningú",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -84,9 +91,26 @@
         "CONVERSATION_MENTION": "Enviar notificacions per mail quan siguis esmentat en una conversació",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envia notificacions per correu electrònic quan es creï un missatge nou en una conversa assignada",
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation",
-        "SLA_MISSED_FIRST_RESPONSE": "Send email notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "Envia notificacions per correu electrònic quan una conversa no compleixi un SLA de primera resposta",
+        "SLA_MISSED_NEXT_RESPONSE": "Envia notificacions per correu electrònic quan una conversa es perdi la següent resposta SLA",
+        "SLA_MISSED_RESOLUTION": "Envia notificacions per correu electrònic quan una conversa no resol un SLA"
+      },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Correu electrònic",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
       },
       "API": {
         "UPDATE_SUCCESS": "Les teves preferències de notificació s’han actualitzat correctament",
@@ -102,9 +126,9 @@
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Heu activat les notificacions per a aquest navegador.",
         "REQUEST_PUSH": "Activa les notificacions",
-        "SLA_MISSED_FIRST_RESPONSE": "Send push notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send push notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send push notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "Envia notificacions automàtiques quan una conversa no tingui un SLA de primera resposta",
+        "SLA_MISSED_NEXT_RESPONSE": "Envia notificacions automàtiques quan una conversa no s'aconsegueixi la següent resposta SLA",
+        "SLA_MISSED_RESOLUTION": "Envia notificacions quan una conversa no resol el SLA"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Imatge del Perfil"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ca/signup.json b/app/javascript/dashboard/i18n/locale/ca/signup.json
index 16dead7a5f690..e0ce2abae4c71 100644
--- a/app/javascript/dashboard/i18n/locale/ca/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ca/signup.json
@@ -11,7 +11,7 @@
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "ERROR": "El nom de l'empresa és massa curt."
     },
     "FULL_NAME": {
       "LABEL": "Nom complet",
@@ -20,7 +20,7 @@
     },
     "EMAIL": {
       "LABEL": "Email de treball",
-      "PLACEHOLDER": "Introdueix la teva adreça email de treball. ex: bruce@wayne.enterprises",
+      "PLACEHOLDER": "Introdueix la teva adreça de correu electrònica de la feina. P. ex.: bruce@wayne.enterprises",
       "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
@@ -32,7 +32,7 @@
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirma la contrasenya",
       "PLACEHOLDER": "Confirma la contrasenya",
-      "ERROR": "Les contrasenyes no coincideixen"
+      "ERROR": "La contrasenya no coincideix."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrat correctament",
diff --git a/app/javascript/dashboard/i18n/locale/ca/sla.json b/app/javascript/dashboard/i18n/locale/ca/sla.json
index bdb2c60aca331..3c24b3c5f450b 100644
--- a/app/javascript/dashboard/i18n/locale/ca/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ca/sla.json
@@ -1,18 +1,30 @@
 {
   "SLA": {
     "HEADER": "SLA",
-    "ADD_ACTION": "Add SLA",
-    "ADD_ACTION_LONG": "Create a new SLA Policy",
-    "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
-    "LEARN_MORE": "Learn more about SLA",
+    "ADD_ACTION": "Afegeix SLA",
+    "ADD_ACTION_LONG": "Crea una nova política de SLA",
+    "DESCRIPTION": "Els acords de nivell de servei (SLA) són contractes que defineixen expectatives clares entre el vostre equip i els clients. Estableixen estàndards de temps de resposta i resolució, creen un marc de responsabilitat i garanteixen una experiència coherent i d'alta qualitat.",
+    "LEARN_MORE": "Més informació sobre SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
-        "TITLE_1": "Enterprise P0",
-        "DESC_1": "Issues raised by enterprise customers, that require immediate attention.",
-        "TITLE_2": "Enterprise P1",
-        "DESC_2": "Issues raised by enterprise customers, that needs to be acknowledged quickly."
+        "TITLE_1": "Empresa P0",
+        "DESC_1": "Problemes plantejats pels clients empresarials, que requereixen atenció immediata.",
+        "TITLE_2": "Empresa P1",
+        "DESC_2": "Problemes plantejats pels clients empresarials, que cal reconèixer ràpidament."
       },
       "BUSINESS_HOURS_ON": "Business hours on",
       "BUSINESS_HOURS_OFF": "Business hours off",
@@ -65,7 +77,7 @@
     },
     "ADD": {
       "TITLE": "Add SLA",
-      "DESC": "Friendly promises for great service!",
+      "DESC": "Promeses amistoses per a un gran servei!",
       "API": {
         "SUCCESS_MESSAGE": "SLA added successfully",
         "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
@@ -85,12 +97,12 @@
       }
     },
     "EVENTS": {
-      "TITLE": "SLA Misses",
+      "TITLE": "Faltes SLA",
       "FRT": "Primer temps de resposta",
-      "NRT": "Next response time",
-      "RT": "Resolution time",
-      "SHOW_MORE": "{count} more",
-      "HIDE": "Hide {count} rows"
+      "NRT": "Pròxim temps de resposta",
+      "RT": "Temps de resolució",
+      "SHOW_MORE": "{count} més",
+      "HIDE": "Amaga {count} files"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/cs/bulkActions.json b/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
index 081045841ae16..0b6578024ff12 100644
--- a/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Načítání agentů",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Odložit",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index d44b2753a9086..81380a072b95f 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Vlastní atributy",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Předchozí konverzace"
+      "PREVIOUS_CONVERSATIONS": "Předchozí konverzace",
+      "NO_RECORDS_FOUND": "Nebyly nalezeny žádné atributy"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index 9732f93448404..950828d518efb 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Vytvořit atribut",
+    "NO_RECORDS_FOUND": "Nebyly nalezeny žádné atributy",
     "UPDATE": {
       "SUCCESS": "Atribut byl úspěšně aktualizován",
       "ERROR": "Atribut nelze aktualizovat. Zkuste to prosím později"
diff --git a/app/javascript/dashboard/i18n/locale/cs/datePicker.json b/app/javascript/dashboard/i18n/locale/cs/datePicker.json
new file mode 100644
index 0000000000000..b5af13d7dae4a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Použít",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Posledních 7 dní",
+      "LAST_30_DAYS": "Posledních 30 dní",
+      "LAST_3_MONTHS": "Poslední 3 měsíce",
+      "LAST_6_MONTHS": "Posledních 6 měsíců",
+      "LAST_YEAR": "Poslední rok",
+      "CUSTOM_RANGE": "Vlastní časové rozmezí"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index a5614818c0f9a..00cf1d19dc0eb 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Zprávy",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 8eb79b1ab3fbd..ec2b2cafdc0e7 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Přidat agenty do vytvořené schránky."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Vše je nastaveno!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Vyberte stránku ze seznamu",
         "INBOX_NAME": "Název schránky",
         "ADD_NAME": "Zadejte název schránky",
-        "PICK_NAME": "Vyberte název schránky",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Vyberte hodnotu"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL webového háčku",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Zadejte prosím platnou URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Toto pole je povinné"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Toto pole je povinné"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL webového háčku",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL webového háčku"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Název kanálu",
           "PLACEHOLDER": "Zadejte název kanálu",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenti",
         "DESC": "Zde můžete přidat agenty ke správě nově vytvořené schránky. Pouze tito vybraní agenti budou mít přístup do vaší schránky. Agenty, které nejsou součástí této schránky, nebudou moci při přihlášení vidět zprávy v této schránce ani na ně reagovat. <br> <b>PS:</b> Jako správce, pokud potřebujete přístup ke všem schránkám, byste se měli přidat jako agent do všech schránek, které vytváříte.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualizovat",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 6aa089b24be13..684133e33f205 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Váš profil byl úspěšně aktualizován, přihlaste se prosím znovu, protože se vaše přihlašovací údaje změnily",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profilový obrázek",
       "ERROR": "Opravte chyby formuláře",
       "REMOVE_IMAGE": "Odebrat",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Přístupový token",
-        "NOTE": "Tento token může být použit při vytváření integrace založené na API"
+        "NOTE": "Tento token může být použit při vytváření integrace založené na API",
+        "COPY": "Kopírovat"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "Nic",
+          "MINE": "Assigned",
+          "ALL": "Vše"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Nic",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-mailová adresa",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Vaše předvolby oznámení byly úspěšně aktualizovány",
         "UPDATE_ERROR": "Při aktualizaci nastavení došlo k chybě, zkuste to prosím znovu"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/cs/sla.json b/app/javascript/dashboard/i18n/locale/cs/sla.json
index 3cb0c48947c49..4bc3aa933b62a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/sla.json
+++ b/app/javascript/dashboard/i18n/locale/cs/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/da/bulkActions.json b/app/javascript/dashboard/i18n/locale/da/bulkActions.json
index 4edc6a89b9c53..4e86440219339 100644
--- a/app/javascript/dashboard/i18n/locale/da/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/da/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Indlæser agenter",
     "UPDATE": {
       "CHANGE_STATUS": "Skift status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Udsæt til næste svar.",
+      "SNOOZE_UNTIL": "Udsæt",
       "UPDATE_SUCCESFUL": "Samtalens status blev opdateret.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 07a1a48a0c628..a58948f5566d5 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Brugerdefinerede Egenskaber",
       "CONTACT_LABELS": "Kontakt Labels",
-      "PREVIOUS_CONVERSATIONS": "Tidligere Samtaler"
+      "PREVIOUS_CONVERSATIONS": "Tidligere Samtaler",
+      "NO_RECORDS_FOUND": "Ingen attributter fundet"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index 183e5b6d08a33..4dbe289f93495 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Opret ny egenskab",
+    "NO_RECORDS_FOUND": "Ingen attributter fundet",
     "UPDATE": {
       "SUCCESS": "Attributten er opdateret",
       "ERROR": "Kan ikke opdatere attributten. Prøv igen senere"
diff --git a/app/javascript/dashboard/i18n/locale/da/datePicker.json b/app/javascript/dashboard/i18n/locale/da/datePicker.json
new file mode 100644
index 0000000000000..29d598c4d5979
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Anvend",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Seneste 7 dage",
+      "LAST_30_DAYS": "Seneste 30 dage",
+      "LAST_3_MONTHS": "Seneste 3 måneder",
+      "LAST_6_MONTHS": "Seneste 6 måneder",
+      "LAST_YEAR": "Sidste år",
+      "CUSTOM_RANGE": "Tilpasset datointerval"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index f11a95841324f..01c27c60f5a40 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Generelt",
       "REPORTS": "Rapporter",
       "CONVERSATION": "Samtale",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Skift Modtager",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Skift Team",
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 8b93c1136ba89..05935391ad888 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Tilføj agenter til den oprettede indbakke."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Så er alt klart!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Vælg en side fra listen",
         "INBOX_NAME": "Indbakke Navn",
         "ADD_NAME": "Tilføj et navn til din indbakke",
-        "PICK_NAME": "Vælg et navn til din indbakke",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Vælg en værdi"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Indtast din Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Angiv en gyldig URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Nøgle",
-            "PLACEHOLDER": "Indtast venligst dit Båndbredde Konto ID",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Dette felt er påkrævet"
           },
           "API_SECRET": {
             "LABEL": "API Hemmelighed",
-            "PLACEHOLDER": "Indtast venligst dit Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Dette felt er påkrævet"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verificér Token",
-          "PLACEHOLDER": "Indtast en verificeringstoken, som du vil konfigurere for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Angiv en gyldig værdi."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Indstil URL'en hvor du vil modtage callbacks på begivenheder.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Opret API-kanal",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "E-mail Kanal",
-        "DESC": "Integrer din e-mail indbakke.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Kanalnavn",
           "PLACEHOLDER": "Indtast et kanalnavn",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenter",
         "DESC": "Her kan du tilføje agenter til at håndtere din nyoprettede indbakke. Kun disse valgte agenter vil have adgang til din indbakke. Agenter som ikke er en del af denne indbakke, vil ikke kunne se eller reagere på beskeder i denne indbakke, når de logger ind. <br> <b>PS:</b> Som administrator, hvis du har brug for adgang til alle indbakker, bør du tilføje dig selv som agent til alle indbakker, du opretter.",
-        "VALIDATION_ERROR": "Tilføj mindst én agent til din nye indbakke",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Vælg agenter for indbakken"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Tillad beskeder efter samtalen løst",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Tillad slutbrugere at sende beskeder, selv efter samtalen er løst.",
       "WHATSAPP_SECTION_SUBHEADER": "Denne API-nøgle bruges til integration med WhatsApp API'erne.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Nøgle",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Opdater",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verificér Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook verifikations token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "For at aktivere SMTP skal du konfigurere IMAP.",
       "UPDATE": "Opdater indstillinger",
       "TOGGLE_AVAILABILITY": "Aktiver IMAP- konfiguration for denne indbakke",
-      "TOGGLE_HELP": "Aktivering af IMAP, vil hjælpe brugeren med at modtage e-mail",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Indbakkeindstillinger opdateret",
         "ERROR_MESSAGE": "Kunne ikke opdatere IMAP-indstillinger"
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index f812b0e30f528..3ca82a2998df5 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Din adgangskode er blevet ændret",
     "AFTER_EMAIL_CHANGED": "Din profil er blevet opdateret. Log venligst ind igen, da dine loginoplysninger er ændret",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profilbillede",
       "ERROR": "Ret venligst formularfejl",
       "REMOVE_IMAGE": "Fjern",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Adgangs Token",
-        "NOTE": "Denne token kan bruges, hvis du bygger en API-baseret integration"
+        "NOTE": "Denne token kan bruges, hvis du bygger en API-baseret integration",
+        "COPY": "Kopiér"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Lyd Notifikationer",
         "NOTE": "Aktivér lydmeddelelser i dashboard for nye beskeder og samtaler.",
+        "ALERT_TYPES": {
+          "NONE": "Ingen",
+          "MINE": "Assigned",
+          "ALL": "Alle"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Ingen",
           "ASSIGNED": "Tildelte Samtaler",
           "ALL_CONVERSATIONS": "Alle Samtaler"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-mail",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Dine notifikationsindstillinger er opdateret",
         "UPDATE_ERROR": "Der er en fejl under opdatering af indstillingerne, prøv venligst igen"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Gå til Rapporter sidepanel",
       "MOVE_TO_NEXT_TAB": "Flyt til næste fane i samtalelisten",
       "GO_TO_SETTINGS": "Gå til Indstillinger",
-      "SWITCH_CONVERSATION_STATUS": "Skift til næste samtalestatus",
       "SWITCH_TO_PRIVATE_NOTE": "Skift til privat note",
       "SWITCH_TO_REPLY": "Skift til svar",
       "TOGGLE_SNOOZE_DROPDOWN": "Skift snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/da/sla.json b/app/javascript/dashboard/i18n/locale/da/sla.json
index a9870d42c2562..800e6ec9f05c6 100644
--- a/app/javascript/dashboard/i18n/locale/da/sla.json
+++ b/app/javascript/dashboard/i18n/locale/da/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/de/bulkActions.json b/app/javascript/dashboard/i18n/locale/de/bulkActions.json
index 0f1155b0746d0..ea0ba5e2c78cf 100644
--- a/app/javascript/dashboard/i18n/locale/de/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/de/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Agenten werden geladen",
     "UPDATE": {
       "CHANGE_STATUS": "Status ändern",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Bis zur nächsten Antwort zurückstellen.",
+      "SNOOZE_UNTIL": "Erinnern",
       "UPDATE_SUCCESFUL": "Der Konversationsstatus wurde erfolgreich aktualisiert.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index b477ef53328c4..111f90ecee21b 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Benutzerdefinierte Attribute",
       "CONTACT_LABELS": "Kontakt-Labels",
-      "PREVIOUS_CONVERSATIONS": "Vorherige Konversationen"
+      "PREVIOUS_CONVERSATIONS": "Vorherige Konversationen",
+      "NO_RECORDS_FOUND": "Keine Attribute gefunden"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Kontakte exportieren",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 347ef59ab37ed..3f38361cef772 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "SELECT_A_CONVERSATION": "Bitte wählen Sie eine Konversation aus dem linken Bereich aus",
-    "CSAT_REPLY_MESSAGE": "Bitte bewerten Sie diese Unterhaltung",
+    "CSAT_REPLY_MESSAGE": "Bitte bewerten Sie diese Konversation",
     "404": "Wir können die Konversation leider nicht finden. Bitte versuche es erneut",
     "SWITCH_VIEW_LAYOUT": "Layout wechseln",
     "DASHBOARD_APP_TAB_MESSAGES": "Nachrichten",
@@ -49,7 +49,7 @@
     "NO_RESPONSE": "Keine Antwort",
     "RATING_TITLE": "Bewertung",
     "FEEDBACK_TITLE": "Feedback",
-    "REPLY_MESSAGE_NOT_FOUND": "Message not available",
+    "REPLY_MESSAGE_NOT_FOUND": "Nachricht nicht verfügbar",
     "CARD": {
       "SHOW_LABELS": "Labels anzeigen",
       "HIDE_LABELS": "Labels ausblenden"
@@ -150,8 +150,8 @@
       "SEND": "Senden",
       "CREATE": "Notiz hinzufügen",
       "INSERT_READ_MORE": "Mehr erfahren",
-      "DISMISS_REPLY": "Dismiss reply",
-      "REPLYING_TO": "Replying to:",
+      "DISMISS_REPLY": "Antwort verwerfen",
+      "REPLYING_TO": "Antwort auf:",
       "TIP_FORMAT_ICON": "Rich Text Editor anzeigen",
       "TIP_EMOJI_ICON": "Emoji-Auswahl anzeigen",
       "TIP_ATTACH_ICON": "Dateien anhängen",
@@ -206,7 +206,7 @@
     },
     "CONTEXT_MENU": {
       "COPY": "Kopieren",
-      "REPLY_TO": "Reply to this message",
+      "REPLY_TO": "Auf diese Nachricht antworten",
       "DELETE": "Löschen",
       "CREATE_A_CANNED_RESPONSE": "Zu vorgefertigten Antworten hinzufügen",
       "TRANSLATE": "Übersetzen",
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Attribut erstellen",
+    "NO_RECORDS_FOUND": "Keine Attribute gefunden",
     "UPDATE": {
       "SUCCESS": "Attribut erfolgreich aktualisiert",
       "ERROR": "Attribut kann nicht aktualisiert werden. Bitte versuchen Sie es später noch einmal"
diff --git a/app/javascript/dashboard/i18n/locale/de/datePicker.json b/app/javascript/dashboard/i18n/locale/de/datePicker.json
new file mode 100644
index 0000000000000..4de2a8a901034
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Übernehmen",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Letzten 7 Tage",
+      "LAST_30_DAYS": "Letzte 30 Tage",
+      "LAST_3_MONTHS": "Die letzten 3 Monate",
+      "LAST_6_MONTHS": "Die letzten 6 Monate",
+      "LAST_YEAR": "Letztes Jahr",
+      "CUSTOM_RANGE": "Benutzerdefinierter Zeitraum"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index 7f1cd14674381..02b43472f69a5 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Generell",
       "REPORTS": "Berichte",
       "CONVERSATION": "Konversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Beauftragten ändern",
       "CHANGE_PRIORITY": "Priorität ändern",
       "CHANGE_TEAM": "Team wechseln",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index cc2ad3c9ec1e2..2a5aa7a4143e6 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Fügen Sie dem erstellten Posteingang Agenten hinzu."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Sie sind bereit zu gehen!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Wähle eine Seite aus der Liste",
         "INBOX_NAME": "Posteingang-Name",
         "ADD_NAME": "Namen für diesen Posteingang eingeben",
-        "PICK_NAME": "Wählen Sie einen Namen für Ihren Posteingang",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Wählen Sie einen Wert aus"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook-URL",
-          "PLACEHOLDER": "Geben Sie Ihre Webhook-URL ein",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Bitte geben Sie eine gültige URL ein"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API-Schlüssel",
-            "PLACEHOLDER": "Bitte geben Sie Ihren Bandbreiten-API-Schlüssel ein",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Dieses Feld wird benötigt"
           },
           "API_SECRET": {
             "LABEL": "API-Secret",
-            "PLACEHOLDER": "Bitte geben Sie Ihr Bandbreiten-API-Secret ein",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Dieses Feld wird benötigt"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook-Verifizierungstoken",
-          "PLACEHOLDER": "Geben Sie ein Überprüfungstoken ein, das Sie für Facebook-Webhooks konfigurieren möchten.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Bitte geben Sie einen gültigen Wert ein."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook-URL",
-          "SUBTITLE": "Konfigurieren Sie die URL, auf der Sie Callbacks bei Events erhalten möchten.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook-URL"
         },
         "SUBMIT_BUTTON": "API-Kanal erstellen",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "E-Mail-Kanal",
-        "DESC": "Integrieren Sie Ihren Posteingang.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Kanal Name",
           "PLACEHOLDER": "Bitte geben Sie einen Kanalnamen ein",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenten",
         "DESC": "Hier können Sie Agenten hinzufügen, um Ihren neu erstellten Posteingang zu verwalten. Nur diese ausgewählten Agenten haben Zugriff auf Ihren Posteingang. Agenten, die nicht Teil dieses Posteingangs sind, können bei der Anmeldung keine Nachrichten in diesem Posteingang sehen oder darauf antworten. <br> <b> PS: </b> Wenn Sie als Administrator Zugriff auf alle Posteingänge benötigen, sollten Sie sich als Agent zu allen von Ihnen erstellten Posteingängen hinzufügen.",
-        "VALIDATION_ERROR": "Fügen Sie mindestens einen Agenten zu Ihrem neuen Posteingang hinzu",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Agenten für den Posteingang auswählen"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Freundlich",
@@ -508,7 +508,7 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Nachrichten zulassen, nachdem die Konversation gelöst wurde",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Den Endbenutzern erlauben, Nachrichten zu versenden, auch wenn die Unterhaltung abgeschlossen ist.",
       "WHATSAPP_SECTION_SUBHEADER": "Dieser API Key wird für die Integration mit den WhatsApp APIs verwendet.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Geben Sie den aktualisierten Schlüssel ein, der für die Integration von WhatsApp API verwendet werden soll.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API-Schlüssel",
       "WHATSAPP_SECTION_UPDATE_TITLE": "API-Schlüssel aktualisieren",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Neuen API-Schlüssel hier eingeben",
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Um SMTP zu aktivieren, konfigurieren Sie bitte IMAP.",
       "UPDATE": "IMAP-Einstellungen aktualisieren",
       "TOGGLE_AVAILABILITY": "IMAP-Konfiguration für diesen Posteingang aktivieren",
-      "TOGGLE_HELP": "Die Aktivierung von IMAP hilft dem Benutzer, E-Mails zu empfangen",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP-Einstellungen erfolgreich aktualisiert",
         "ERROR_MESSAGE": "IMAP-Einstellungen können nicht aktualisiert werden"
@@ -717,7 +717,7 @@
         "IN_A_DAY": "Wir antworten üblicherweise innerhalb eines Tages"
       },
       "FOOTER": {
-        "START_CONVERSATION_BUTTON_TEXT": "Unterhaltung beginnen",
+        "START_CONVERSATION_BUTTON_TEXT": "Konversation beginnen",
         "CHAT_INPUT_PLACEHOLDER": "Schreiben Sie Ihre Nachricht"
       },
       "BODY": {
diff --git a/app/javascript/dashboard/i18n/locale/de/resetPassword.json b/app/javascript/dashboard/i18n/locale/de/resetPassword.json
index 033a2bdf0e691..c06e4a41468bb 100644
--- a/app/javascript/dashboard/i18n/locale/de/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/de/resetPassword.json
@@ -1,7 +1,7 @@
 {
   "RESET_PASSWORD": {
     "TITLE": "Passwort zurücksetzen",
-    "DESCRIPTION": "Enter the email address you use to log in to Chatwoot to get the password reset instructions.",
+    "DESCRIPTION": "Geben Sie die E-Mail-Adresse ein, mit der Sie sich bei Chatwoot anmelden, um die Anweisungen zum Zurücksetzen des Passworts zu erhalten.",
     "GO_BACK_TO_LOGIN": "If you want to go back to the login page,",
     "EMAIL": {
       "LABEL": "E-Mail",
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 93883adbc0f7a..e16a11344679a 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Ihr Passwort wurde erfolgreich geändert",
     "AFTER_EMAIL_CHANGED": "Ihr Profil wurde erfolgreich aktualisiert. Melden Sie sich erneut an, wenn Ihre Anmeldeinformationen geändert werden",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profilbild",
       "ERROR": "Bitte korrigieren Sie Formularfehler",
       "REMOVE_IMAGE": "Entfernen",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Zugangstoken",
-        "NOTE": "Dieses Token kann verwendet werden, wenn Sie eine API-basierte Integration erstellen"
+        "NOTE": "Dieses Token kann verwendet werden, wenn Sie eine API-basierte Integration erstellen",
+        "COPY": "Kopieren"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio-Benachrichtigungen",
         "NOTE": "Audio-Benachrichtigungen im Dashboard für neue Nachrichten und Unterhaltungen aktivieren.",
+        "ALERT_TYPES": {
+          "NONE": "Keine",
+          "MINE": "Assigned",
+          "ALL": "Alle"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alarmereignisse:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Keine",
           "ASSIGNED": "Zugewiesene Unterhaltungen",
           "ALL_CONVERSATIONS": "Alle Konversationen"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-Mail",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Ihre Benachrichtigungseinstellungen wurden erfolgreich aktualisiert",
         "UPDATE_ERROR": "Beim Aktualisieren der Einstellungen ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut"
@@ -166,9 +190,9 @@
     "TRIAL_MESSAGE": "Tage der Testversion verbleibend.",
     "TRAIL_BUTTON": "Jetzt kaufen",
     "DELETED_USER": "Gelöschter Benutzer",
-    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
-    "RESEND_VERIFICATION_MAIL": "Resend verification email",
-    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
+    "EMAIL_VERIFICATION_PENDING": "Es scheint, dass Sie Ihre E-Mail-Adresse noch nicht verifiziert haben. Bitte überprüfen Sie Ihren Posteingang auf die Verifizierungs-E-Mail.",
+    "RESEND_VERIFICATION_MAIL": "Verifizierungs-E-Mail erneut senden",
+    "EMAIL_VERIFICATION_SENT": "Verifizierungs-E-Mail wurde versendet. Bitte überprüfen Sie Ihren Posteingang.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konto gesperrt",
       "MESSAGE": "Ihr Account wurde gesperrt. Wenden Sie sich für weitere Informationen bitte an das Support-Team."
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Zur Berichtsseitenleiste",
       "MOVE_TO_NEXT_TAB": "Zum nächsten Tab in der Konversationsliste gehen",
       "GO_TO_SETTINGS": "Zu den Einstellungen",
-      "SWITCH_CONVERSATION_STATUS": "Zum nächsten Gesprächsstatus wechseln",
       "SWITCH_TO_PRIVATE_NOTE": "Zu privaten Notizen wechseln",
       "SWITCH_TO_REPLY": "Zur Antwort wechseln",
       "TOGGLE_SNOOZE_DROPDOWN": "Schlummer-Dropdown ein-/ausblenden"
diff --git a/app/javascript/dashboard/i18n/locale/de/sla.json b/app/javascript/dashboard/i18n/locale/de/sla.json
index fbfb8a988263f..c6bc18811842a 100644
--- a/app/javascript/dashboard/i18n/locale/de/sla.json
+++ b/app/javascript/dashboard/i18n/locale/de/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/el/bulkActions.json b/app/javascript/dashboard/i18n/locale/el/bulkActions.json
index 2ce083dff4b60..f69d32ea1b5fb 100644
--- a/app/javascript/dashboard/i18n/locale/el/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/el/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Φόρτωση πρακτόρων",
     "UPDATE": {
       "CHANGE_STATUS": "Αλλαγή κατάστασης",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Αναβολή έως την επόμενη απάντηση.",
+      "SNOOZE_UNTIL": "Αναβολή",
       "UPDATE_SUCCESFUL": "Η κατάσταση συνομιλίας ενημερώθηκε με επιτυχία.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 09e32e2460cc0..9c9a88f7302a9 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Προσαρμοζόμενες Ιδιότητες",
       "CONTACT_LABELS": "Ετικέτες Επαφών",
-      "PREVIOUS_CONVERSATIONS": "Προηγούμενες συνομιλίες"
+      "PREVIOUS_CONVERSATIONS": "Προηγούμενες συνομιλίες",
+      "NO_RECORDS_FOUND": "Δεν βρέθηκαν ιδιότητες"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index 0cc5935271f1f..0b564591a9400 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Δημιουργία ιδιότητας",
+    "NO_RECORDS_FOUND": "Δεν βρέθηκαν ιδιότητες",
     "UPDATE": {
       "SUCCESS": "Ο πράκτορας ενημερώθηκε επιτυχώς",
       "ERROR": "Δεν είναι δυνατή η ενημέρωση της ιδιότητας. Παρακαλώ προσπαθήστε ξανά αργότερα"
diff --git a/app/javascript/dashboard/i18n/locale/el/datePicker.json b/app/javascript/dashboard/i18n/locale/el/datePicker.json
new file mode 100644
index 0000000000000..f07088e23888a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Εφαρμογή",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Τελευταίες 7 ημέρες",
+      "LAST_30_DAYS": "Τελευταίες 30 ημέρες",
+      "LAST_3_MONTHS": "Τελευταίοι 3 μήνες",
+      "LAST_6_MONTHS": "Τελευταίοι 6 μήνες",
+      "LAST_YEAR": "Τελευταίο έτος",
+      "CUSTOM_RANGE": "Προσαρμοσμένο εύρος ημερομηνιών"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index fe24ea038c6bc..ea9e14e13748c 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Γενικά",
       "REPORTS": "Αναφορές",
       "CONVERSATION": "Συνομιλία",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Αλλαγή Αναδόχου",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Αλλαγή Ομάδας",
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 25d547a7d50d6..b76b54ff5ebde 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Προσθέστε πράκτορες στο κιβώτιο που δημιουργήθηκε."
       },
       {
-        "title": "Έξοχα!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Είσαστε έτοιμοι να ξεκινήσετε!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Επιλέξτε σελίδα από την Λίστα",
         "INBOX_NAME": "Όνομα Κιβωτίου",
         "ADD_NAME": "Ονοματίστε το κιβώτιο σας",
-        "PICK_NAME": "Διαλέξτε όνομα για το κιβώτιο",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Επιλέξτε τιμή"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Σύνδεσμος Webhook",
-          "PLACEHOLDER": "Εισάγετε τη διεύθυνση Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Παρακαλώ εισάγετε ένα έγκυρο URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "Το πεδίο είναι απαραίτητο"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Αριθμός τηλεφώνου",
+          "LABEL": "Αριθμός Τηλεφώνου",
           "PLACEHOLDER": "Παρακαλώ εισάγετε έναν αριθμό τηλεφώνου από τον οποίο θα σταλεί το μήνυμα.",
           "ERROR": "Παρακαλώ δώστε έναν έγκυρο αριθμό τηλεφώνου που ξεκινά με ένα σύμβολο `+` και δεν περιέχει κενά."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Κλειδί API",
-            "PLACEHOLDER": "Παρακαλώ εισάγετε το Bandwith API κλειδί σας",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Το πεδίο είναι απαραίτητο"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Παρακαλώ εισάγετε το Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Το πεδίο είναι απαραίτητο"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Token Επαλήθευσης Webhook",
-          "PLACEHOLDER": "Εισάγετε ένα Token επαλήθευσης που θέλετε να ρυθμίσετε για το facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Παρακαλώ εισάγετε μια έγκυρη τιμή."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Σύνδεσμος Webhook",
-          "SUBTITLE": "Ρυθμίστε το url το οποίο θα λαμβάνει callbacks όταν κάτι συμβαίνει.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Σύνδεσμος Webhook"
         },
         "SUBMIT_BUTTON": "Δημιουργία API Καναλιού",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Κανάλι Email",
-        "DESC": "Συνδέστε ένα κιβώτιο εισερχομένων email.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Όνομα καναλιού",
           "PLACEHOLDER": "Παρακαλώ εισάγετε ένα όνομα καναλιού",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Πράκτορες",
         "DESC": "Εδώ μπορείτε να προσθέσετε πράκτορες στο κιβώτιο που μόλις δημιουργήσατε. Μονο αυτοί οι επιλεγμένοι πράκτορες θα έχουν πρόσβαση στο κιβώτιο. Οι πράκτορες που δεν ανήκουν σε αυτο το κιβώτιο δεν θα έχουν την δυνατότητα να ανταποκρίνονται σε μηνήματα αυτού του κιβωτίου όταν κάνουν login στο σύστημα. <br> <b>ΥΓ:</b> Ως Διαχειριστής, αν θέλετε πρόσβαση σε όλα τα κιβώτια, θα πρέπει να προσθέσετε τον εαυτό σας σε όλα τα κιβώτια που δημιουργείτε.",
-        "VALIDATION_ERROR": "Προσθέστε τουλάχιστον ένα πράκτορα στο κιβώτιο εισερχομένων",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Επιλέξτε πράκτορες για το κιβώτιο"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,7 +508,7 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Επιτρέψτε τα μηνύματα μετά την επίλυση της συνομιλίας",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Επιτρέψτε στους τελικούς χρήστες να στέλνουν μηνύματα ακόμη και μετά την επίλυση της συζήτησης.",
       "WHATSAPP_SECTION_SUBHEADER": "Αυτό το κλειδί API χρησιμοποιείται για την ενσωμάτωση με τα API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Κλειδί API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Για να ενεργοποιήσετε το SMTP, παρακαλώ ρυθμίστε το IMAP.",
       "UPDATE": "Ενημέρωση ρυθμίσεων IMAP",
       "TOGGLE_AVAILABILITY": "Ενεργοποίηση ρυθμίσεων IMAP για αυτά τα εισερχόμενα",
-      "TOGGLE_HELP": "Η ενεργοποίηση του IMAP θα βοηθήσει το χρήστη να λάβει email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Οι ρυθμίσεις IMAP ενημερώθηκαν επιτυχώς",
         "ERROR_MESSAGE": "Αδυναμία ενημέρωσης των ρυθμίσεων IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 0e9b3beffb634..e63cbc8d2eca9 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Ο κωδικός σας άλλαξε με επιτυχία",
     "AFTER_EMAIL_CHANGED": "Το προφίλ σας ενημερώθηκε επιτυχώς, παρακαλώ κάντε είσοδο (login) επειδή τα στοιχεία εισόδου σας έχουν αλλάξει",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Εικόνα Προφίλ",
       "ERROR": "Παρακαλώ διορθώστε τα λάθη της φόρμας",
       "REMOVE_IMAGE": "Διαγραφή",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Κώδικας Πρόσβασης (Access Token)",
-        "NOTE": "Χρησιμοποιείται σε περίπτωση εξωτερικής ενοποίησης της εφαρμογής με κώδικα (API)"
+        "NOTE": "Χρησιμοποιείται σε περίπτωση εξωτερικής ενοποίησης της εφαρμογής με κώδικα (API)",
+        "COPY": "Αντιγραφή"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Ειδοποιήσεις Ήχου",
         "NOTE": "Ενεργοποίηση ηχητικών ειδοποιήσεων για νέα μηνύματα και συνομιλίες.",
+        "ALERT_TYPES": {
+          "NONE": "Κανένα",
+          "MINE": "Assigned",
+          "ALL": "Όλες"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Ειδοποίηση συμβάντων:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Κανένα",
           "ASSIGNED": "Ανατεθειμένες Συνομιλίες",
           "ALL_CONVERSATIONS": "Όλες Οι Συνομιλίες"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Οι προτιμήσεις σας για τις ειδοποιήσεις ενημερώθηκαν",
         "UPDATE_ERROR": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση των προτιμήσεων προσπαθήστε ξανά"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Πλευρική μπάρα αναφορών",
       "MOVE_TO_NEXT_TAB": "Μετακίνηση στην επόμενη καρτέλα στη λίστα συνομιλιών",
       "GO_TO_SETTINGS": "Μετάβαση στις ρυθμίσεις",
-      "SWITCH_CONVERSATION_STATUS": "Εναλλαγή στην επόμενη κατάσταση συνομιλίας",
       "SWITCH_TO_PRIVATE_NOTE": "Αλλαγή σε Ιδιωτική Σημείωση",
       "SWITCH_TO_REPLY": "Εναλλαγή σε απάντηση",
       "TOGGLE_SNOOZE_DROPDOWN": "Εναλλαγή αναβολής dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/el/sla.json b/app/javascript/dashboard/i18n/locale/el/sla.json
index aa7cdca7547cc..06daacfef5e3a 100644
--- a/app/javascript/dashboard/i18n/locale/el/sla.json
+++ b/app/javascript/dashboard/i18n/locale/el/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/en/bulkActions.json b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/en/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 24483ca1ad7ef..4db7fce93e026 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index d6ea8f83d75c1..742a3657e8560 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/en/datePicker.json b/app/javascript/dashboard/i18n/locale/en/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 8d1662f91f0e6..a168e82f02bb3 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 81e0c5763f988..1858f4947f98b 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -32,6 +32,7 @@ import whatsappTemplates from './whatsappTemplates.json';
 import sla from './sla.json';
 import inbox from './inbox.json';
 import general from './general.json';
+import datePicker from './datePicker.json';
 
 export default {
   ...advancedFilters,
@@ -68,4 +69,5 @@ export default {
   ...whatsappTemplates,
   ...inbox,
   ...general,
+  ...datePicker,
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index e9ac56f2a5792..1f4d44e225f30 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -316,7 +340,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/en/sla.json b/app/javascript/dashboard/i18n/locale/en/sla.json
index e3c1c9a062b2c..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/en/sla.json
+++ b/app/javascript/dashboard/i18n/locale/en/sla.json
@@ -10,7 +10,8 @@
       "TITLE": "Upgrade to create SLAs",
       "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
       "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
-      "UPGRADE_NOW": "Upgrade now"
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
     },
     "ENTERPRISE_PAYWALL": {
       "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
@@ -104,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/es/bulkActions.json b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
index 00c47a16a7d3e..72c40ad987856 100644
--- a/app/javascript/dashboard/i18n/locale/es/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Cargando agentes",
     "UPDATE": {
       "CHANGE_STATUS": "Cambiar estado",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Posponer hasta la próxima respuesta.",
+      "SNOOZE_UNTIL": "Posponer",
       "UPDATE_SUCCESFUL": "El estado de la conversación se actualizó con éxito.",
       "UPDATE_FAILED": "No se han podido actualizar las conversaciones. Inténtalo de nuevo."
     },
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 8d3b2589e6f70..5fb0bb5ce6c72 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Atributos personalizados",
       "CONTACT_LABELS": "Etiqueta de Contacto",
-      "PREVIOUS_CONVERSATIONS": "Conversaciones anteriores"
+      "PREVIOUS_CONVERSATIONS": "Conversaciones anteriores",
+      "NO_RECORDS_FOUND": "No se encontraron atributos"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Exportar contactos",
       "MESSAGE": "¿Está seguro que desea exportar todos los contactos?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Sí, exportar",
       "NO": "No, cancelar"
     }
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index d0aa45e466f23..1f2a4bccbb3ea 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Crear atributo",
+    "NO_RECORDS_FOUND": "No se encontraron atributos",
     "UPDATE": {
       "SUCCESS": "Atributo actualizado correctamente",
       "ERROR": "No se puede actualizar el atributo. Por favor, inténtalo de nuevo más tarde"
diff --git a/app/javascript/dashboard/i18n/locale/es/datePicker.json b/app/javascript/dashboard/i18n/locale/es/datePicker.json
new file mode 100644
index 0000000000000..64b38b91d808a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Aplicar",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Últimos 7 días",
+      "LAST_30_DAYS": "Últimos 30 días",
+      "LAST_3_MONTHS": "Últimos 3 meses",
+      "LAST_6_MONTHS": "Últimos 6 meses",
+      "LAST_YEAR": "Último año",
+      "CUSTOM_RANGE": "Rango de fechas personalizado"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 52bbf1fed254d..63a9b7b0b59b5 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Informes",
       "CONVERSATION": "Conversación",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Cambiar Asignado",
       "CHANGE_PRIORITY": "Cambiar prioridad",
       "CHANGE_TEAM": "Cambiar equipo",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 67554cdfd2598..2391d4462a627 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Añadir agentes a la bandeja de entrada creada."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "¡Todo está listo!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Seleccione una página de la lista",
         "INBOX_NAME": "Nombre de la bandeja de entrada",
         "ADD_NAME": "Añada un nombre para su bandeja de entrada",
-        "PICK_NAME": "Elija un nombre para su bandeja de entrada",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Elija un valor"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL de Webhook",
-          "PLACEHOLDER": "Ingrese su URL de Webhook",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Por favor, introduzca una URL válida"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "Este campo es obligatorio"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Número de teléfono",
+          "LABEL": "Número telefónico",
           "PLACEHOLDER": "Por favor, introduzca el número de teléfono desde el que se enviará el mensaje.",
           "ERROR": "Por favor, proporcione un número de teléfono válido que comience con un signo `+` y no contenga espacios."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Clave de API",
-            "PLACEHOLDER": "Por favor, introduzca su clave API de Bandwith",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Este campo es obligatorio"
           },
           "API_SECRET": {
             "LABEL": "API secreta",
-            "PLACEHOLDER": "Por favor ingrese su Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Este campo es obligatorio"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Token de verificación del Webhook",
-          "PLACEHOLDER": "Introduzca un token de verificación que desea configurar para los webhooks de facebook.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Por favor, introduzca un valor válido."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL de Webhook",
-          "SUBTITLE": "Configure la URL donde recibirá las respuestas a los eventos.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL de Webhook"
         },
         "SUBMIT_BUTTON": "Crear canal de API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Canal de Email",
-        "DESC": "Integre su bandeja de entrada del email.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nombre del canal",
           "PLACEHOLDER": "Por favor, introduzca un nombre de canal",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agentes",
         "DESC": "Aquí puede agregar agentes para administrar su recién creada bandeja de entrada. Sólo estos agentes seleccionados tendrán acceso a su bandeja de entrada. Los agentes que no forman parte de esta bandeja de entrada no podrán ver o responder a los mensajes de esta bandeja de entrada cuando inicien sesión. <br> <b>PS:</b> Como administrador, si necesita acceso a todas las bandejas, debes añadirte como agente a todas las bandejas de entrada que crees.",
-        "VALIDATION_ERROR": "Añadir al menos un agente a su nueva bandeja de entrada",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Elegir agentes para la bandeja de entrada"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Nombre del remitente",
-        "SUB_TEXT": "Seleccione el nombre que se muestra al cliente cuando reciba correos electrónicos de sus agentes.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "Por ejemplo:",
         "FRIENDLY": {
           "TITLE": "Amigable",
@@ -508,7 +508,7 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Permitir mensajes después de la conversación resuelta",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permitir a los usuarios finales enviar mensajes incluso después de que la conversación sea resuelta.",
       "WHATSAPP_SECTION_SUBHEADER": "Esta clave de API se utiliza para la integración con las APIs de WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Introduzca la clave actualizada para la integración con las API de WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Clave de API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Actualizar Clave API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Introduzca aquí la nueva Clave API",
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Para habilitar SMTP, por favor configure IMAP.",
       "UPDATE": "Actualizar ajustes IMAP",
       "TOGGLE_AVAILABILITY": "Habilitar configuración IMAP para esta bandeja de entrada",
-      "TOGGLE_HELP": "Habilitar IMAP ayudará al usuario a recibir correo electrónico",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Configuración IMAP actualizada correctamente",
         "ERROR_MESSAGE": "No se puede actualizar la configuración IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index da0d7e9903301..b03322a99b46b 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Su contraseña se ha cambiado correctamente",
     "AFTER_EMAIL_CHANGED": "Su perfil ha sido actualizado con éxito, por favor inicie sesión de nuevo cuando sus credenciales de inicio de sesión se hayan cambiado",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Imagen de perfil",
       "ERROR": "Por favor, corrija los errores de formulario",
       "REMOVE_IMAGE": "Eliminar",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token de acceso",
-        "NOTE": "Este token puede ser usado si estás construyendo una integración basada en API"
+        "NOTE": "Este token puede ser usado si estás construyendo una integración basada en API",
+        "COPY": "Copiar"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Notificaciones con sonido",
         "NOTE": "Active las notificaciones de sonido en el tablero para los mensajes nuevos y conversaciones.",
+        "ALERT_TYPES": {
+          "NONE": "Ninguna",
+          "MINE": "Assigned",
+          "ALL": "Todos"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Eventos de alerta:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Ninguna",
           "ASSIGNED": "Conversaciones asignadas",
           "ALL_CONVERSATIONS": "Todas las conversaciones"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-mail",
+        "PUSH": "Notificación push",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Sus preferencias de notificación se actualizaron correctamente",
         "UPDATE_ERROR": "Se ha producido un error al actualizar las preferencias, inténtelo de nuevo"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Ir a la barra lateral de informes",
       "MOVE_TO_NEXT_TAB": "Mover a la siguiente pestaña en la lista de conversaciones",
       "GO_TO_SETTINGS": "Ir a Ajustes",
-      "SWITCH_CONVERSATION_STATUS": "Cambiar al siguiente estado de conversación",
       "SWITCH_TO_PRIVATE_NOTE": "Cambiar a nota privada",
       "SWITCH_TO_REPLY": "Cambiar a respuesta",
       "TOGGLE_SNOOZE_DROPDOWN": "Cambiar el menú desplegable"
diff --git a/app/javascript/dashboard/i18n/locale/es/sla.json b/app/javascript/dashboard/i18n/locale/es/sla.json
index ad0655b753011..acbd235ab17e0 100644
--- a/app/javascript/dashboard/i18n/locale/es/sla.json
+++ b/app/javascript/dashboard/i18n/locale/es/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Los Acuerdos de Nivel de Servicio (SLA) son contratos que definen expectativas claras entre su equipo y sus clientes. Establecen normas para los tiempos de respuesta y resolución, creando un marco para la responsabilidad y garantiza una experiencia coherente y de alta calidad.",
     "LEARN_MORE": "Más información sobre SLA",
     "LOADING": "Obteniendo SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "No hay SLAs disponibles en esta cuenta.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json b/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
index 44d10cb481660..0e8715e56250f 100644
--- a/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
@@ -1,17 +1,17 @@
 {
   "FILTER": {
     "TITLE": "فیلتر گفتگو‌ها",
-    "SUBTITLE": "Add your filters below and hit 'Apply filters' to cut through the chat clutter.",
+    "SUBTITLE": "فیلترهای خود را در زیر اضافه کنید و روی «اعمال فیلترها» بزنید تا از شلوغی لیست بکاهید.",
     "EDIT_CUSTOM_FILTER": "ویرایش فولدر",
-    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your folder.",
+    "CUSTOM_VIEWS_SUBTITLE": "فیلترها را اضافه یا حذف کنید و پوشه خود را به روز کنید.",
     "ADD_NEW_FILTER": "افزودن فیلتر",
-    "FILTER_DELETE_ERROR": "Oops, looks like we can't save nothing! Please add at least one filter to save it.",
+    "FILTER_DELETE_ERROR": "اوه، به نظر می رسد ما نمی توانیم چیزی را ذخیره کنیم! لطفاً حداقل یک فیلتر برای ذخیره آن اضافه کنید.",
     "SUBMIT_BUTTON_LABEL": "اعمال فیلترها",
     "UPDATE_BUTTON_LABEL": "بروز رسانی فولدر",
     "CANCEL_BUTTON_LABEL": "انصراف",
     "CLEAR_BUTTON_LABEL": "پاک کردن فیلترها",
     "FOLDER_LABEL": "نام فولدر",
-    "FOLDER_QUERY_LABEL": "Folder Query",
+    "FOLDER_QUERY_LABEL": "کوئری پوشه",
     "EMPTY_VALUE_ERROR": "مقدار الزامی است.",
     "TOOLTIP_LABEL": "فیلتر گفتگو‌ها",
     "QUERY_DROPDOWN_LABELS": {
@@ -39,7 +39,7 @@
       "ASSIGNEE_NAME": "نام مسئول",
       "INBOX_NAME": "نام صندوق ورودی",
       "TEAM_NAME": "نام تیم",
-      "CONVERSATION_IDENTIFIER": "Conversation identifier",
+      "CONVERSATION_IDENTIFIER": "شناسه گفتگو",
       "CAMPAIGN_NAME": "نام کمپین",
       "LABELS": "برچسب‌ها",
       "BROWSER_LANGUAGE": "مرور زبان",
@@ -63,7 +63,7 @@
       "ADD": {
         "TITLE": "آیا می‌خواهید این فیلتر را ذخیره کنید؟",
         "LABEL": "نام این فیلتر",
-        "PLACEHOLDER": "Name your filter to refer it later.",
+        "PLACEHOLDER": "برای فیلتر خود یک نام انتخاب کنید تا بعدا بتوانید آن را پیدا کنید.",
         "ERROR_MESSAGE": "نام الزامی است.",
         "SAVE_BUTTON": "ذخیره فیلتر",
         "CANCEL_BUTTON": "انصراف",
diff --git a/app/javascript/dashboard/i18n/locale/fa/agentBots.json b/app/javascript/dashboard/i18n/locale/fa/agentBots.json
index 0ef9de5948156..78e9dbd7ab138 100644
--- a/app/javascript/dashboard/i18n/locale/fa/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/fa/agentBots.json
@@ -3,7 +3,7 @@
     "HEADER": "ربات‌ها",
     "LOADING_EDITOR": "در حال بارگیری ویرایشگر...",
     "HEADER_BTN_TXT": "افرودن پیکربندی ربات",
-    "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try.</p> <p> You can manage your bots from this page or create new ones using the 'Add bot configuraton' button.</p> <p> Open the <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">Agent bots handbook</a> in another tab for a helping hand.</p>",
+    "SIDEBAR_TXT": "<p><b>اپراتور های ربات</b><p>مانند شگفت‌انگیزترین اعضای تیم شما هستند. آنها می توانند مسائل کوچک را اداره کنند، بنابراین شما می توانید روی چیزهای مهم تمرکز کنید. آنها را امتحان کنید.</p><p>می‌توانید ربات‌های خود را در این صفحه مدیریت کنید یا با استفاده از دکمه «افزودن ربات» ربات‌های جدیدی ایجاد کنید.</p><p> باز کردن آدرس <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">راهنما ربات ها</a> در یک صفحه جدید به شما کمک می کند اطلاعات بیشتری کسب کنید.</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
         "LABEL": "نام ربات",
@@ -22,7 +22,7 @@
     },
     "BOT_CONFIGURATION": {
       "TITLE": "انتخاب یک ربات عامل",
-      "DESC": "Assign an Agent Bot to your inbox. They can handle initial conversations and transfer them to a live agent when necessary.",
+      "DESC": "یک ربات به صندوق ورودی خود اختصاص دهید. آنها می توانند مکالمات اولیه را انجام دهند و در صورت لزوم آنها را به یک اپراتور منتقل کنند.",
       "SUBMIT": "اعمال شود",
       "DISCONNECT": "قطع ربات",
       "SUCCESS_MESSAGE": "ربات عامل با موفقیت به‌روز شد.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json b/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
index 0e6123c7af8e7..223a6f5254518 100644
--- a/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
@@ -75,9 +75,9 @@
           "PLACEHOLDER": "لطفا ایمیل اپراتور را وارد کنید"
         },
         "AGENT_AVAILABILITY": {
-          "LABEL": "در دسترس",
-          "PLACEHOLDER": "لطفا یک وضعیت در دسترس بودن را انتخاب کنید",
-          "ERROR": "در دسترس بودن الزامی است"
+          "LABEL": "دسترسی",
+          "PLACEHOLDER": "لطفا یک وضعیت دسترسی را انتخاب کنید",
+          "ERROR": "دسترسی الزامی است"
         },
         "SUBMIT": "تغییر ایجنت"
       },
@@ -111,7 +111,7 @@
         "PLACEHOLDER": {
           "AGENT": "جستجوی اپراتور",
           "TEAM": "جستجوی تیم",
-          "INPUT": "جستجوی اپراتور"
+          "INPUT": "جستجوی اپراتورها"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
index 8346ae40ee575..eae45ef86c7e5 100644
--- a/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
@@ -41,15 +41,15 @@
           "IN_VALID": "کلید نامعتبر"
         },
         "REGEX_PATTERN": {
-          "LABEL": "Regex Pattern",
-          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+          "LABEL": "الگوی رجکس",
+          "PLACEHOLDER": "لطفا الگوی رجکس ویژگی سفارشی را وارد کنید. (اختباری)"
         },
         "REGEX_CUE": {
           "LABEL": "Regex Cue",
-          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+          "PLACEHOLDER": "لطفا توضیحات مربوط به الگوری رجکس را وارد کنید. (اختیاری)"
         },
         "ENABLE_REGEX": {
-          "LABEL": "Enable regex validation"
+          "LABEL": "فعال سازی بررسی رجکس"
         }
       },
       "API": {
@@ -106,15 +106,15 @@
         "NOT_FOUND": "هیچ ویژگی سفارشی پیکربندی نشده است"
       },
       "REGEX_PATTERN": {
-        "LABEL": "Regex Pattern",
-        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        "LABEL": "الگوی رجکس",
+        "PLACEHOLDER": "لطفا الگوی رجکس ویژگی سفارشی را وارد کنید. (اختباری)"
       },
       "REGEX_CUE": {
         "LABEL": "Regex Cue",
-        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        "PLACEHOLDER": "لطفا توضیحات مربوط به الگوری رجکس را وارد کنید. (اختیاری)"
       },
       "ENABLE_REGEX": {
-        "LABEL": "Enable regex validation"
+        "LABEL": "فعال سازی بررسی رجکس"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/auditLogs.json b/app/javascript/dashboard/i18n/locale/fa/auditLogs.json
index 1a4612607a2a1..858c8a165ced0 100644
--- a/app/javascript/dashboard/i18n/locale/fa/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/fa/auditLogs.json
@@ -21,51 +21,51 @@
     },
     "DEFAULT_USER": "سیستم",
     "AUTOMATION_RULE": {
-      "ADD": "%{agentName} created a new automation rule (#%{id})",
-      "EDIT": "%{agentName} updated an automation rule (#%{id})",
-      "DELETE": "%{agentName} deleted an automation rule (#%{id})"
+      "ADD": "%{agentName} یک اتوماسیون (%{id}) ایجاد کرد",
+      "EDIT": "%{agentName} یک اتوماسیون (%{id}) را ویرایش کرد",
+      "DELETE": "%{agentName} یک اتوماسیون (%{id}) را حذف کرد"
     },
     "ACCOUNT_USER": {
-      "ADD": "%{agentName} invited %{invitee} to the account as an %{role}",
+      "ADD": "%{agentName} از %{invitee} دعوت کرد به عنوان %{role} به سیستم اضافه شود",
       "EDIT": {
-        "SELF": "%{agentName} changed their %{attributes} to %{values}",
-        "OTHER": "%{agentName} changed %{attributes} of %{user} to %{values}"
+        "SELF": "%{agentName} مقدار %{attributes} را به %{values} تغییر داد",
+        "OTHER": "%{agentName} مقدار %{attributes} مربوط به %{user} را به %{values} تغییر داد"
       }
     },
     "INBOX": {
-      "ADD": "%{agentName} created a new inbox (#%{id})",
-      "EDIT": "%{agentName} updated an inbox (#%{id})",
-      "DELETE": "%{agentName} deleted an inbox (#%{id})"
+      "ADD": "%{agentName} یک صندوق ورودی (%{id}) ایجاد کرد",
+      "EDIT": "%{agentName} یک صندوق ورودی (%{id}) را ویرایش کرد",
+      "DELETE": "%{agentName} یک صندوق ورودی (%{id}) را حذف کرد"
     },
     "WEBHOOK": {
-      "ADD": "%{agentName} created a new webhook (#%{id})",
-      "EDIT": "%{agentName} updated a webhook (#%{id})",
-      "DELETE": "%{agentName} deleted a webhook (#%{id})"
+      "ADD": "%{agentName} یک وب هوک (%{id}) ایجاد کرد",
+      "EDIT": "%{agentName} یک وب هوک (%{id}) را ویرایش کرد",
+      "DELETE": "%{agentName} یک وب هوک (%{id}) را حذف کرد"
     },
     "USER_ACTION": {
-      "SIGN_IN": "%{agentName} signed in",
-      "SIGN_OUT": "%{agentName} signed out"
+      "SIGN_IN": "%{agentName} وارد شد",
+      "SIGN_OUT": "%{agentName} خارج شد"
     },
     "TEAM": {
-      "ADD": "%{agentName} created a new team (#%{id})",
-      "EDIT": "%{agentName} updated a team (#%{id})",
-      "DELETE": "%{agentName} deleted a team (#%{id})"
+      "ADD": "%{agentName} یک تیم (%{id}) ایجاد کرد",
+      "EDIT": "%{agentName} یک تیم (%{id}) را ویرایش کرد",
+      "DELETE": "%{agentName} یک تیم (%{id}) را حذف کرد"
     },
     "MACRO": {
-      "ADD": "%{agentName} created a new macro (#%{id})",
-      "EDIT": "%{agentName} updated a macro (#%{id})",
-      "DELETE": "%{agentName} deleted a macro (#%{id})"
+      "ADD": "%{agentName} یک ماکرو (%{id}) ایجاد کرد",
+      "EDIT": "%{agentName} یک ماکرو (%{id}) را ویرایش کرد",
+      "DELETE": "%{agentName} یک ماکرو (%{id}) را حذف کرد"
     },
     "INBOX_MEMBER": {
-      "ADD": "%{agentName} added %{user} to the inbox(#%{inbox_id})",
-      "REMOVE": "%{agentName} removed %{user} from the inbox(#%{inbox_id})"
+      "ADD": "%{agentName} اپراتور %{user} را به صندوق ورودی (%{inbox_id}) اضافه کرد",
+      "REMOVE": "%{agentName} اپراتور %{user} را از صندوق ورودی (%{inbox_id}) حذف کرد"
     },
     "TEAM_MEMBER": {
-      "ADD": "%{agentName} added %{user} to the team(#%{team_id})",
-      "REMOVE": "%{agentName} removed %{user} from the team(#%{team_id})"
+      "ADD": "%{agentName} اپراتور %{user} را به تیم (%{team_id}) اضافه کرد",
+      "REMOVE": "%{agentName} اپراتور %{user} را از تیم (%{team_id}) حذف کرد"
     },
     "ACCOUNT": {
-      "EDIT": "%{agentName} updated the account configuration (#%{id})"
+      "EDIT": "%{agentName} تنظیمات مربوط به حساب (%{id}) را ویرایش کرد"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/bulkActions.json b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
index 42b887e3cf2ca..61379039915d5 100644
--- a/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
@@ -7,26 +7,26 @@
     "GO_BACK_LABEL": "بازگشت",
     "ASSIGN_LABEL": "اختصاص دادن",
     "YES": "بله",
-    "ASSIGN_AGENT_TOOLTIP": "ایجنت را تعیین کنید",
+    "ASSIGN_AGENT_TOOLTIP": "اپراتور را تعیین کنید",
     "ASSIGN_TEAM_TOOLTIP": "تیم را تعیین کنید",
     "ASSIGN_SUCCESFUL": "گفتگو با موفقیت اختصاص داده شده.",
-    "ASSIGN_FAILED": "Failed to assign conversations. Please try again.",
+    "ASSIGN_FAILED": "گفتگو اختصاص داده نشد، لطفا دوباره امتحان کنید.",
     "RESOLVE_SUCCESFUL": "گفتگو با موفقیت حل شد.",
-    "RESOLVE_FAILED": "Failed to resolve conversations. Please try again.",
+    "RESOLVE_FAILED": "گفتگو حل نشد، لطفا دوباره امتحان کنید.",
     "ALL_CONVERSATIONS_SELECTED_ALERT": "گفتگوهای قابل مشاهده در این صفحه فقط انتخاب می‌شوند.",
     "AGENT_LIST_LOADING": "بارگذاری ایجنت ها",
     "UPDATE": {
       "CHANGE_STATUS": "تغییر وضعیت",
-      "SNOOZE_UNTIL_NEXT_REPLY": "تا پاسخ بعدی به تعویق بی‌افتد.",
+      "SNOOZE_UNTIL": "به تعویق انداختن",
       "UPDATE_SUCCESFUL": "وضعیت گفتگو با موفقیت به روز شد.",
-      "UPDATE_FAILED": "Failed to update conversations. Please try again."
+      "UPDATE_FAILED": "گفتگوها به روز نشدند، لطفا دوباره امتحان کنید."
     },
     "LABELS": {
-      "ASSIGN_LABELS": "Assign labels",
+      "ASSIGN_LABELS": "برچسب اختصاص دهید",
       "NO_LABELS_FOUND": "هیچ برچسبی یافت نشد برای",
       "ASSIGN_SELECTED_LABELS": "اختصاص برچسب‌های انتخاب شده",
       "ASSIGN_SUCCESFUL": "برچسب‌ها با موفقیت اختصاص یافتند.",
-      "ASSIGN_FAILED": "Failed to assign labels. Please try again."
+      "ASSIGN_FAILED": "اختصاص برچسب‌ به صورت موفق انجام نشد، لطفا دوباره امتحان کنید."
     },
     "TEAMS": {
       "TEAM_SELECT_LABEL": "انتخاب تیم",
@@ -34,7 +34,7 @@
       "NO_TEAMS_AVAILABLE": "هنوز هیچ تیمی به این حساب کاربری اضافه نشده است.",
       "ASSIGN_SELECTED_TEAMS": "اختصاص تیم انتخاب شده.",
       "ASSIGN_SUCCESFUL": "تیم‌ها با موفقیت اختصاص یافتند.",
-      "ASSIGN_FAILED": "Failed to assign team. Please try again."
+      "ASSIGN_FAILED": "اختصاص تیم با موفقیت انجام نشد، لطفا دوباره امتحان کنید."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/fa/cannedMgmt.json
index 3a689a72e4c53..ec98e61031bc7 100644
--- a/app/javascript/dashboard/i18n/locale/fa/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/cannedMgmt.json
@@ -1,75 +1,75 @@
 {
   "CANNED_MGMT": {
     "HEADER": "پاسخ‌های آماده",
-    "HEADER_BTN_TXT": "Add canned response",
-    "LOADING": "Fetching canned responses...",
+    "HEADER_BTN_TXT": "اضافه کردن پاسخ آماده",
+    "LOADING": "دریافت پاسخ‌های آماده...",
     "SEARCH_404": "هیچ گزینه‌ای با این شرایط پیدا نشد.",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are pre-written reply templates that help you quickly respond to a conversation. To insert a canned response during a chat, agents can type a short code preceded by a '/' character. </p><p> You can manage your canned responses from this page or create new ones using the \"Add canned response\" button.</p><p>Open the <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Canned Responses handbook</a> in another tab for a helping hand.</p><p>Also, check out the all-new <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Canned Responses Library</a>.</p>",
+    "SIDEBAR_TXT": "<p><b>پاسخ های آماده</b></p><p>پاسخ های آماده الگوهای از پیش نوشته شده ای هستند که به شما کمک می کنند به سرعت به یک گفتگو پاسخ دهید. برای درج یک پاسخ آماده در طول یک گفتگو، اپراتورها می توانند یک کد کوتاه بعد از یک '/' تایپ کنند.</p><p>می توانید پاسخ های آماده خود را از این صفحه مدیریت کنید یا با استفاده از دکمه \"افزودن پاسخ آماده\" پاسخ های جدید ایجاد کنید.</p><p>در یک صفحه جدید صفحه <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\"> را راهنمایی بیشتر باز کنید.</p><p> همچنین با بررسی <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\"> می توانید از پاسخ های آماده جدید مطلع شوید.</p>",
     "LIST": {
       "404": "هیچ پاسخ آماده‌ای برای این حساب تعریف نشده است",
       "TITLE": "مدیریت پاسخ‌های آماده",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
+      "DESC": "پاسخ‌های آماده قالب‌های متنی پیش آماده‌ای هستند که برای پاسخگویی سریع به یک گفتگو می‌توانند مفید واقع شوند.",
       "TABLE_HEADER": [
-        "Short code",
+        "کد کوتاه",
         "محتوا",
         "عملیات"
       ]
     },
     "ADD": {
-      "TITLE": "Add canned response",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
+      "TITLE": "اضافه کردن پاسخ آماده",
+      "DESC": "پاسخ‌های آماده قالب‌های متنی پیش آماده‌ای هستند که برای پاسخگویی سریع به یک گفتگو می‌توانند مفید واقع شوند.",
       "CANCEL_BUTTON_TEXT": "انصراف",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short code",
-          "PLACEHOLDER": "Please enter a short code.",
-          "ERROR": "Short Code is required."
+          "LABEL": "کد کوتاه",
+          "PLACEHOLDER": "لطفا یک کد کوتاه وارد کنید.",
+          "ERROR": "وجود کد کوتاه ضروری است."
         },
         "CONTENT": {
           "LABEL": "پیام",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
-          "ERROR": "Message is required."
+          "PLACEHOLDER": "لطفاً پیامی را که می‌خواهید به عنوان الگو استفاده کنید، ذخیره کنید تا بعداً از آن استفاده کنید.",
+          "ERROR": "پیام الزامی است."
         },
         "SUBMIT": "ثبت"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned response added successfully.",
+        "SUCCESS_MESSAGE": "پاسخ آماده با موفقیت ثبت شد.",
         "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
       }
     },
     "EDIT": {
-      "TITLE": "Edit canned response",
+      "TITLE": "ویرایش پاسخ آماده",
       "CANCEL_BUTTON_TEXT": "انصراف",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short code",
-          "PLACEHOLDER": "Please enter a shortcode.",
-          "ERROR": "Short code is required."
+          "LABEL": "کد کوتاه",
+          "PLACEHOLDER": "لطفا یک کد کوتاه وارد کنید.",
+          "ERROR": "وجود کد کوتاه ضروری است."
         },
         "CONTENT": {
           "LABEL": "پیام",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "PLACEHOLDER": "لطفاً پیامی را که می‌خواهید به عنوان الگو استفاده کنید، ذخیره کنید تا بعداً از آن استفاده کنید.",
           "ERROR": "پیام الزامی است."
         },
         "SUBMIT": "ثبت"
       },
       "BUTTON_TEXT": "ویرایش",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response is updated successfully.",
+        "SUCCESS_MESSAGE": "پاسخ آماده با موفقیت ویرایش شد.",
         "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "حذف",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully.",
+        "SUCCESS_MESSAGE": "پاسخ آماده با موفقیت حذف شد.",
         "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
       },
       "CONFIRM": {
         "TITLE": "تاییدیه حذف",
         "MESSAGE": "مطمئن هستید حذف شود؟ ",
-        "YES": "Yes, delete ",
-        "NO": "No, keep "
+        "YES": "بله، حذف شود ",
+        "NO": "خیر، نگه‌دار "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/chatlist.json b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
index a8efc16096f2c..5e369ef58f51a 100644
--- a/app/javascript/dashboard/i18n/locale/fa/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
@@ -53,28 +53,28 @@
     },
     "SORT_ORDER_ITEMS": {
       "last_activity_at_asc": {
-        "TEXT": "Last activity: Oldest first"
+        "TEXT": "آخرین فعالیت: قدیمی ترین اول"
       },
       "last_activity_at_desc": {
-        "TEXT": "Last activity: Newest first"
+        "TEXT": "آخرین فعالیت: جدید ترین اول"
       },
       "created_at_desc": {
-        "TEXT": "Created at: Newest first"
+        "TEXT": "زمان ایجاد: جدیدترین اول"
       },
       "created_at_asc": {
-        "TEXT": "Created at: Oldest first"
+        "TEXT": "زمان ایجاد: قدیمی ترین اول"
       },
       "priority_desc": {
-        "TEXT": "Priority: Highest first"
+        "TEXT": "اولویت: بالاترین اول"
       },
       "priority_asc": {
-        "TEXT": "Priority: Lowest first"
+        "TEXT": "اولویت: پایین ترین اول"
       },
       "waiting_since_asc": {
-        "TEXT": "Pending Response: Longest first"
+        "TEXT": "در انتظار پاسخ: بیشترین اول"
       },
       "waiting_since_desc": {
-        "TEXT": "Pending Response: Shortest first"
+        "TEXT": "در انتظار پاسخ: کم‌ترین اول"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 23d76e1148f94..844c4b862d61c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -39,16 +39,17 @@
     },
     "MERGE_CONTACT": "ادغام مخاطبین",
     "CONTACT_ACTIONS": "اقدامات مخاطب",
-    "MUTE_CONTACT": "Block Contact",
-    "UNMUTE_CONTACT": "Unblock Contact",
-    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
-    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
+    "MUTE_CONTACT": "مسدود کردن مخاطب",
+    "UNMUTE_CONTACT": "رفع مسدود کردن مخاطب",
+    "MUTED_SUCCESS": "مخاطب با موفقیت مسدود شد. گفتگوهای بعدی به شما اطلاع داده نخواهد شد.",
+    "UNMUTED_SUCCESS": "مخاطب با موفقیت رفع نسداد شد.",
     "SEND_TRANSCRIPT": "ارسال رونوشت",
     "EDIT_LABEL": "ویرایش",
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "ویژگی‌های سفارشی",
       "CONTACT_LABELS": "تماس با برچسب ها",
-      "PREVIOUS_CONVERSATIONS": "گفتگوهای قبلی"
+      "PREVIOUS_CONVERSATIONS": "گفتگوهای قبلی",
+      "NO_RECORDS_FOUND": "هیچ ویژگی یافت نشد"
     }
   },
   "EDIT_CONTACT": {
@@ -71,7 +72,7 @@
       "SUBMIT": "تزریق کردن",
       "CANCEL": "انصراف"
     },
-    "SUCCESS_MESSAGE": "You will be notified via email when the import is complete.",
+    "SUCCESS_MESSAGE": "پس از تکمیل ورود اطلاعات از طریق ایمیل به شما اطلاع داده خواهد شد.",
     "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
   },
   "EXPORT_CONTACTS": {
@@ -82,9 +83,10 @@
     "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید",
     "CONFIRM": {
       "TITLE": "خروجی گرفتن مخاطب ها",
-      "MESSAGE": "Are you sure you want to export all contacts?",
-      "YES": "Yes, Export",
-      "NO": "No, Cancel"
+      "MESSAGE": "آیا مطمئن هستید که می خواهید از همه مخاطبین خروجی بگیرید؟",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
+      "YES": "بله، خروجی بگیر",
+      "NO": "نه، انصراف"
     }
   },
   "DELETE_NOTE": {
@@ -296,8 +298,8 @@
     "BUTTON": "افزودن ویژگی سفارشی",
     "NOT_AVAILABLE": "هیچ ویژگی سفارشی برای این مخاطب موجود نیست.",
     "COPY_SUCCESSFUL": "با موفقیت در کلیپ‌بورد کپی شد",
-    "SHOW_MORE": "Show all attributes",
-    "SHOW_LESS": "Show less attributes",
+    "SHOW_MORE": "نمایش همه ویژگی ها",
+    "SHOW_LESS": "نمایش ویژگی های کمتر",
     "ACTIONS": {
       "COPY": "کپی ویژگی",
       "DELETE": "حذف ویژگی",
@@ -348,7 +350,7 @@
     "VALIDATIONS": {
       "REQUIRED": "مقدار معتبر مورد نیاز است",
       "INVALID_URL": "URL نامعتبر",
-      "INVALID_INPUT": "Invalid Input"
+      "INVALID_INPUT": "ورودی نامعتبر"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/contactFilters.json b/app/javascript/dashboard/i18n/locale/fa/contactFilters.json
index c697631beef4f..29c79ab503b41 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contactFilters.json
@@ -2,18 +2,18 @@
   "CONTACTS_FILTER": {
     "TITLE": "فیلتر مخاطبین",
     "SUBTITLE": "فیلترهای زیر را اضافه کنید و برای اعمال فیلتر کردن مخاطبین، برروی «ثبت» ضربه بزنید.",
-    "EDIT_CUSTOM_SEGMENT": "Edit Segment",
-    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your segment.",
+    "EDIT_CUSTOM_SEGMENT": "ویرایش بخش",
+    "CUSTOM_VIEWS_SUBTITLE": "فیلترها را اضافه یا حذف کنید و بخش خود را به روز کنید.",
     "ADD_NEW_FILTER": "افزودن فیلتر",
     "CLEAR_ALL_FILTERS": "پاک کردن همه فیلترها",
     "FILTER_DELETE_ERROR": "شما باید حداقل یک فیلتر برای ذخیره داشته باشید",
     "SUBMIT_BUTTON_LABEL": "ثبت",
-    "UPDATE_BUTTON_LABEL": "Update Segment",
+    "UPDATE_BUTTON_LABEL": "ویرایش بخش",
     "CANCEL_BUTTON_LABEL": "انصراف",
     "CLEAR_BUTTON_LABEL": "پاک کردن فیلترها",
     "EMPTY_VALUE_ERROR": "مقدار الزامی است",
-    "SEGMENT_LABEL": "Segment Name",
-    "SEGMENT_QUERY_LABEL": "Segment Query",
+    "SEGMENT_LABEL": "اسم بخش",
+    "SEGMENT_QUERY_LABEL": "کوئری بخش",
     "TOOLTIP_LABEL": "فیلتر مخاطبین",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "و",
@@ -45,7 +45,7 @@
       "CREATED_AT": "ایجاد شده در",
       "LAST_ACTIVITY": "آخرین فعالیت",
       "REFERER_LINK": "پیوند ارجاع‌دهنده",
-      "BLOCKED": "Blocked"
+      "BLOCKED": "مسدود شده"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "فیلترهای استاندارد",
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index a338345253a43..303f093005c3f 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -40,10 +40,10 @@
     "UNKNOWN_FILE_TYPE": "فایل ناشناخته",
     "SAVE_CONTACT": "ذخیره",
     "UPLOADING_ATTACHMENTS": "در حال بارگذاری پیوست‌ها...",
-    "REPLIED_TO_STORY": "Replied to your story",
-    "UNSUPPORTED_MESSAGE": "This message is unsupported.",
-    "UNSUPPORTED_MESSAGE_FACEBOOK": "This message is unsupported. You can view this message on the Facebook Messenger app.",
-    "UNSUPPORTED_MESSAGE_INSTAGRAM": "This message is unsupported. You can view this message on the Instagram app.",
+    "REPLIED_TO_STORY": "به استوری شما پاسخ داده",
+    "UNSUPPORTED_MESSAGE": "از این پیام پشتیبانی نمی شود.",
+    "UNSUPPORTED_MESSAGE_FACEBOOK": "این پیام پشتیبانی نمی شود. می توانید این پیام را در برنامه فیس بوک مسنجر مشاهده کنید.",
+    "UNSUPPORTED_MESSAGE_INSTAGRAM": "این پیام پشتیبانی نمی شود. می توانید این پیام را در برنامه اینستاگرام مشاهده کنید.",
     "SUCCESS_DELETE_MESSAGE": "پیام با موفقیت حذف شد",
     "FAIL_DELETE_MESSSAGE": "پیام حذف نشد! دوباره امتحان کنید",
     "NO_RESPONSE": "بدون پاسخ",
@@ -69,8 +69,8 @@
         "FRT": "FRT {status}",
         "NRT": "NRT {status}",
         "RT": "RT {status}",
-        "MISSED": "missed",
-        "DUE": "due"
+        "MISSED": "از دست رفته",
+        "DUE": "نقض"
       }
     },
     "RESOLVE_DROPDOWN": {
@@ -92,7 +92,7 @@
       "TITLE": "اولویت",
       "OPTIONS": {
         "NONE": "هیچکدام",
-        "URGENT": "Urgent",
+        "URGENT": "فوری",
         "HIGH": "بالا",
         "MEDIUM": "متوسط",
         "LOW": "پایین"
@@ -116,14 +116,14 @@
         "TOMORROW": "تا فردا",
         "NEXT_WEEK": "تا هفته بعد"
       },
-      "ASSIGN_AGENT": "ایجنت را تعیین کنید",
+      "ASSIGN_AGENT": "اپراتور را تعیین کنید",
       "ASSIGN_LABEL": "برچسب اختصاص دهید",
-      "AGENTS_LOADING": "بارگذاری ایجنت ها...",
+      "AGENTS_LOADING": "بارگذاری اپراتور ها...",
       "ASSIGN_TEAM": "تیم را تعیین کنید",
       "API": {
         "AGENT_ASSIGNMENT": {
           "SUCCESFUL": "شناسه مکالمه %{conversationId} به \"%{agentName}\" اختصاص داده شد",
-          "FAILED": "ایجنت تعیین نشد. لطفا دوباره تلاش کنید."
+          "FAILED": "اپراتور تعیین نشد. لطفا دوباره تلاش کنید."
         },
         "LABEL_ASSIGNMENT": {
           "SUCCESFUL": "برچسب #%{labelName} را به شناسه مکالمه %{conversationId} اختصاص داد",
@@ -247,7 +247,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "اعضای تیم خود را دعوت کنید",
-      "DESCRIPTION": "از آنجا که در حال آماده شدن برای صحبت با مشتری هستید ، می توانید از هم تیمی های خود نیز کمک بگیرید. با افزودن آدرس ایمیل آنها به لیست ایجنت ها، می توانید از هم تیمی های خود دعوت کنید.",
+      "DESCRIPTION": "از آنجا که در حال آماده شدن برای گفتگو با مشتری هستید ، می توانید از هم تیمی های خود نیز کمک بگیرید. با افزودن آدرس ایمیل آنها به لیست اپراتور ها، می توانید از هم تیمی های خود دعوت کنید.",
       "NEW_LINK": "برای دعوت از یکی از اعضای تیم اینجا را کلیک کنید"
     },
     "INBOXES": {
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "ایجاد ویژگی",
+    "NO_RECORDS_FOUND": "هیچ ویژگی یافت نشد",
     "UPDATE": {
       "SUCCESS": "ویژگی با موفقیت به روز شد",
       "ERROR": "امکان به روزرسانی ویژگی وجود ندارد. لطفاً بعداً دوباره امتحان کنید"
diff --git a/app/javascript/dashboard/i18n/locale/fa/csatMgmt.json b/app/javascript/dashboard/i18n/locale/fa/csatMgmt.json
index 265f01995a9c1..f5071bc9dc25c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/csatMgmt.json
@@ -3,11 +3,11 @@
     "TITLE": "به مکالمه خود امتیاز دهید",
     "PLACEHOLDER": "توضیحات بیشتر بدهید...",
     "RATINGS": {
-      "POOR": "😞 Poor",
-      "FAIR": "😑 Fair",
-      "AVERAGE": "😐 Average",
-      "GOOD": "😀 Good",
-      "EXCELLENT": "😍 Excellent"
+      "POOR": "😞 خیلی بد",
+      "FAIR": "😑 بد",
+      "AVERAGE": "😐 معمولی",
+      "GOOD": "😀 خوب",
+      "EXCELLENT": "😍 عالی"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/datePicker.json b/app/javascript/dashboard/i18n/locale/fa/datePicker.json
new file mode 100644
index 0000000000000..e6adf109f95b6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "درخواست دادن",
+    "CLEAR_BUTTON": "پاک کردن",
+    "DATE_RANGE_INPUT": {
+      "START": "تاریخ شروع",
+      "END": "تاریخ پایان"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "محدوده زمانی",
+      "LAST_7_DAYS": "در ۷ روز گذشته",
+      "LAST_30_DAYS": "در ۳۰ روز گذشته",
+      "LAST_3_MONTHS": "۳ ماه گذشته",
+      "LAST_6_MONTHS": "۶ ماه گذشته",
+      "LAST_YEAR": "پارسال",
+      "CUSTOM_RANGE": "محدوده تاریخ سفارشی"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/general.json b/app/javascript/dashboard/i18n/locale/fa/general.json
index 25bb4dfb736d2..3444763b2b9d9 100644
--- a/app/javascript/dashboard/i18n/locale/fa/general.json
+++ b/app/javascript/dashboard/i18n/locale/fa/general.json
@@ -1,5 +1,5 @@
 {
   "GENERAL": {
-    "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items"
+    "SHOWING_RESULTS": "نمایش {firstIndex} تا {lastIndex} از {totalCount} مورد"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 52604e6704db2..7c80079a3fc45 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -50,9 +50,9 @@
     },
     "UPDATE_CHATWOOT": "به روزرسانی%{latestChatwootVersion} برای Chatwoot در دسترس است. لطفا نمونه خود را به روز کنید.",
     "LEARN_MORE": "بیشتر بدانید",
-    "PAYMENT_PENDING": "Your payment is pending. Please update your payment information to continue using Chatwoot",
-    "LIMITS_UPGRADE": "Your account has exceeded the usage limits, please upgrade your plan to continue using Chatwoot",
-    "OPEN_BILLING": "Open billing"
+    "PAYMENT_PENDING": "پرداخت شما در حال پردازش است. لطفاً اطلاعات پرداخت خود را برای ادامه استفاده از Chatwoot به روز کنید",
+    "LIMITS_UPGRADE": "حساب شما از محدودیت های استفاده فراتر رفته است، لطفاً برای ادامه استفاده از Chatwoot برنامه خود را ارتقا دهید",
+    "OPEN_BILLING": "باز کردن صورتحساب"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -88,9 +88,9 @@
       "assigned_conversation_new_message": "پیام جدید",
       "participating_conversation_new_message": "پیام جدید",
       "conversation_mention": "اشاره",
-      "sla_missed_first_response": "SLA Missed",
-      "sla_missed_next_response": "SLA Missed",
-      "sla_missed_resolution": "SLA Missed"
+      "sla_missed_first_response": "SLA های از دست رفته",
+      "sla_missed_next_response": "SLA های از دست رفته",
+      "sla_missed_resolution": "SLA های از دست رفته"
     }
   },
   "NETWORK": {
@@ -107,27 +107,28 @@
       "GENERAL": "عمومی",
       "REPORTS": "گزارشات",
       "CONVERSATION": "گفتگو",
-      "CHANGE_ASSIGNEE": "نماینده را تغییر دهید",
-      "CHANGE_PRIORITY": "Change Priority",
+      "BULK_ACTIONS": "Bulk Actions",
+      "CHANGE_ASSIGNEE": "اپراتور را تغییر دهید",
+      "CHANGE_PRIORITY": "تغییر اولویت",
       "CHANGE_TEAM": "تیم را تغییر دهید",
       "SNOOZE_CONVERSATION": "به تعویق انداختن مکالمه",
       "ADD_LABEL": "برچسب را به مکالمه اضافه کنید",
       "REMOVE_LABEL": "برچسب را از مکالمه حذف کنید",
       "SETTINGS": "تنظیمات",
-      "AI_ASSIST": "AI Assist",
+      "AI_ASSIST": "دستیار هوش مصنوعی",
       "APPEARANCE": "ظاهری",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "SNOOZE_NOTIFICATION": "به تعویق انداختن آگاه‌سازی"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "به داشبورد مکالمه بروید",
       "GO_TO_CONTACTS_DASHBOARD": "به داشبورد مخاطبین بروید",
       "GO_TO_REPORTS_OVERVIEW": "به نمای کلی گزارش ها بروید",
       "GO_TO_CONVERSATION_REPORTS": "به گزارش های گفتگو بروید",
-      "GO_TO_AGENT_REPORTS": "به گزارش های ایجنت بروید",
+      "GO_TO_AGENT_REPORTS": "به گزارش های اپراتور بروید",
       "GO_TO_LABEL_REPORTS": "به گزارش برچسب بروید",
       "GO_TO_INBOX_REPORTS": "به گزارش صندوق ورودی بروید",
       "GO_TO_TEAM_REPORTS": "به گزارش تیم بروید",
-      "GO_TO_SETTINGS_AGENTS": "به تنظیمات ایجنت بروید",
+      "GO_TO_SETTINGS_AGENTS": "به تنظیمات اپراتور بروید",
       "GO_TO_SETTINGS_TEAMS": "به تنظیمات تیم بروید",
       "GO_TO_SETTINGS_INBOXES": "به تنظیمات صندوق ورودی بروید",
       "GO_TO_SETTINGS_LABELS": "به تنظیمات برچسب بروید",
@@ -137,8 +138,8 @@
       "GO_TO_SETTINGS_PROFILE": "به تنظیمات پروفایل بروید",
       "GO_TO_NOTIFICATIONS": "به اعلان ها بروید",
       "ADD_LABELS_TO_CONVERSATION": "برچسب را به مکالمه اضافه کنید",
-      "ASSIGN_AN_AGENT": "یک ایجنت تعیین کنید",
-      "AI_ASSIST": "AI Assist",
+      "ASSIGN_AN_AGENT": "یک اپراتور تعیین کنید",
+      "AI_ASSIST": "دستیار هوش مصنوعی",
       "ASSIGN_PRIORITY": "انتساب اولویت",
       "ASSIGN_A_TEAM": "یک تیم را تعیین کنید",
       "MUTE_CONVERSATION": "صدای گفتگو را قطع کن",
@@ -158,7 +159,7 @@
       "LIGHT_MODE": "روشن",
       "DARK_MODE": "تیره",
       "SYSTEM_MODE": "سیستم",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "SNOOZE_NOTIFICATION": "به تعویق انداختن آگاه‌سازی"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
index c5f5b1e372349..813520351cd48 100644
--- a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
@@ -18,10 +18,10 @@
         "ARCHIVED": "مقالات آرشیو شده"
       },
       "LOCALE_SELECT": {
-        "TITLE": "Select locale",
-        "PLACEHOLDER": "Select locale",
-        "NO_RESULT": "No locale found",
-        "SEARCH_PLACEHOLDER": "Search locale"
+        "TITLE": "انتخاب زبان",
+        "PLACEHOLDER": "انتخاب زبان",
+        "NO_RESULT": "هیچ زبانی یافت نشد",
+        "SEARCH_PLACEHOLDER": "جستجوی زبان"
       }
     },
     "EDIT_HEADER": {
@@ -82,15 +82,15 @@
       }
     },
     "ARTICLE_SEARCH_RESULT": {
-      "UNCATEGORIZED": "Uncategorized",
-      "SEARCH_RESULTS": "Search results for %{query}",
-      "EMPTY_TEXT": "Search for articles to insert into replies.",
+      "UNCATEGORIZED": "دسته بندی نشده",
+      "SEARCH_RESULTS": "جستجو بر اساس %{query}",
+      "EMPTY_TEXT": "جستجو در مقالات برای درج در پاسخ.",
       "SEARCH_LOADER": "در حال جستجو...",
-      "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"
+      "INSERT_ARTICLE": "درج",
+      "NO_RESULT": "هیچ مقاله ای یافت نشد",
+      "COPY_LINK": "کپی آدرس مقاله در کلیپ برد",
+      "OPEN_LINK": "باز کردن مقاله در صفحه جدید",
+      "PREVIEW_LINK": "پیش نمایش مقاله"
     },
     "PORTAL": {
       "HEADER": "پورتال ها",
@@ -231,9 +231,9 @@
           "LABEL": "آرم",
           "UPLOAD_BUTTON": "بارگذاری آرم",
           "HELP_TEXT": "این لوگو در هدر پورتال نمایش داده می شود.",
-          "IMAGE_UPLOAD_SUCCESS": "Logo uploaded successfully",
-          "IMAGE_UPLOAD_ERROR": "Logo deleted successfully",
-          "IMAGE_DELETE_ERROR": "Error while deleting logo"
+          "IMAGE_UPLOAD_SUCCESS": "تصویر با موفقیت آپلود شد",
+          "IMAGE_UPLOAD_ERROR": "تصویر با موفقیت حذف شد",
+          "IMAGE_DELETE_ERROR": "خطا هنگام حذف تصویر"
         },
         "NAME": {
           "LABEL": "نام",
@@ -325,7 +325,7 @@
       },
       "COLUMNS": {
         "BY": "توسط",
-        "AUTHOR_NOT_AVAILABLE": "Author is not available"
+        "AUTHOR_NOT_AVAILABLE": "نویسنده در دسترس نیست"
       }
     },
     "EDIT_ARTICLE": {
@@ -379,7 +379,7 @@
         "NAME": {
           "LABEL": "نام",
           "PLACEHOLDER": "نام دسته‌بندی",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "از نام و نماد دسته بندی در پرتال عمومی برای دسته بندی مقالات استفاده می شود.",
           "ERROR": "نام الزامی است"
         },
         "SLUG": {
@@ -410,7 +410,7 @@
         "NAME": {
           "LABEL": "نام",
           "PLACEHOLDER": "نام دسته‌بندی",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "از نام و نماد دسته بندی در پرتال عمومی برای دسته بندی مقالات استفاده می شود.",
           "ERROR": "نام الزامی است"
         },
         "SLUG": {
@@ -441,44 +441,44 @@
       }
     },
     "ARTICLE_SEARCH": {
-      "TITLE": "Search articles",
-      "PLACEHOLDER": "Search articles",
-      "NO_RESULT": "No articles found",
+      "TITLE": "جستجو مقالات",
+      "PLACEHOLDER": "جستجو مقالات",
+      "NO_RESULT": "هیچ مقاله ای یافت نشد",
       "SEARCHING": "در حال جستجو...",
       "SEARCH_BUTTON": "جستجو",
-      "INSERT_ARTICLE": "Insert link",
-      "IFRAME_ERROR": "URL is empty or invalid. Unable to display content.",
-      "OPEN_ARTICLE_SEARCH": "Insert article from Help Center",
-      "SUCCESS_ARTICLE_INSERTED": "Article inserted successfully",
-      "PREVIEW_LINK": "Preview article",
+      "INSERT_ARTICLE": "درج آدرس",
+      "IFRAME_ERROR": "آدرس URL خالی یا نامعتبر است. امکان نمایش محتوا وجود ندارد.",
+      "OPEN_ARTICLE_SEARCH": "درج مقاله از مرکز راهنما",
+      "SUCCESS_ARTICLE_INSERTED": "مقاله با موفقیت درج شد",
+      "PREVIEW_LINK": "پیش نمایش مقاله",
       "CANCEL": "بستن",
       "BACK": "بازگشت",
-      "BACK_RESULTS": "Back to results"
+      "BACK_RESULTS": "بازگشت به نتایج"
     },
     "UPGRADE_PAGE": {
       "TITLE": "مرکز راهنما",
-      "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
-      "SELF_HOSTED_DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Please contact your administrator to enable this feature.",
+      "DESCRIPTION": "پورتال های سلف سرویس کاربر پسند ایجاد کنید. به کاربران خود کمک کنید تا به مقالات دسترسی پیدا کنند و پشتیبانی دریافت کنند.",
+      "SELF_HOSTED_DESCRIPTION": "پورتال های سلف سرویس کاربر پسند ایجاد کنید. به کاربران خود کمک کنید تا به مقالات دسترسی پیدا کنند و پشتیبانی دریافت کنند. لطفا با ادمین برای فعال سازی این قابلیت تماس بگیرید.",
       "BUTTON": {
         "LEARN_MORE": "بیشتر بدانید",
-        "UPGRADE": "Upgrade"
+        "UPGRADE": "ارتقا"
       },
       "FEATURES": {
         "PORTALS": {
-          "TITLE": "Multiple portals",
-          "DESCRIPTION": "Create multiple help center portals for different products using the same account."
+          "TITLE": "چندین پرتال",
+          "DESCRIPTION": "با استفاده از یک حساب، چندین پورتال مرکز راهنمایی برای محصولات مختلف ایجاد کنید."
         },
         "LOCALES": {
-          "TITLE": "Full support for locales",
-          "DESCRIPTION": "Localize the portal in your language. We support all locales and allow translations for every article."
+          "TITLE": "پشتیبانی کامل از چند زبانه",
+          "DESCRIPTION": "پورتال را به زبان خود بومی سازی کنید. ما از همه زبان‌ها پشتیبانی می‌کنیم و اجازه ترجمه برای هر مقاله را می‌دهیم."
         },
         "SEO": {
-          "TITLE": "SEO-friendly design",
-          "DESCRIPTION": "Customize your meta tags to improve your visibility on search engines with our SEO-friendly pages."
+          "TITLE": "طراحی مناسب SEO",
+          "DESCRIPTION": "متا تگ های خود را سفارشی کنید تا بهتر در موتورهای جستجو دیده شوید."
         },
         "API": {
-          "TITLE": "Full API support",
-          "DESCRIPTION": "Use the portal as a headless CMS with third party front-end frameworks using our APIs."
+          "TITLE": "پشتیبانی کامل از API",
+          "DESCRIPTION": "از پرتال به عنوان یک CMS می توانید استفاده کنید که از طریق Front آدرس های API را فراخوانی می کنید."
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/fa/inbox.json b/app/javascript/dashboard/i18n/locale/fa/inbox.json
index aa58c98cd70ca..92ae0ec3ce3d3 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inbox.json
@@ -2,12 +2,12 @@
   "INBOX": {
     "LIST": {
       "TITLE": "صندوق ورودی",
-      "DISPLAY_DROPDOWN": "Display",
-      "LOADING": "Fetching notifications",
-      "404": "There are no active notifications in this group.",
-      "NO_NOTIFICATIONS": "No notifications",
+      "DISPLAY_DROPDOWN": "نمایش",
+      "LOADING": "در حال بارگیری اعلان ها",
+      "404": "هیچ اعلان فعالی در این گروه نیست.",
+      "NO_NOTIFICATIONS": "اعلانی وجود ندارد",
       "NOTE": "آگاه‌سازی‌ها از همه صندوق‌های ورودی مشترک",
-      "NO_MESSAGES_AVAILABLE": "Oops! Not able to fetch messages",
+      "NO_MESSAGES_AVAILABLE": "اوه! قادر به دریافت پیام ها نیستم",
       "SNOOZED_UNTIL": "به تعویق افتاده تا",
       "SNOOZED_UNTIL_TOMORROW": "تا فردا به تعویق افتاد",
       "SNOOZED_UNTIL_NEXT_WEEK": "تا هفته آینده به تعویق افتاد"
@@ -18,47 +18,47 @@
       "BACK": "بازگشت"
     },
     "TYPES": {
-      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
-      "CONVERSATION_CREATION": "New conversation created",
-      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
-      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
-      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in",
-      "SLA_MISSED_FIRST_RESPONSE": "SLA target first response missed for conversation",
-      "SLA_MISSED_NEXT_RESPONSE": "SLA target next response missed for conversation",
-      "SLA_MISSED_RESOLUTION": "SLA target resolution missed for conversation"
+      "CONVERSATION_MENTION": "به نام شما در یک گفتگو اشاره شده است",
+      "CONVERSATION_CREATION": "گفتگو ایجاد شد",
+      "CONVERSATION_ASSIGNMENT": "یک گفتگو به شما اختصاص داده شده",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "پیام جدید در یک گفتگوی اختصاص داده شده",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "پیام جدید در گفتگویی که در آن شرکت داشته اید",
+      "SLA_MISSED_FIRST_RESPONSE": "سیاست SLA مربوط به اولین پاسخ در گفتگوی نقض شده",
+      "SLA_MISSED_NEXT_RESPONSE": "سیاست SLA مربوط به پاسخ بعدی در گفتگوی نقض شده",
+      "SLA_MISSED_RESOLUTION": "سیاست SLA مربوط به زمان حل موضوع در گفتگوی نقض شده"
     },
     "MENU_ITEM": {
-      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_READ": "ثبت به عنوان خوانده شده",
       "MARK_AS_UNREAD": "علامت گذاری به عنوان خوانده نشده",
       "SNOOZE": "به تعویق انداختن",
       "DELETE": "حذف",
       "MARK_ALL_READ": "همه را به عنوان خوانده شده علامت بزن",
-      "DELETE_ALL": "Delete all",
-      "DELETE_ALL_READ": "Delete all read"
+      "DELETE_ALL": "حذف همه",
+      "DELETE_ALL_READ": "حذف همه خوانده شده"
     },
     "DISPLAY_MENU": {
-      "SORT": "Sort",
-      "DISPLAY": "Display :",
+      "SORT": "ترتیب",
+      "DISPLAY": "نمایش :",
       "SORT_OPTIONS": {
-        "NEWEST": "Newest",
-        "OLDEST": "Oldest",
+        "NEWEST": "جدیدترین",
+        "OLDEST": "قدیمی ترین",
         "PRIORITY": "اولویت"
       },
       "DISPLAY_OPTIONS": {
         "SNOOZED": "به تعویق افتاد",
         "READ": "خوانده شده",
         "LABELS": "برچسب‌ها",
-        "CONVERSATION_ID": "Conversation ID"
+        "CONVERSATION_ID": "شناسه گفتگو"
       }
     },
     "ALERTS": {
-      "MARK_AS_READ": "Notification marked as read",
-      "MARK_AS_UNREAD": "Notification marked as unread",
-      "SNOOZE": "Notification snoozed",
-      "DELETE": "Notification deleted",
-      "MARK_ALL_READ": "All notifications marked as read",
-      "DELETE_ALL": "All notifications deleted",
-      "DELETE_ALL_READ": "All read notifications deleted"
+      "MARK_AS_READ": "ثبت اعلان به عنوان خوانده شده",
+      "MARK_AS_UNREAD": "ثبت اعلان به عنوان خوانده نشده",
+      "SNOOZE": "اعلان به تعویق افتاده",
+      "DELETE": "اعلان حدف شده",
+      "MARK_ALL_READ": "ثبت همه اعلان ها به عنوان خوانده شده",
+      "DELETE_ALL": "حذف همه اعلان ها",
+      "DELETE_ALL_READ": "حذف همه اعلان های خوانده شده"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index ddc3a1c3814a6..2184c10f82a16 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "ایجنت ها را به صندوق ورودی ساخته شده تخصیص می‌دهد."
       },
       {
-        "title": "ماشالله!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "دیگه می‌تونی بترکونی"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "از لیست صفحه مورد نظر را انتخاب کنید",
         "INBOX_NAME": "عنوان صندوق ورودی",
         "ADD_NAME": "یک اسم به صندوق ورودی خود اضافه کنید",
-        "PICK_NAME": "یک اسم برای صندوق ورودی خود انتخاب کنید",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "یک مقدار انتخاب کنید"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "آدرس URL وب هوک",
-          "PLACEHOLDER": "نشانی وب Webhook خود را وارد کنید",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "لطفا آدرس URL صحیحی وارد کنید"
         },
         "CHANNEL_DOMAIN": {
@@ -112,14 +112,14 @@
           "ERROR": "پر کردن این فیلد ضروری است"
         },
         "API_KEY": {
-          "USE_API_KEY": "Use API Key Authentication",
+          "USE_API_KEY": "استفاده از API Key Authentication",
           "LABEL": "API Key SID",
-          "PLACEHOLDER": "Please enter your API Key SID",
+          "PLACEHOLDER": "لطفا API Key SID را وارد کنید",
           "ERROR": "پر کردن این فیلد ضروری است"
         },
         "API_KEY_SECRET": {
           "LABEL": "API Key Secret",
-          "PLACEHOLDER": "Please enter your API Key Secret",
+          "PLACEHOLDER": "لطفا API Key Secret را وارد کنید",
           "ERROR": "پر کردن این فیلد ضروری است"
         },
         "MESSAGING_SERVICE_SID": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API key",
-            "PLACEHOLDER": "لطفاً کلید Bandwith API خود را وارد کنید",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "پر کردن این فیلد ضروری است"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "لطفا Bandwith API Secret خود را وارد کنید",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "پر کردن این فیلد ضروری است"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "رمز تأیید وب هوک",
-          "PLACEHOLDER": "یک رمز تأیید را وارد کنید که می خواهید برای وب هوک های فیس بوک پیکربندی کنید.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "لطفا یک مقدار معتبر وارد کنید."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "آدرس URL وب هوک",
-          "SUBTITLE": "آدرس کال بک خود را جهت دریافت اطلاعات رویداد های وارد کنید.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "آدرس URL وب هوک"
         },
         "SUBMIT_BUTTON": "ایجاد کانال API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "کانال ایمیل",
-        "DESC": "صندوق ورودی ایمیل خود را ادغام کنید.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "عنوان کانال",
           "PLACEHOLDER": "لطفا اسم یک کانال را وارد کنید",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "ایجنت ها",
         "DESC": "در اینجا می‌توانید ایجنت ها را به صندوق‌ ورودی خود اختصاص دهید. توجه داشته باشید که فقط ایجنت هایی که در اینجا معرفی شده باشند می‌توانند به پیام‌های این صندوق پاسخ بدهند. دیگر ایجنت ها نخواهند توانست پیام‌های این صندوق را ببینید یا به آن‌ها پاسخی بدهند. <br> <b>پانویس:</b>به عنوان مدیر اگر می‌خواهید به همه صندوق‌های ورودی دسترسی داشته باشید می‌بایست خود را به عنوان ایجنت به همه صندوق‌ها اضافه کنید.",
-        "VALIDATION_ERROR": "حداقل یک ایجنت به اینباکس جدید اضافه کنید",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "انتخاب ایجنت ها برای این صندوق ورودی"
       },
       "DETAILS": {
@@ -371,8 +371,8 @@
     "DETAILS": {
       "LOADING_FB": "در حال احراز هویت با فیس بوک...",
       "ERROR_FB_AUTH": "اشکالی پیش آمد.. لطفا دوباره سعی کنید...",
-      "ERROR_FB_UNAUTHORIZED": "You're not authorized to perform this action. ",
-      "ERROR_FB_UNAUTHORIZED_HELP": "Please ensure you have access to the Facebook page with full control. You can read more about Facebook roles <a href=\" https://www.facebook.com/help/187316341316631\">here</a>.",
+      "ERROR_FB_UNAUTHORIZED": "شما اجازه انجام این کار را ندارید. ",
+      "ERROR_FB_UNAUTHORIZED_HELP": "لطفا مطمئن شوید که با کنترل کامل به صفحه فیس بوک دسترسی دارید. اینجا می‌توانید درباره نقش‌های فیسبوک بیشتر بخوانید <a href=\" https://www.facebook.com/help/187316341316631\">راهنما</a>.",
       "CREATING_CHANNEL": "در حال ساخت صندوق ورودی...",
       "TITLE": "تنظیمات صفحه ورودی",
       "DESC": ""
@@ -406,19 +406,19 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "نام ارسال کننده",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
-        "FOR_EG": "For eg:",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
+        "FOR_EG": "به عنوان مثال:",
         "FRIENDLY": {
           "TITLE": "دوستانه",
           "FROM": "از",
-          "SUBTITLE": "Add the name of the agent who sent the reply in the sender name to make it friendly."
+          "SUBTITLE": "نام اپراتوری که پاسخ را ارسال کرده است را به نام فرستنده اضافه کنید تا پیام دوستانه تر شود."
         },
         "PROFESSIONAL": {
           "TITLE": "حرفه ای",
-          "SUBTITLE": "Use only the configured business name as the sender name in the email header."
+          "SUBTITLE": "فقط از نام تجاری پیکربندی شده به عنوان نام فرستنده در هدر ایمیل استفاده کنید."
         },
         "BUSINESS_NAME": {
-          "BUTTON_TEXT": "+ Configure your business name",
+          "BUTTON_TEXT": "+ نام کسب و کار خود را وارد کنید",
           "PLACEHOLDER": "نام کسب و کار خود را وارد کنید",
           "SAVE_BUTTON_TEXT": "ذخیره"
         }
@@ -479,8 +479,8 @@
       "MESSENGER_SUB_HEAD": "این دکمه را در تگ body قرار دهید",
       "INBOX_AGENTS": "ایجنت ها",
       "INBOX_AGENTS_SUB_TEXT": "اضافه کردن یا حذف کردن دسترسی ایجنت به صندوق ورودی",
-      "AGENT_ASSIGNMENT": "واگذاری مکالمه",
-      "AGENT_ASSIGNMENT_SUB_TEXT": "تنظیمات واگذاری مکالمه را به روز کنید",
+      "AGENT_ASSIGNMENT": "اختصاص گفتگو",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "بروز رسانی تنظیمات اختصاص گفتگو",
       "UPDATE": "اعمال شود",
       "ENABLE_EMAIL_COLLECT_BOX": "فعال سازی فرم دریافت ایمیل از کاربر",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "فعال یا غیرفعال کردن فرم دریافت ایمیل از کاربر",
@@ -488,7 +488,7 @@
       "ENABLE_CSAT": "فعال کردن رضایت مشتری",
       "SENDER_NAME_SECTION": "فعال سازی نام اپراتور در ایمیل",
       "ENABLE_CSAT_SUB_TEXT": "پس از پایان گفتگو ، نظرسنجی CSAT (رضایت مشتری) را فعال/غیرفعال کنید",
-      "SENDER_NAME_SECTION_TEXT": "Enable/Disable showing Agent's name in email, if disabled it will show business name",
+      "SENDER_NAME_SECTION_TEXT": "فعال/غیرفعال کردن نمایش نام اپراتور در ایمیل، اگر غیرفعال باشد نام کسب و کار نشان داده می شود",
       "ENABLE_CONTINUITY_VIA_EMAIL": "ادامه مکالمه را از طریق ایمیل فعال کنید",
       "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "اگر آدرس ایمیل تماس در دسترس باشد، مکالمات از طریق ایمیل ادامه خواهد یافت.",
       "LOCK_TO_SINGLE_CONVERSATION": "قفل کردن مکالمه تکی",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "اجازه دادن به پیام ها پس از حل شدن مکالمه",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "به کاربران اجازه دهید حتی پس از حل شدن مکالمه پیام ارسال کنند.",
       "WHATSAPP_SECTION_SUBHEADER": "این کلید API برای ادغام با API های WhatsApp استفاده می شود.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "کلید به روز شده را وارد کنید تا از آن برای ادغام با واتساپ API استفاده شود.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "کلید API را به روز کنید",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "کلید API جدید را در اینجا وارد کنید",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "اعمال شود",
-      "WHATSAPP_WEBHOOK_TITLE": "رمز تأیید وب هوک",
+      "WHATSAPP_WEBHOOK_TITLE": "توکن تایید Webhook",
       "WHATSAPP_WEBHOOK_SUBHEADER": "این توکن برای تأیید صحت نقطه پایانی webhook استفاده می شود.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "به‌روزرسانی تنظیمات فرم قبل از گفتگو"
     },
@@ -527,7 +527,7 @@
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "محدودیت تخصیص خودکار",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "لطفا مقداری بزرگ‌تر از عدد 0 وارد کنید",
-      "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "حداکثر تعداد مکالماتی را که می توان به طور خودکار به یک نماینده اختصاص داد، از این صندوق ورودی محدود کنید"
+      "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "حداکثر تعداد مکالماتی را که می توان به طور خودکار به یک اپراتور اختصاص داد، از این صندوق ورودی محدود کنید"
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "احراز هویت مجدد",
@@ -569,7 +569,7 @@
       "UPDATE": "تنظیمات ساعات کاری را به روز کنید",
       "TOGGLE_AVAILABILITY": "دسترس بودن کسب و کار را برای این صندوق فعال کردن",
       "UNAVAILABLE_MESSAGE_LABEL": "پیامی برای بازدیدکنندگان در دسترس نیست",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "فعال کردن در دسترس بودن کسب کار ، ساعات موجود در ویجت چت زنده را نشان می دهد حتی اگر همه اپراتور ها آفلاین باشند. خارج از ساعات موجود می توان با پیام و فرم قبل از چت ، به کاربران هشدار داد.",
       "DAY": {
         "ENABLE": "در دسترس بودن را برای این روز فعال کنید",
         "UNAVAILABLE": "غیر قابل دسترسی",
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "برای فعال کردن SMTP، لطفا IMAP را پیکربندی کنید.",
       "UPDATE": "به‌روزرسانی تنظیمات IMAP",
       "TOGGLE_AVAILABILITY": "پیکربندی IMAP را برای این صندوق ورودی فعال کنید",
-      "TOGGLE_HELP": "در حال فعال کردن IMAP به کاربر در دریافت ایمیل کمک می‌کند",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "تنظیمات IMAP با موفقیت به‌روزرسانی شد",
         "ERROR_MESSAGE": "به‌روزرسانی تنظیمات IMAP ممکن نیست"
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 9d2a1e788d4ac..e7e92b2f3455b 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -81,12 +81,12 @@
       "HELP_TEXT": {
         "TITLE": "استفاده از اسلک",
         "BODY": "<br/> <p> ما اکنون تمام مکالمات ورودی را در کانال <b><i> گفتگوهای مشتری </i> </b> داخل محل کار شما همگام سازی می کنیم. </p> <p> پاسخ به یک رشته مکالمه در کانال مکالمه <b><i> مشتری- مکالمات </ i> </b> از طریق برنامه پاسخی به مشتری ایجاد می کند. </ p> <p> پاسخ ها را با <b> <i> شروع کنید توجه: </i> </b> برای ایجاد یادداشت های خصوصی به جای پاسخ ها. </p> <p> اگر پاسخ دهنده در slack نمایه نماینده ای در برنامه تحت همان ایمیل داشته باشد ، پاسخ ها به همین ترتیب مرتبط می شوند. </ p> <p> وقتی ارسال کننده نمایه نماینده مرتبطی ندارد ، پاسخها از نمایه ربات انجام می شود. </p>",
-        "SELECTED": "selected"
+        "SELECTED": "انتخاب شد"
       },
       "SELECT_CHANNEL": {
-        "OPTION_LABEL": "Select a channel",
+        "OPTION_LABEL": "یک کانال انتخاب کنید",
         "UPDATE": "اعمال شود",
-        "BUTTON_TEXT": "Connect channel",
+        "BUTTON_TEXT": "اتصال کانال",
         "DESCRIPTION": "Your Slack workspace is now linked with Chatwoot. However, the integration is currently inactive. To activate the integration and connect a channel to Chatwoot, please click the button below.\n\n**Note:** If you are attempting to connect a private channel, add the Chatwoot app to the Slack channel before proceeding with this step.",
         "ATTENTION_REQUIRED": "Attention required",
         "EXPIRED": "Your Slack integration has expired. To continue receiving messages on Slack, please delete the integration and connect your workspace again."
@@ -103,10 +103,10 @@
       "CREATE_ERROR": "در ایجاد پیوند جلسه خطایی روی داد، لطفاً دوباره امتحان کنید"
     },
     "OPEN_AI": {
-      "AI_ASSIST": "AI Assist",
+      "AI_ASSIST": "دستیار هوش مصنوعی",
       "WITH_AI": " %{option} with AI ",
       "OPTIONS": {
-        "REPLY_SUGGESTION": "Reply Suggestion",
+        "REPLY_SUGGESTION": "پیشنهاد پاسخ",
         "SUMMARIZE": "Summarize",
         "REPHRASE": "Improve Writing",
         "FIX_SPELLING_GRAMMAR": "Fix Spelling and Grammar",
@@ -144,13 +144,13 @@
       "TONE": {
         "TITLE": "Tone",
         "OPTIONS": {
-          "PROFESSIONAL": "Professional",
+          "PROFESSIONAL": "حرفه‌ای",
           "FRIENDLY": "دوستانه"
         }
       },
       "BUTTONS": {
-        "GENERATE": "Generate",
-        "GENERATING": "Generating...",
+        "GENERATE": "تولید",
+        "GENERATING": "در حال تولید...",
         "CANCEL": "انصراف"
       },
       "GENERATE_ERROR": "There was an error processing the content, please try again"
diff --git a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
index 2230e35bc8296..115d66adf35bc 100644
--- a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
@@ -40,16 +40,16 @@
     },
     "SUGGESTIONS": {
       "TOOLTIP": {
-        "SINGLE_SUGGESTION": "Add label to conversation",
-        "MULTIPLE_SUGGESTION": "Select this label",
-        "DESELECT": "Deselect label",
-        "DISMISS": "Dismiss suggestion"
+        "SINGLE_SUGGESTION": "اضافه کردن برچسب به گفتگو",
+        "MULTIPLE_SUGGESTION": "انتخاب این برچسب",
+        "DESELECT": "برچسب را از حالت انتخاب خارج کن",
+        "DISMISS": "بستن پیشنهاد ها"
       },
       "POWERED_BY": "Chatwoot AI",
       "DISMISS": "نادیده بگیر",
-      "ADD_SELECTED_LABELS": "Add selected labels",
-      "ADD_SELECTED_LABEL": "Add selected label",
-      "ADD_ALL_LABELS": "Add all labels"
+      "ADD_SELECTED_LABELS": "اضافه کردن برچسب‌های انتخاب شده",
+      "ADD_SELECTED_LABEL": "اضافه کردن برچسب‌ انتخاب شده",
+      "ADD_ALL_LABELS": "اضافه کردن همه برچسب ها"
     },
     "ADD": {
       "TITLE": "افزودن برچسب",
diff --git a/app/javascript/dashboard/i18n/locale/fa/report.json b/app/javascript/dashboard/i18n/locale/fa/report.json
index 63f978af32bf4..08dec12509b11 100644
--- a/app/javascript/dashboard/i18n/locale/fa/report.json
+++ b/app/javascript/dashboard/i18n/locale/fa/report.json
@@ -4,8 +4,8 @@
     "LOADING_CHART": "در حال دریافت اطلاعات...",
     "NO_ENOUGH_DATA": "متاسفانه اطلاعات کافی دریافت نشد، لطفا بعدا دوباره امتحان کنید",
     "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.",
+    "DATA_FETCHING_FAILED": "خطا در دریافت اطلاعات، لطفا بعدا دوباره تلاش کنید.",
+    "SUMMARY_FETCHING_FAILED": "خطا در دریافت خلاصه، لطفا بعدا دوباره تلاش کنید.",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "گفتگوها",
@@ -40,12 +40,12 @@
         "DESC": "( جمع کل )"
       },
       "BOT_HANDOFF_COUNT": {
-        "NAME": "Handoff Count",
+        "NAME": "تعداد پاسخ های رباتی",
         "DESC": "( جمع کل )"
       },
       "REPLY_TIME": {
-        "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
+        "NAME": "زمان انتظار مشتری",
+        "TOOLTIP_TEXT": "زمان انتظار %{metricValue} (بر اساس %{conversationCount} پاسخ)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -140,12 +140,12 @@
     ],
     "BUSINESS_HOURS": "ساعت کاری",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "پاک کردن فیلتر",
       "EMPTY_LIST": "نتیجه‌ای یافت نشد"
     }
   },
   "AGENT_REPORTS": {
-    "HEADER": "نمای کلی ایجنت ها",
+    "HEADER": "نمای کلی اپراتور ها",
     "LOADING_CHART": "در حال دریافت اطلاعات...",
     "NO_ENOUGH_DATA": "متاسفانه اطلاعات کافی دریافت نشد، لطفا بعدا دوباره امتحان کنید",
     "DOWNLOAD_AGENT_REPORTS": "دانلود گزارش ایجنت",
@@ -416,10 +416,10 @@
     "HEADER": "گزارشات رضایت مشتری",
     "NO_RECORDS": "هیچ پاسخ برای نظرسنجی رضایت مشتری در دسترس نیست.",
     "DOWNLOAD": "دانلود گزارش CSAT",
-    "DOWNLOAD_FAILED": "Failed to download CSAT Reports",
+    "DOWNLOAD_FAILED": "خطا در دانلود گزارش های CSAT",
     "FILTERS": {
       "AGENTS": {
-        "PLACEHOLDER": "ایجنت را انتخاب کنید"
+        "PLACEHOLDER": "اپراتور را انتخاب کنید"
       }
     },
     "TABLE": {
@@ -449,20 +449,20 @@
     "HEADER": "گزارش‌های ربات",
     "METRIC": {
       "TOTAL_CONVERSATIONS": {
-        "LABEL": "No. of Conversations",
-        "TOOLTIP": "Total number of conversations handled by the bot"
+        "LABEL": "تعداد گفتگوها",
+        "TOOLTIP": "تعداد کل گفتگوهای رسیدگی شده توسط ربات"
       },
       "TOTAL_RESPONSES": {
-        "LABEL": "Total Responses",
-        "TOOLTIP": "Total number of responses sent by the bot"
+        "LABEL": "مجموع پاسخ ها",
+        "TOOLTIP": "تعداد کل پاسخ های ارسال شده توسط ربات"
       },
       "RESOLUTION_RATE": {
-        "LABEL": "Resolution Rate",
-        "TOOLTIP": "Total number of conversations resolved by the bot / Total number of conversations handled by the bot * 100"
+        "LABEL": "نرخ حل شدن مساله",
+        "TOOLTIP": "تعداد کل گفتگوهای حل شده توسط ربات / تعداد کل گفتگو های رسیدگی شده توسط ربات * ۱۰۰"
       },
       "HANDOFF_RATE": {
-        "LABEL": "Handoff Rate",
-        "TOOLTIP": "Total number of conversations handed off to agents / Total number of conversations handled by the bot * 100"
+        "LABEL": "نرخ پاسخ ربات",
+        "TOOLTIP": "تعداد کل گفتگوهایی که به اپراتور ها اختصاص داده شده / تعداد کل گفتگوهایی که توسط ربات رسیدگی شده * ۱۰۰"
       }
     }
   },
@@ -484,9 +484,9 @@
       "CONVERSATIONS": "%{count} گفتگو"
     },
     "AGENT_CONVERSATIONS": {
-      "HEADER": "گفتگوهای ایجنت ها",
-      "LOADING_MESSAGE": "در حال بارگیری معیارهای ایجنت...",
-      "NO_AGENTS": "هیچ مکالمه ای توسط ایجنت ها وجود ندارد",
+      "HEADER": "گفتگوهای اپراتور ها",
+      "LOADING_MESSAGE": "در حال بارگیری معیارهای اپراتور...",
+      "NO_AGENTS": "هیچ مکالمه ای توسط اپراتور ها وجود ندارد",
       "TABLE_HEADER": {
         "AGENT": "ایجنت",
         "OPEN": "باز",
@@ -495,7 +495,7 @@
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "وضعیت ایجنت",
+      "HEADER": "وضعیت اپراتور",
       "ONLINE": "آنلاین",
       "BUSY": "مشغول",
       "OFFLINE": "آفلاین"
@@ -511,26 +511,26 @@
     "SATURDAY": "شنبه"
   },
   "SLA_REPORTS": {
-    "HEADER": "SLA Reports",
-    "NO_RECORDS": "SLA applied conversations are not available.",
-    "LOADING": "Loading SLA data...",
-    "DOWNLOAD_SLA_REPORTS": "Download SLA reports",
-    "DOWNLOAD_FAILED": "Failed to download SLA Reports",
+    "HEADER": "گزارش‌های SLA",
+    "NO_RECORDS": "گفتگویی که SLA در آن اعمال شده باشد در دسترس نیست.",
+    "LOADING": "در حال دریافت اطلاعات SLA...",
+    "DOWNLOAD_SLA_REPORTS": "دانلود گزارش SLA",
+    "DOWNLOAD_FAILED": "خطا در دانلود گزارش های SLA",
     "DROPDOWN": {
       "ADD_FIlTER": "افزودن فیلتر",
-      "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_ALL": "حذف همه",
+      "CLEAR_FILTER": "پاک کردن فیلتر",
       "EMPTY_LIST": "نتیجه‌ای یافت نشد",
-      "NO_FILTER": "No filters available",
-      "SEARCH": "Search filter",
+      "NO_FILTER": "هیچ فیلتری موجود نیست",
+      "SEARCH": "فیلتر جستجو",
       "INPUT_PLACEHOLDER": {
-        "SLA": "SLA name",
+        "SLA": "نام SLA",
         "AGENTS": "اسم ایجنت",
         "INBOXES": "نام صندوق ورودی",
         "LABELS": "نام برچسب",
         "TEAMS": "نام تیم"
       },
-      "SLA": "SLA Policy",
+      "SLA": "سیاست SLA",
       "INBOXES": "صندوق ورودی",
       "AGENTS": "ایجنت",
       "LABELS": "برچسب",
@@ -538,25 +538,25 @@
     },
     "METRICS": {
       "HIT_RATE": {
-        "LABEL": "Hit Rate",
-        "TOOLTIP": "Percentage of SLAs created were completed successfully"
+        "LABEL": "نرخ برخورد",
+        "TOOLTIP": "درصد SLA های ایجاد شده که با موفقیت رعایت شده"
       },
       "NO_OF_MISSES": {
-        "LABEL": "Number of Misses",
-        "TOOLTIP": "Total SLA misses in a certain period"
+        "LABEL": "تعداد از دست رفته",
+        "TOOLTIP": "تعداد SLA های نقض شده در یک بازه زمانی"
       },
       "NO_OF_CONVERSATIONS": {
-        "LABEL": "Number of Conversations",
-        "TOOLTIP": "Total number of conversations with SLA"
+        "LABEL": "تعداد گفتگوها",
+        "TOOLTIP": "تعداد گفتگوهای مطابق با SLA"
       }
     },
     "TABLE": {
       "HEADER": {
-        "POLICY": "Policy",
+        "POLICY": "سیاست",
         "CONVERSATION": "گفتگو",
         "AGENT": "ایجنت"
       },
-      "VIEW_DETAILS": "View Details"
+      "VIEW_DETAILS": "مشاهده جزئیات"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/resetPassword.json b/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
index c2af536c9e8d3..703ff1d97c87d 100644
--- a/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
@@ -1,8 +1,8 @@
 {
   "RESET_PASSWORD": {
     "TITLE": "تغییر رمز عبور",
-    "DESCRIPTION": "Enter the email address you use to log in to Chatwoot to get the password reset instructions.",
-    "GO_BACK_TO_LOGIN": "If you want to go back to the login page,",
+    "DESCRIPTION": "آدرس ایمیلی را که برای ورود به Chatwoot استفاده می‌کنید وارد کنید تا دستورالعمل‌های بازیابی رمز عبور را دریافت کنید.",
+    "GO_BACK_TO_LOGIN": "اگر می خواهید به صفحه ورود به سیستم بازگردید،",
     "EMAIL": {
       "LABEL": "ایمیل",
       "PLACEHOLDER": "لطفا ایمیل خود را وارد کنید.",
@@ -10,7 +10,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "لینک ریست کردن رمز عبور به ایمیلتان ارسال شد.",
-      "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
+      "ERROR_MESSAGE": "متأسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید."
     },
     "SUBMIT": "ثبت"
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
index 860b03759259d..376952c97c4f0 100644
--- a/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
@@ -1,13 +1,13 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set new password",
+    "TITLE": "رمز جدید",
     "PASSWORD": {
       "LABEL": "رمز عبور",
       "PLACEHOLDER": "رمز عبور",
       "ERROR": "رمز عبور خیلی کوتاه است."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
+      "LABEL": "تکرار رمز عبور",
       "PLACEHOLDER": "لطفا رمز عبور را مجددا وارد کنید",
       "ERROR": "تکرار رمز عبور می‌بایست با رمز عبور یکسان باشد."
     },
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 84e05b3bcfd09..0f364dc915fe3 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "رمز عبورتان عوض شد",
     "AFTER_EMAIL_CHANGED": "پروفایلتان با موفقیت تغییر یافت، اطلاعات ورود به سیستم تغییر کرده لذا لطفا مجددا به سیستم وارد شوید",
     "FORM": {
+      "PICTURE": "عکس نمایه",
       "AVATAR": "عکس پروفایل",
       "ERROR": "لطفا ایرادات ذکر شده را برطرف کنید",
       "REMOVE_IMAGE": "حذف",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "توکن دسترسی",
-        "NOTE": "از این توکن برای دسترسی از طریق API استفاده می‌شود"
+        "NOTE": "از این توکن برای دسترسی از طریق API استفاده می‌شود",
+        "COPY": "کپی"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "اعلان های صوتی",
         "NOTE": "اعلان های صوتی را در داشبورد برای پیام ها و مکالمات جدید فعال کنید.",
+        "ALERT_TYPES": {
+          "NONE": "هیچکدام",
+          "MINE": "اختصاص داده",
+          "ALL": "همه"
+        },
         "ALERT_TYPE": {
-          "TITLE": "رویدادهای هشدار:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "هیچکدام",
           "ASSIGNED": "مکالمات اختصاص داده شده",
           "ALL_CONVERSATIONS": "همه گفتگوها"
@@ -84,9 +91,26 @@
         "CONVERSATION_MENTION": "هنگامی که از شما در گفتگو نام برده می‌شود، از طریق ایمیل آگاه‌سازی ارسال کن",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "با ایجاد پیام جدید در مکالمه اختصاصی ، اعلان های ایمیل را ارسال کنید",
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "هنگامی که یک پیام جدید در یک مکالمه شرکت کننده ایجاد می شود، اعلان های ایمیل ارسال کنید",
-        "SLA_MISSED_FIRST_RESPONSE": "Send email notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "هر وقت گفتگویی سیاست SLA مربوط به اولین زمان پاسخ را نقض کرد ایمیل ارسال کن",
+        "SLA_MISSED_NEXT_RESPONSE": "هر وقت گفتگویی سیاست SLA مربوط به زمان پاسخ بعدی را نقض کرد ایمیل ارسال کن",
+        "SLA_MISSED_RESOLUTION": "هر وقت گفتگویی سیاست SLA مربوط به زمان حل موضوع را نقض کرد ایمیل ارسال کن"
+      },
+      "NOTIFICATIONS": {
+        "TITLE": "تنظیمات آگاه‌سازی",
+        "TYPE_TITLE": "نوع آگاه‌سازی",
+        "EMAIL": "ایمیل",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
       },
       "API": {
         "UPDATE_SUCCESS": "تغییرات تنظیمات اعلامیه‌ها با موفقیت ثبت شد",
@@ -102,9 +126,9 @@
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "هنگامی که یک پیام جدید در یک مکالمه شرکت کننده ایجاد می شود، اعلان فشار ارسال کنید",
         "HAS_ENABLED_PUSH": "در این مرورگر پوش نوتیفیکیشن را فعال کرده‌اید",
         "REQUEST_PUSH": "فعال کردن پوش نوتیفیکیشن",
-        "SLA_MISSED_FIRST_RESPONSE": "Send push notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send push notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send push notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "هر وقت گفتگویی سیاست SLA مربوط به اولین زمان پاسخ را نقض کرد پوش ارسال کن",
+        "SLA_MISSED_NEXT_RESPONSE": "هر وقت گفتگویی سیاست SLA مربوط به زمان پاسخ بعدی را نقض کرد پوش ارسال کن",
+        "SLA_MISSED_RESOLUTION": "هر وقت گفتگویی سیاست SLA مربوط به زمان حل موضوع را نقض کرد پوش ارسال کن"
       },
       "PROFILE_IMAGE": {
         "LABEL": "عکس پروفایل"
@@ -166,9 +190,9 @@
     "TRIAL_MESSAGE": "روز تا اتمام دوره آزمایشی باقی است.",
     "TRAIL_BUTTON": "الان بخرید",
     "DELETED_USER": "کاربر حذف شده",
-    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
-    "RESEND_VERIFICATION_MAIL": "Resend verification email",
-    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
+    "EMAIL_VERIFICATION_PENDING": "ظاهرا هنوز ایمیل خود را تایید نکرده اید. لطفا ایمیل خود را برای تایید بررسی کنید.",
+    "RESEND_VERIFICATION_MAIL": "ارسال مجدد ایمیل تایید",
+    "EMAIL_VERIFICATION_SENT": "ایمیل تایید ارسال شد. لطفا ایمیل خود را بررسی کنید.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "حساب‌کاربری معلق شده است",
       "MESSAGE": "حساب‌کاربری شما به حالت تعلیق درآمده. لطفا برای اطلاعات بیشتر با تیم پشتیبانی تماس بگیرید."
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "به نوار کناری گزارش ها بروید",
       "MOVE_TO_NEXT_TAB": "به برگه بعدی در فهرست مکالمه بروید",
       "GO_TO_SETTINGS": "برو به تنظیمات",
-      "SWITCH_CONVERSATION_STATUS": "به وضعیت مکالمه بعدی بروید",
       "SWITCH_TO_PRIVATE_NOTE": "رفتن به یادداشت خصوصی",
       "SWITCH_TO_REPLY": "رفتن به پاسخ",
       "TOGGLE_SNOOZE_DROPDOWN": "تغییر حالت بازکردن تعویق"
diff --git a/app/javascript/dashboard/i18n/locale/fa/sla.json b/app/javascript/dashboard/i18n/locale/fa/sla.json
index 07f4b1d1deb62..b4b161b563b7e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/sla.json
+++ b/app/javascript/dashboard/i18n/locale/fa/sla.json
@@ -1,25 +1,37 @@
 {
   "SLA": {
     "HEADER": "SLA",
-    "ADD_ACTION": "Add SLA",
-    "ADD_ACTION_LONG": "Create a new SLA Policy",
-    "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
-    "LEARN_MORE": "Learn more about SLA",
-    "LOADING": "Fetching SLAs",
+    "ADD_ACTION": "اضافه کردن SLA",
+    "ADD_ACTION_LONG": "ایجاد سیاست SLA جدید",
+    "DESCRIPTION": "قراردادهای سطح خدمات (SLA) قراردادهایی هستند که انتظارات واضحی را بین تیم شما و مشتریان تعریف می کنند. آنها استانداردهایی را برای زمان پاسخگویی و حل موضوعات تعریف می کنند، در قالب چارچوبی مه برای پاسخگویی ایجاد می کنند تجربه ای پایدار و با کیفیت را به مشتری ارائه می کنند.",
+    "LEARN_MORE": "اطلاعات بیشتری درباره SLA",
+    "LOADING": "در حال گرفتن SLAها",
+    "PAYWALL": {
+      "TITLE": "برای ایجاد SLA بروز رسانی کنید",
+      "AVAILABLE_ON": "قابلیت SLA فقط در نسخه Business و Enterprise وجود دارد.",
+      "UPGRADE_PROMPT": "برای دسترسی به ویژگی‌های پیشرفته مانند مدیریت تیم، اتوماسیون، ویژگی‌های سفارشی و موارد دیگر، طرح خود را ارتقا دهید.",
+      "UPGRADE_NOW": "حالا ارتقا دهید",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "قابلیت SLA فقط در نسخه Business و Enterprise وجود دارد.",
+      "UPGRADE_PROMPT": "برای دسترسی به ویژگی‌های پیشرفته مانند گزارش‌های حسابرسی، ظرفیت اپراتور و غیره، به یک طرح پولی ارتقا دهید.",
+      "ASK_ADMIN": "لطفاً برای ارتقا با ادمین خود تماس بگیرید."
+    },
     "LIST": {
-      "404": "There are no SLAs available in this account.",
+      "404": "هیچ SLA در این حساب‌کاربری وجود ندارد.",
       "EMPTY": {
         "TITLE_1": "Enterprise P0",
-        "DESC_1": "Issues raised by enterprise customers, that require immediate attention.",
+        "DESC_1": "مسائلی که توسط مشتریان سازمانی مطرح می شود و نیاز به توجه فوری دارد.",
         "TITLE_2": "Enterprise P1",
-        "DESC_2": "Issues raised by enterprise customers, that needs to be acknowledged quickly."
+        "DESC_2": "مسائلی که توسط مشتریان سازمانی مطرح می شود، باید به سرعت مورد تایید قرار گیرد."
       },
-      "BUSINESS_HOURS_ON": "Business hours on",
-      "BUSINESS_HOURS_OFF": "Business hours off",
+      "BUSINESS_HOURS_ON": "در ساعت کاری",
+      "BUSINESS_HOURS_OFF": "خارج از ساعت کاری",
       "RESPONSE_TYPES": {
-        "FRT": "First response time threshold",
-        "NRT": "Next response time threshold",
-        "RT": "Resolution time threshold",
+        "FRT": "آستانه زمان اولین پاسخ",
+        "NRT": "آستانه زمان پاسخ بعدی",
+        "RT": "آستانه زمان حل موضوع",
         "SHORT_HAND": {
           "FRT": "FRT",
           "NRT": "NRT",
@@ -29,34 +41,34 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "SLA Name",
-        "PLACEHOLDER": "SLA Name",
-        "REQUIRED_ERROR": "SLA name is required",
+        "LABEL": "نام SLA",
+        "PLACEHOLDER": "نام SLA",
+        "REQUIRED_ERROR": "نام SLA الزامی است",
         "MINIMUM_LENGTH_ERROR": "باید بیشتر از 2 کاراکتر باشد",
         "VALID_ERROR": "فقط حروف ، اعداد ، خط تیره و زیر خط مجاز است"
       },
       "DESCRIPTION": {
         "LABEL": "توضیحات",
-        "PLACEHOLDER": "SLA for premium customers"
+        "PLACEHOLDER": "SLA برای مشتریان پولی"
       },
       "FIRST_RESPONSE_TIME": {
         "LABEL": "اولین زمان پاسخگویی",
         "PLACEHOLDER": "۵"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time",
+        "LABEL": "زمان پاسخگویی بعدی",
         "PLACEHOLDER": "۵"
       },
       "RESOLUTION_TIME": {
         "LABEL": "زمان تا حل شدن مساله",
-        "PLACEHOLDER": "60"
+        "PLACEHOLDER": "۶۰"
       },
       "BUSINESS_HOURS": {
         "LABEL": "ساعت کاری",
-        "PLACEHOLDER": "Only during business hours"
+        "PLACEHOLDER": "تنها در طول ساعات کاری"
       },
       "THRESHOLD_TIME": {
-        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+        "INVALID_FORMAT_ERROR": "آستانه باید یک عدد و بزرگتر از صفر باشد"
       },
       "EDIT": "ویرایش",
       "CREATE": "ايجاد كردن",
@@ -64,33 +76,33 @@
       "CANCEL": "انصراف"
     },
     "ADD": {
-      "TITLE": "Add SLA",
-      "DESC": "Friendly promises for great service!",
+      "TITLE": "اضافه کردن SLA",
+      "DESC": "وعده های دوستانه برای خدمات عالی!",
       "API": {
-        "SUCCESS_MESSAGE": "SLA added successfully",
+        "SUCCESS_MESSAGE": "SLA با موفقیت اضافه شد",
         "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
       }
     },
     "DELETE": {
-      "TITLE": "Delete SLA",
+      "TITLE": "حذف SLA",
       "API": {
-        "SUCCESS_MESSAGE": "SLA deleted successfully",
+        "SUCCESS_MESSAGE": "SLA با موفقیت حذف شد",
         "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
       },
       "CONFIRM": {
         "TITLE": "تاییدیه حذف",
-        "MESSAGE": "Are you sure you want to delete ",
+        "MESSAGE": "آیا مطمئن هستید که می خواهید حذف کنید ",
         "YES": "بله، حذف شود ",
         "NO": "خیر، نگه‌دار "
       }
     },
     "EVENTS": {
-      "TITLE": "SLA Misses",
+      "TITLE": "SLA های از دست رفته",
       "FRT": "زمان تا اولین پاسخ",
-      "NRT": "Next response time",
-      "RT": "Resolution time",
-      "SHOW_MORE": "{count} more",
-      "HIDE": "Hide {count} rows"
+      "NRT": "زمان پاسخگویی بعدی",
+      "RT": "زمان تا حل شدن مساله",
+      "SHOW_MORE": "{count} بیشتر",
+      "HIDE": "مخفی کردم {count} مورد"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
index 81131a3593819..9dbb17164930a 100644
--- a/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "انتخاب تمام ایجنت ها",
       "SELECTED_COUNT": "%{selected} تا از %{total} ایجنت انتخاب شد.",
       "BUTTON_TEXT": "اضافه کردن اپراتور",
-      "AGENT_VALIDATION_ERROR": "حداقل یک ایجنت را انتخاب کنید."
+      "AGENT_VALIDATION_ERROR": "حداقل یک اپراتور را انتخاب کنید."
     },
     "FINISH": {
       "TITLE": "تیم شما آماده است!",
diff --git a/app/javascript/dashboard/i18n/locale/fi/bulkActions.json b/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
index 7bb45133fcffd..72705e8b131af 100644
--- a/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 0c511127c89fd..599fcf56ffe8e 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Mukautetut attribuutit",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Edelliset keskustelut"
+      "PREVIOUS_CONVERSATIONS": "Edelliset keskustelut",
+      "NO_RECORDS_FOUND": "Määritteitä ei löytynyt"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index b848049b92ad3..95e120c3960f5 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "Määritteitä ei löytynyt",
     "UPDATE": {
       "SUCCESS": "Tunniste päivitetty onnistuneesti",
       "ERROR": "Attribuuttia ei voida päivittää. Yritä myöhemmin uudelleen"
diff --git a/app/javascript/dashboard/i18n/locale/fi/datePicker.json b/app/javascript/dashboard/i18n/locale/fi/datePicker.json
new file mode 100644
index 0000000000000..1d2e2bf34c4b3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Viimeiset 7 päivää",
+      "LAST_30_DAYS": "Viimeiset 30 päivää",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index beea6efac8890..6df26953f7a16 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Raportit",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 1b4a4c349e9f8..a7897227fad85 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Lisää edustajia luotuun saapuneet-kansioon."
       },
       {
-        "title": "Noniin!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Kaikki valmiina!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Valitse sivu listasta",
         "INBOX_NAME": "Kansion nimi",
         "ADD_NAME": "Lisää kansiolle nimi",
-        "PICK_NAME": "Valitse kansion nimi",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Valitse arvo"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhookin URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Anna kelvollinen URL-osoite"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Tämä kenttä on pakollinen"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Tämä kenttä on pakollinen"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhookin URL",
-          "SUBTITLE": "Määritä URL-osoite, johon haluat vastaanottaa callbackin tapahtumista.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook-URL"
         },
         "SUBMIT_BUTTON": "Luo API-kanava",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Sähköpostikanava",
-        "DESC": "Integroi sähköpostisi saapuneet-kansioon.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Kanavan nimi",
           "PLACEHOLDER": "Ole hyvä ja anna kanavan nimi",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Edustajat",
         "DESC": "Täällä voit lisätä edustajia hallitsemaan juuri luotua saapuneet-kansiota. Vain näillä valituilla edustajilla on pääsy tähän saapuneet-kansioon. Edustajat, jotka eivät kuulu tähän saapuneet-kansioon, eivät pysty näkemään tai vastaamaan viesteihin tässä saapuneet-kansiossa, kun he kirjautuvat. <br> <b>PS:</b> Jos tarvitset ylläpitäjänä pääsyn kaikkiin saapuneisiin, sinun pitäisi lisätä itsesi edustajaksi kaikkiin laatikoihin, jotka luot.",
-        "VALIDATION_ERROR": "Lisää vähintään yksi edustaja postilaatikolle",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Valitse edustajat postilaatikolle"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Päivitä",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index ebe2cd9f0e668..6918a7eb9b13c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Salasanasi on vaihdettu onnistuneesti",
     "AFTER_EMAIL_CHANGED": "Profiilisi on päivitetty onnistuneesti, ole hyvä ja kirjaudu uudelleen kun kirjautumistunnuksesi muuttuvat",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profiilikuva",
       "ERROR": "Korjaa lomakkeen virheet",
       "REMOVE_IMAGE": "Poista",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "Tätä tunnusta voidaan käyttää, jos olet rakentamassa API-pohjaista integraatiota"
+        "NOTE": "Tätä tunnusta voidaan käyttää, jos olet rakentamassa API-pohjaista integraatiota",
+        "COPY": "Kopioi"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "Kaikki"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Sähköposti",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Ilmoitusasetuksesi päivitetään onnistuneesti",
         "UPDATE_ERROR": "Asetuksia päivitettäessä tapahtui virhe. Ole hyvä ja yritä uudelleen"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/fi/sla.json b/app/javascript/dashboard/i18n/locale/fi/sla.json
index 45dab68a55594..1d4a3b123cf79 100644
--- a/app/javascript/dashboard/i18n/locale/fi/sla.json
+++ b/app/javascript/dashboard/i18n/locale/fi/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/fr/bulkActions.json b/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
index 485b02c0e2e16..8a259141366a6 100644
--- a/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Chargement des agents",
     "UPDATE": {
       "CHANGE_STATUS": "Changer le statut",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Reporté jusqu'à la prochaine réponse.",
+      "SNOOZE_UNTIL": "Reporter",
       "UPDATE_SUCCESFUL": "Le statut de la conversation a été mis à jour avec succès.",
       "UPDATE_FAILED": "Impossible de mettre à jour les conversations, veuillez réessayer."
     },
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 41b318c3dd782..a15cb65cfe457 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Attributs personnalisés",
       "CONTACT_LABELS": "Libellés des contacts",
-      "PREVIOUS_CONVERSATIONS": "Conversations précédentes"
+      "PREVIOUS_CONVERSATIONS": "Conversations précédentes",
+      "NO_RECORDS_FOUND": "Aucun attribut trouvé"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Exporter les contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index 9235d0dee10fd..06c404409936d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -69,7 +69,7 @@
         "FRT": "FRT {status}",
         "NRT": "NRT {status}",
         "RT": "RT {status}",
-        "MISSED": "missed",
+        "MISSED": "manqué",
         "DUE": "due"
       }
     },
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Créer un attribut",
+    "NO_RECORDS_FOUND": "Aucun attribut trouvé",
     "UPDATE": {
       "SUCCESS": "Attribut mis à jour avec succès",
       "ERROR": "Impossible de mettre à jour l'attribut. Veuillez réessayer plus tard"
diff --git a/app/javascript/dashboard/i18n/locale/fr/datePicker.json b/app/javascript/dashboard/i18n/locale/fr/datePicker.json
new file mode 100644
index 0000000000000..bdec99942d7eb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Appliquer",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "7 derniers jours",
+      "LAST_30_DAYS": "30 derniers jours",
+      "LAST_3_MONTHS": "3 derniers mois",
+      "LAST_6_MONTHS": "6 derniers mois",
+      "LAST_YEAR": "Année dernière",
+      "CUSTOM_RANGE": "Plage de date personnalisée"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index e3510009015c2..87d60620ffd31 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Général",
       "REPORTS": "Rapports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Changer de responsable",
       "CHANGE_PRIORITY": "Modifier la priorité",
       "CHANGE_TEAM": "Changer d’équipe",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inbox.json b/app/javascript/dashboard/i18n/locale/fr/inbox.json
index 0e74c55616849..fd13ec441469c 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inbox.json
@@ -5,7 +5,7 @@
       "DISPLAY_DROPDOWN": "Display",
       "LOADING": "Chargement des notifications",
       "404": "Il n'y a aucune notification active dans ce groupe.",
-      "NO_NOTIFICATIONS": "No notifications",
+      "NO_NOTIFICATIONS": "Aucune notification",
       "NOTE": "Notifications from all subscribed inboxes",
       "NO_MESSAGES_AVAILABLE": "Oops! Not able to fetch messages",
       "SNOOZED_UNTIL": "Reporter jusqu'à",
@@ -14,7 +14,7 @@
     },
     "ACTION_HEADER": {
       "SNOOZE": "Snooze notification",
-      "DELETE": "Delete notification",
+      "DELETE": "Supprimer la notification",
       "BACK": "Précédent"
     },
     "TYPES": {
@@ -28,16 +28,16 @@
       "SLA_MISSED_RESOLUTION": "SLA target resolution missed for conversation"
     },
     "MENU_ITEM": {
-      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_READ": "Marquer comme lu",
       "MARK_AS_UNREAD": "Marquer comme non lu",
       "SNOOZE": "Reporter",
       "DELETE": "Supprimer",
       "MARK_ALL_READ": "Tout marquer comme lu",
-      "DELETE_ALL": "Delete all",
+      "DELETE_ALL": "Tout supprimer",
       "DELETE_ALL_READ": "Delete all read"
     },
     "DISPLAY_MENU": {
-      "SORT": "Sort",
+      "SORT": "Trier",
       "DISPLAY": "Display :",
       "SORT_OPTIONS": {
         "NEWEST": "Newest",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index 5859f8cbc7922..d1283cbff8a1d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Ajouter des agents à la boîte de réception créée."
       },
       {
-        "title": "Voilà !",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Vous êtes paré !"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Sélectionnez une page dans la liste",
         "INBOX_NAME": "Nom de la boîte de réception",
         "ADD_NAME": "Ajouter un nom pour votre boîte de réception",
-        "PICK_NAME": "Choisissez un nom pour votre boîte de réception",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Choisir une valeur"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL du Webhook",
-          "PLACEHOLDER": "Entrez votre URL Webhook",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Veuillez entrer une URL valide"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Clé de l'API",
-            "PLACEHOLDER": "Veuillez entrer votre clé API Bandwith",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Ce champ est requis"
           },
           "API_SECRET": {
             "LABEL": "Secret API",
-            "PLACEHOLDER": "Veuillez entrer votre secret API Bandwith",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Ce champ est requis"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Jeton de vérification du Webhook",
-          "PLACEHOLDER": "Entrez un jeton de vérification que vous voulez configurer pour les webhooks de Facebook.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Veuillez saisir une adresse de courriel valide."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL du Webhook",
-          "SUBTITLE": "Configurez l'URL où vous souhaitez recevoir des callbacks sur les événements.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL du Webhook"
         },
         "SUBMIT_BUTTON": "Créer un canal API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Canal Courriel",
-        "DESC": "Intégrez votre boîte de réception de courriel.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nom du canal",
           "PLACEHOLDER": "Veuillez entrer un nom de canal",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Ici vous pouvez ajouter des agents pour gérer votre boîte de réception nouvellement créée. Seuls ces agents sélectionnés auront accès à votre boîte de réception. Les agents qui ne font pas partie de cette boîte de réception ne seront pas en mesure de voir ou de répondre aux messages de cette boîte de réception lorsqu'ils se connectent. <br> <b>PS :</b> En tant qu'administrateur, si vous avez besoin d'accéder à toutes les boîtes de réception, vous devriez vous ajouter en tant qu'agent à toutes les boîtes de réception que vous créez.",
-        "VALIDATION_ERROR": "Ajouter au moins un agent à votre nouvelle boîte de réception",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Sélectionner les agents de la boîte de réception"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Nom de l'expéditeur",
-        "SUB_TEXT": "Sélectionnez le nom présenté à votre client quand il reçoit des emails de vos agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "Par exemple:",
         "FRIENDLY": {
           "TITLE": "Amical",
@@ -508,7 +508,7 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Autoriser les messages après résolution de la conversation",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Autoriser les utilisateurs à envoyer des messages même après la résolution de la conversation.",
       "WHATSAPP_SECTION_SUBHEADER": "Cette clé API est utilisée pour l'intégration avec les API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Entrez la clé mise à jour à utiliser pour l'intégration avec les API WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Clé de l'API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Mettre à jour la clé API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Entrez la nouvelle clé API ici",
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Pour activer le SMTP, veuillez configurer IMAP.",
       "UPDATE": "Modifier les paramètres IMAP",
       "TOGGLE_AVAILABILITY": "Activer la configuration IMAP pour cette boîte de réception",
-      "TOGGLE_HELP": "Activer IMAP aidera l'utilisateur à recevoir des emails",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Paramètres IMAP mis à jour avec succès",
         "ERROR_MESSAGE": "Impossible de mettre à jour les paramètres IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index bdc5633d33da1..379b4e18212bb 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Votre mot de passe a été modifié avec succès",
     "AFTER_EMAIL_CHANGED": "Votre profil a été mis à jour avec succès, veuillez vous reconnecter car vos identifiants de connexion ont été modifiés",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Image de profil",
       "ERROR": "Veuillez corriger les erreurs du formulaire",
       "REMOVE_IMAGE": "Supprimer",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Jeton d'accès",
-        "NOTE": "Ce jeton peut être utilisé si vous construisez une intégration basée sur l'API"
+        "NOTE": "Ce jeton peut être utilisé si vous construisez une intégration basée sur l'API",
+        "COPY": "Copier"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Notifications audio",
         "NOTE": "Activer les notifications audio dans le tableau de bord pour les nouveaux messages et conversations.",
+        "ALERT_TYPES": {
+          "NONE": "Aucun",
+          "MINE": "Assigned",
+          "ALL": "Tous"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Événements d'alerte :",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Aucun",
           "ASSIGNED": "Conversations assignées",
           "ALL_CONVERSATIONS": "Toutes les conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Courriel",
+        "PUSH": "Notifications push",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Vos préférences de notifications ont été mises à jour avec succès",
         "UPDATE_ERROR": "Une erreur est survenue lors de la mise à jour des préférences, veuillez réessayer"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Aller à la barre latérale des rapports",
       "MOVE_TO_NEXT_TAB": "Passer à l'onglet suivant dans la liste des conversations",
       "GO_TO_SETTINGS": "Accéder aux paramètres",
-      "SWITCH_CONVERSATION_STATUS": "Passer au statut suivant de la conversation",
       "SWITCH_TO_PRIVATE_NOTE": "Basculer vers une note privée",
       "SWITCH_TO_REPLY": "Basculer vers la réponse",
       "TOGGLE_SNOOZE_DROPDOWN": "Activer/désactiver la liste déroulante de répétition"
diff --git a/app/javascript/dashboard/i18n/locale/fr/sla.json b/app/javascript/dashboard/i18n/locale/fr/sla.json
index 866bd8208d878..dcdc6c1750417 100644
--- a/app/javascript/dashboard/i18n/locale/fr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/fr/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/he/bulkActions.json b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
index d8c7c12e4237a..6f138be0622c7 100644
--- a/app/javascript/dashboard/i18n/locale/he/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "טוען סוכנים",
     "UPDATE": {
       "CHANGE_STATUS": "שנה סטאטוס",
-      "SNOOZE_UNTIL_NEXT_REPLY": "נדנד עד התגובה הבאה.",
+      "SNOOZE_UNTIL": "נודניק",
       "UPDATE_SUCCESFUL": "סטאטוס השיחה שונה בהצלחה.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index e4427b55ff761..9354c8642030c 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "שדות מותאמים אישית",
       "CONTACT_LABELS": "תגיות אנשי קשר",
-      "PREVIOUS_CONVERSATIONS": "שיחות קודמות"
+      "PREVIOUS_CONVERSATIONS": "שיחות קודמות",
+      "NO_RECORDS_FOUND": "לא נמצאו מאפיינים"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 2d2435d3594a4..e3b2610ec68d3 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "צור תכונה",
+    "NO_RECORDS_FOUND": "לא נמצאו מאפיינים",
     "UPDATE": {
       "SUCCESS": "המאפיין עודכן בהצלחה",
       "ERROR": "לא ניתן לעדכן את המאפיין. בבקשה נסה שוב מאוחר יותר"
diff --git a/app/javascript/dashboard/i18n/locale/he/datePicker.json b/app/javascript/dashboard/i18n/locale/he/datePicker.json
new file mode 100644
index 0000000000000..ac3b33cedf217
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "להגיש מועמדות",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "7 הימים האחרונים",
+      "LAST_30_DAYS": "30 הימים האחרונים",
+      "LAST_3_MONTHS": "3 החודשים האחרונים",
+      "LAST_6_MONTHS": "6 החודשים האחרונים",
+      "LAST_YEAR": "שנה שעברה",
+      "CUSTOM_RANGE": "טווח תאריכים מותאם אישית"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 0833b47ac0648..b4e7d15808528 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "כללי",
       "REPORTS": "דוחות",
       "CONVERSATION": "שיחה",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "שנה מוקצה",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "להחליף קבוצה",
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 6cd4e9c544d05..8da24448fc487 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "הוסף נציגים לתיבת הדואר הנכנס שנוצרה."
       },
       {
-        "title": "וואלה!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "אתם מוכנים לצאת לדרך!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "בחר עמוד מהרשימה",
         "INBOX_NAME": "שם תיבת הדואר הנכנס",
         "ADD_NAME": "הוסף שם לתיבת הדואר הנכנס שלך",
-        "PICK_NAME": "בחר שם בתיבת הדואר הנכנס שלך",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "בחר ערך"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "כתובת אתר של Webhook",
-          "PLACEHOLDER": "הזן את כתובת האתר שלך ל-Webhook",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "אנא הכנס כתובת URL חוקית"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "מפתח API",
-            "PLACEHOLDER": "נא הכנס את ה- Bandwith API Key שלך",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "שדה חובה"
           },
           "API_SECRET": {
             "LABEL": "סוד API",
-            "PLACEHOLDER": "נא הכנס את ה- Bandwith API Secret שלך",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "שדה חובה"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "נא הכנס verify token שברצונך להגדיר עבור facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "אנא הכנס ערך תקין."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "כתובת אתר של Webhook",
-          "SUBTITLE": "הגדר את כתובת האתר שבה ברצונך לקבל התקשרות חוזרת על אירועים.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "כתובת אתר של Webhook"
         },
         "SUBMIT_BUTTON": "צור ערוץ API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "ערוץ דוא\"ל",
-        "DESC": "שלב את תיבת הדואר הנכנס שלך.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "שם הערוץ",
           "PLACEHOLDER": "נא להזין שם ערוץ",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "סוכנים",
         "DESC": "כאן תוכל להוסיף סוכנים לניהול תיבת הדואר הנכנס החדשה שלך. רק לסוכנים שנבחרו אלה תהיה גישה לתיבת הדואר הנכנס שלך. סוכנים שאינם חלק מתיבת הדואר הנכנס הזו לא יוכלו לראות או להגיב להודעות בתיבת הדואר הנכנס הזו כאשר הם נכנסים. <br> <b>נ. ב.:</b> כמנהל מערכת, אם אתה זקוק לגישה לכל תיבות הדואר הנכנס, עליך להוסיף את עצמך כסוכן לכל תיבות הדואר הנכנס שאתה יוצר.",
-        "VALIDATION_ERROR": "הוסף לפחות סוכן אחד לתיבת הדואר הנכנס החדשה שלך",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "בחר סוכנים לתיבת הדואר הנכנס"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "אפשר הודעות לאחר שהשיחה נפתרה",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "אפשר למשתמשי הקצה לשלוח הודעות גם לאחר פתרון השיחה.",
       "WHATSAPP_SECTION_SUBHEADER": "מפתח API זה משמש לשילוב עם ממשקי ה-API של WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "הזן את המפתח המעודכן שישמש לשילוב עם ממשקי ה-API של WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "מפתח API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "עדכון מפתח API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "הזן את מפתח ה-API החדש כאן",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "עדכן",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "אסימון אימות Webhook",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "עדכון הגדרות טופס טרום צ'אט"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "כדי להפעיל SMTP, אנא הגדר את IMAP.",
       "UPDATE": "עדכון הגדרות IMAP",
       "TOGGLE_AVAILABILITY": "הפעל תצורת IMAP עבור תיבת הדואר הנכנס הזו",
-      "TOGGLE_HELP": "הפעלת IMAP תעזור למשתמש לקבל דוא\"ל",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "הגדרות IMAP עודכנו בהצלחה",
         "ERROR_MESSAGE": "לא ניתן לעדכן הגדרות IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 35ebb0d59ffe8..6bb85c95d4288 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "הסיסמא שונתה בהצלחה",
     "AFTER_EMAIL_CHANGED": "הפרופיל עודכן בהצלחה, יש להתחבר מחדש",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "תמונת פרופיל",
       "ERROR": "אנא תקן שגיאות בטופס",
       "REMOVE_IMAGE": "הסר",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "אסימון",
-        "NOTE": "משמש לחיבורי API"
+        "NOTE": "משמש לחיבורי API",
+        "COPY": "עותק"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "התראות קוליות",
         "NOTE": "אפשר התראות קוליות להודעות ושיחות חדשות.",
+        "ALERT_TYPES": {
+          "NONE": "כלום",
+          "MINE": "Assigned",
+          "ALL": "הכל"
+        },
         "ALERT_TYPE": {
-          "TITLE": "סוגי התראות:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "כלום",
           "ASSIGNED": "שיחות משוייכות",
           "ALL_CONVERSATIONS": "כל השיחות"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "אימייל",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "העדפות ההתראות עודכנו בהצלחה",
         "UPDATE_ERROR": "אירעה שגיאה בעדכון ההעדפות, אנא נסה שנית"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "עבור לסרגל הצד של דוחות",
       "MOVE_TO_NEXT_TAB": "עבור ללשונית הבאה ברשימת השיחות",
       "GO_TO_SETTINGS": "לך להגדרות",
-      "SWITCH_CONVERSATION_STATUS": "עבור למצב השיחה הבאה",
       "SWITCH_TO_PRIVATE_NOTE": "עבור להערה פרטית",
       "SWITCH_TO_REPLY": "עבור לתשובה",
       "TOGGLE_SNOOZE_DROPDOWN": "החלפת תפריט נודניק"
diff --git a/app/javascript/dashboard/i18n/locale/he/sla.json b/app/javascript/dashboard/i18n/locale/he/sla.json
index ba7c1d65686c3..5e973a548ad20 100644
--- a/app/javascript/dashboard/i18n/locale/he/sla.json
+++ b/app/javascript/dashboard/i18n/locale/he/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/hi/bulkActions.json b/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 939138482f9b9..7a4a3af3721fa 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index f1b7d1fb92c10..cc3e4569bc729 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/hi/datePicker.json b/app/javascript/dashboard/i18n/locale/hi/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index ba83549cf10ac..2cd3c1f065788 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 11a6a914aea0c..fc8d9982778da 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/hi/sla.json b/app/javascript/dashboard/i18n/locale/hi/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/hi/sla.json
+++ b/app/javascript/dashboard/i18n/locale/hi/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/hr/bulkActions.json b/app/javascript/dashboard/i18n/locale/hr/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/hr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hr/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/hr/contact.json b/app/javascript/dashboard/i18n/locale/hr/contact.json
index c47606f991b9e..ba36b5118f5dc 100644
--- a/app/javascript/dashboard/i18n/locale/hr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hr/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/hr/conversation.json b/app/javascript/dashboard/i18n/locale/hr/conversation.json
index 4f2f9341be275..b7d31aab7e0c5 100644
--- a/app/javascript/dashboard/i18n/locale/hr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hr/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/hr/datePicker.json b/app/javascript/dashboard/i18n/locale/hr/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hr/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
index 588262c7c717a..fe625da3cf524 100644
--- a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Promjena prioriteta",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
index 8eb6ebe1538b4..95a06c4bde168 100644
--- a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Broj telefona",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Prijateljski",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Token za verifikaciju Webhook-a",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Ovaj token se koristi za verifikaciju autentičnosti webhook endpoint-a.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/hr/settings.json b/app/javascript/dashboard/i18n/locale/hr/settings.json
index 1bd00da1bd5fb..2c65d024573e3 100644
--- a/app/javascript/dashboard/i18n/locale/hr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "Nijedno",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/hr/sla.json b/app/javascript/dashboard/i18n/locale/hr/sla.json
index 0f083d75938d7..7629b0c763a82 100644
--- a/app/javascript/dashboard/i18n/locale/hr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/hr/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/hu/bulkActions.json b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
index c57da4956c2d8..e8c8e8ebf42c1 100644
--- a/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Ügynökök betöltése",
     "UPDATE": {
       "CHANGE_STATUS": "Státusz változtatása",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Alvómód a következő válaszig.",
+      "SNOOZE_UNTIL": "Halasztás",
       "UPDATE_SUCCESFUL": "Beszélgetés státusza sikeresen frissítve ",
       "UPDATE_FAILED": "Nem sikerült frissíteni a beszélgetéseket. Kérjük, próbálja újra."
     },
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index 286984c3d16f0..7ba9a6d8a8e02 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Egyedi atribútumok",
       "CONTACT_LABELS": "Kontakt címkéi",
-      "PREVIOUS_CONVERSATIONS": "Korábbi beszélgetések"
+      "PREVIOUS_CONVERSATIONS": "Korábbi beszélgetések",
+      "NO_RECORDS_FOUND": "Nem található tulajdonság"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Kontaktok exportálása",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 25513f2428493..4bfb9930d2aff 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Attribútum hozzáadása",
+    "NO_RECORDS_FOUND": "Nem található tulajdonság",
     "UPDATE": {
       "SUCCESS": "Tulajdonság sikeresen frissítve",
       "ERROR": "Nem lehet frissíteni a tulajdonságot. Kérlek, próbáld újra"
diff --git a/app/javascript/dashboard/i18n/locale/hu/datePicker.json b/app/javascript/dashboard/i18n/locale/hu/datePicker.json
new file mode 100644
index 0000000000000..8bdfab28b708e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Alkalmaz",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Utolsó 7 nap",
+      "LAST_30_DAYS": "Utolsó 30 nap",
+      "LAST_3_MONTHS": "Elmúlt 3 hónapban",
+      "LAST_6_MONTHS": "Elmúlt 6 hónapban",
+      "LAST_YEAR": "Elmúlt 1 évben",
+      "CUSTOM_RANGE": "Egyedi időszak"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index b725d644adaa2..09a23508d0754 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Általános",
       "REPORTS": "Jelentések",
       "CONVERSATION": "Beszélgetés",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Felelős megváltoztatása",
       "CHANGE_PRIORITY": "Prioritás megváltoztatása",
       "CHANGE_TEAM": "Csapat megváltoztatása",
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index b2e1a3fbb3858..dac1517d00ff4 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Adj hozzá ügynököket a létrehozott inboxhoz."
       },
       {
-        "title": "Tadaaam!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Mindennel készen állsz!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Válaszd ki az oldalt a listából",
         "INBOX_NAME": "Fiók név",
         "ADD_NAME": "Adj nevet a fiókodnak",
-        "PICK_NAME": "Válassz nevet az inboxodnak",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Válassz értéket"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Add meg a Webhook URL-t",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Kérjük helyes URL-t adj meg"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API kulcs",
-            "PLACEHOLDER": "Kérlek add meg a Bandwidth API kulcsot",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Ez a mező kötelező"
           },
           "API_SECRET": {
             "LABEL": "API titkos kulcs",
-            "PLACEHOLDER": "Kérlek add meg a Bandwidth Titkoskódot",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Ez a mező kötelező"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Azonosító Token",
-          "PLACEHOLDER": "Adj meg egy ellenőrző tokent, amelyet be szeretne állítani a facebook webhookhoz.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Kérlek adj meg egy érvényes értéket."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Állítsd be az URL-t melyről fogadni szeretnéd a visszahívásokat az eseményekről.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "API csatorna létrehozása",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "E-mail csatorna",
-        "DESC": "Inbox-al való integrálás.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Csatorna neve",
           "PLACEHOLDER": "Kérjük adj meg csatorna nevet",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Ügynökök",
         "DESC": "Itt hozzáadhatsz ügynököket az újonan létrehooztt inboxodhoz. Csak ezek a kiválasztott ügynökök fognak hozzáférni az inboxodhoz. Az ügynökök akik nem részei az inboxnak, nem látják és nem tudnak válaszolni az üzenetekre belépésük után. <br><b>UI:</b>Adminisztrátorként hozzáférésed van az összes inboxhoz, add hozzá magad az összes inboxhoz ügynökként.",
-        "VALIDATION_ERROR": "Adj legalább egy ügynököt az új inboxodhoz",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Válaszd ki az inboxhoz hozzárendelt ügynököket"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Küldő neve",
-        "SUB_TEXT": "Válassza ki a nevet, amit a vevő lásson, amikor emailt kap.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "Például:",
         "FRIENDLY": {
           "TITLE": "Barátságos",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Üzenetek engedélyezése a beszélgetés befejezése után",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Engedélyezze a végfelhasználók számára, hogy üzeneteket küldjenek a beszélgetés lezárása után is.",
       "WHATSAPP_SECTION_SUBHEADER": "Ezt az API-kulcsot a WhatsApp API-kkal való integrációhoz használják.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Adja meg a frissített kulcsot a WhatsApp API-kkal való integrációhoz.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API kulcs",
       "WHATSAPP_SECTION_UPDATE_TITLE": "API-kulcs frissítése",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Add meg az új API kulcsot",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Frissítés",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Azonosító Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Ez a token a webhook-végpont hitelességének ellenőrzésére szolgál.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Csevegés előtti űrlap beállításainak frissítése"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Az SMTP engedélyezéséhez konfigurálja az IMAP-et.",
       "UPDATE": "IMAP beállítások frissítése",
       "TOGGLE_AVAILABILITY": "Engedélyezze az IMAP-konfigurációt ehhez a fiókhoz",
-      "TOGGLE_HELP": "Az IMAP engedélyezése segít a felhasználónak az e-mailek fogadásában",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP beállítások sikeresen frissítve",
         "ERROR_MESSAGE": "Nem sikerült frissíteni az IMAP-beállításokat"
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 05feb734be166..80e9ac2a36a13 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "A jelszavad sikeresen megváltoztattad",
     "AFTER_EMAIL_CHANGED": "A profilod sikeresen frissítésre került, kérjük lépj be újra, mivel megváltoztak a belépési adataid",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profilkép",
       "ERROR": "Kérjük javítsd ki az űrlaphibákat",
       "REMOVE_IMAGE": "Eltávolítás",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Hozzáférési kulcs",
-        "NOTE": "Ez a kulcs akkor használható, ha API-alapú integrációt építesz"
+        "NOTE": "Ez a kulcs akkor használható, ha API-alapú integrációt építesz",
+        "COPY": "Másolás"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Hangüzenetek",
         "NOTE": "Hangüzenetek engedélyezése a vezérlőpulton új üzenetek és beszélgetések esetén.",
+        "ALERT_TYPES": {
+          "NONE": "Nincs",
+          "MINE": "Assigned",
+          "ALL": "Mind"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Esemény figyelmeztetés:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Nincs",
           "ASSIGNED": "Hozzárendelt Beszélgetések",
           "ALL_CONVERSATIONS": "Beszélgetések"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-mail",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Az értesítési beállításaid sikeresen frissítve",
         "UPDATE_ERROR": "Egy hiba lépett fel a beállítások frissítése során, kérjük próbáld újra"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Ugrás a jelentések oldalsávra",
       "MOVE_TO_NEXT_TAB": "Ugrás a beszélgetéslista következő lapjára",
       "GO_TO_SETTINGS": "Beállítások megnyitása",
-      "SWITCH_CONVERSATION_STATUS": "Váltás a következő beszélgetés állapotára",
       "SWITCH_TO_PRIVATE_NOTE": "Válts privát jegyzetre",
       "SWITCH_TO_REPLY": "Válts a válasz fülre",
       "TOGGLE_SNOOZE_DROPDOWN": "Alvómód bekapcsolása a legördülő menüben"
diff --git a/app/javascript/dashboard/i18n/locale/hu/sla.json b/app/javascript/dashboard/i18n/locale/hu/sla.json
index e8f593edf401c..bcc7f9ca05d27 100644
--- a/app/javascript/dashboard/i18n/locale/hu/sla.json
+++ b/app/javascript/dashboard/i18n/locale/hu/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/hy/bulkActions.json b/app/javascript/dashboard/i18n/locale/hy/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/hy/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hy/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/hy/contact.json b/app/javascript/dashboard/i18n/locale/hy/contact.json
index 939138482f9b9..7a4a3af3721fa 100644
--- a/app/javascript/dashboard/i18n/locale/hy/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hy/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/hy/conversation.json b/app/javascript/dashboard/i18n/locale/hy/conversation.json
index f1b7d1fb92c10..cc3e4569bc729 100644
--- a/app/javascript/dashboard/i18n/locale/hy/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hy/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/hy/datePicker.json b/app/javascript/dashboard/i18n/locale/hy/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
index 3762a51511b35..b1d9e50aef67d 100644
--- a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/hy/settings.json b/app/javascript/dashboard/i18n/locale/hy/settings.json
index bfc1a79df27cf..4dca590e96dc1 100644
--- a/app/javascript/dashboard/i18n/locale/hy/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/hy/sla.json b/app/javascript/dashboard/i18n/locale/hy/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/hy/sla.json
+++ b/app/javascript/dashboard/i18n/locale/hy/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/id/bulkActions.json b/app/javascript/dashboard/i18n/locale/id/bulkActions.json
index 2390ca58f0b6d..2f07fe8a06546 100644
--- a/app/javascript/dashboard/i18n/locale/id/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/id/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Sedang memuat agen",
     "UPDATE": {
       "CHANGE_STATUS": "Ubah status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Tunda hingga balasan berikutnya.",
+      "SNOOZE_UNTIL": "Tunda",
       "UPDATE_SUCCESFUL": "Status percakapan berhasil diperbarui.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index ae3003304b990..d9eb8c2dc5fbb 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Atribut Kustom",
       "CONTACT_LABELS": "Label Kontak",
-      "PREVIOUS_CONVERSATIONS": "Percakapan Sebelumnya"
+      "PREVIOUS_CONVERSATIONS": "Percakapan Sebelumnya",
+      "NO_RECORDS_FOUND": "Tidak ditemukan atribut"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Ekspor Kontak",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index b5cc2a05e4a2d..80971d3421b2c 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Buat atribut",
+    "NO_RECORDS_FOUND": "Tidak ditemukan atribut",
     "UPDATE": {
       "SUCCESS": "Atribut berhasil diperbarui",
       "ERROR": "Tidak dapat memperbarui atribut. Silakan coba lagi nanti"
diff --git a/app/javascript/dashboard/i18n/locale/id/datePicker.json b/app/javascript/dashboard/i18n/locale/id/datePicker.json
new file mode 100644
index 0000000000000..aaeaf7634469f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Terapkan",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "7 hari terakhir",
+      "LAST_30_DAYS": "30 hari terakhir",
+      "LAST_3_MONTHS": "3 bulan terakhir",
+      "LAST_6_MONTHS": "6 bulan terakhir",
+      "LAST_YEAR": "Tahun terakhir",
+      "CUSTOM_RANGE": "Rentang tanggal kustom"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index d703c99b5b1c2..4327e5a70b91a 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Umum",
       "REPORTS": "Laporan",
       "CONVERSATION": "Percakapan",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Ubah Penerima Tugas",
       "CHANGE_PRIORITY": "Ubah Prioritas",
       "CHANGE_TEAM": "Ubah Tim",
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index c7176a250e8d5..39facb3f6fd4b 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Tambahkan agen ke kotak masuk yang dibuat."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Kotak masuk Anda sudah siap!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Pilih halaman dari daftar",
         "INBOX_NAME": "Nama Kotak Masuk",
         "ADD_NAME": "Tambahkan nama untuk kotak masuk Anda",
-        "PICK_NAME": "Pilih Nama Kotak Masuk Anda",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pilih"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL Webhook",
-          "PLACEHOLDER": "Masukkan URL Webhook Anda",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Harap masukkan URL yang valid"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "Bagian ini diperlukan"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Nomor Telpon",
+          "LABEL": "Nomor Telepon",
           "PLACEHOLDER": "Silakan masukkan nomor telepon dari mana pesan akan dikirim.",
           "ERROR": "Berikan nomor telepon yang valid yang dimulai dengan tanda `+` dan tidak mengandung spasi."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Masukkan Kunci API Bandwith Anda",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Bagian ini diperlukan"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Masukkan Bandwith API Secret Anda",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Bagian ini diperlukan"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Token Verifikasi Webhook",
-          "PLACEHOLDER": "Masukkan token verifikasi yang ingin Anda konfigurasikan untuk webhook facebook.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Harap masukkan nilai yang valid."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL Webhook",
-          "SUBTITLE": "Konfigurasikan URL tempat Anda ingin menerima Callback.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL Webhook"
         },
         "SUBMIT_BUTTON": "Buat Channel API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Channel Email",
-        "DESC": "Integrasikan kotak masuk email Anda.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nama Channel",
           "PLACEHOLDER": "Harap masukkan nama channel",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agen",
         "DESC": "Di sini Anda dapat menambahkan agen untuk mengelola kotak masuk yang baru Anda buat. Hanya agen terpilih ini yang akan memiliki akses ke kotak masuk Anda. Agen yang bukan bagian dari kotak masuk ini tidak akan dapat melihat atau menanggapi pesan di kotak masuk ini saat mereka masuk. <br> <b> Keterangan: </b> Sebagai administrator, jika Anda memerlukan akses ke semua kotak masuk, Anda harus menambahkan diri Anda sebagai agen ke semua kotak masuk yang Anda buat.",
-        "VALIDATION_ERROR": "Tambahkan setidaknya satu agen ke Kotak Masuk baru Anda",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pilih agen untuk kotak masuk"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Ramah",
@@ -508,7 +508,7 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Izinkan pesan setelah percakapan diselesaikan",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Izinkan pengguna akhir mengirim pesan bahkan setelah percakapan diselesaikan.",
       "WHATSAPP_SECTION_SUBHEADER": "Kunci API ini digunakan untuk integrasi dengan API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Masukkan kunci yang diperbarui untuk digunakan untuk integrasi dengan API WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Perbarui Kunci API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Masukkan Kunci API baru di sini",
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Untuk mengaktifkan SMTP, konfigurasikan IMAP.",
       "UPDATE": "Perbarui setelan IMAP",
       "TOGGLE_AVAILABILITY": "Aktifkan konfigurasi IMAP untuk kotak masuk ini",
-      "TOGGLE_HELP": "Mengaktifkan IMAP akan membantu pengguna menerima email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Setelan IMAP berhasil diperbarui",
         "ERROR_MESSAGE": "Tidak dapat memperbarui setelan IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 345d8f2edfd4d..18b1438471d2f 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Kata sandi Anda berhasil diubah",
     "AFTER_EMAIL_CHANGED": "Profil Anda telah berhasil diperbarui, silakan masuk lagi dengan data akun yang baru diubah",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Foto Profil",
       "ERROR": "Perbaiki kesalahan formulir",
       "REMOVE_IMAGE": "Hapus",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token Akses",
-        "NOTE": "Token ini dapat digunakan jika Anda sedang membangun integrasi berbasis API"
+        "NOTE": "Token ini dapat digunakan jika Anda sedang membangun integrasi berbasis API",
+        "COPY": "Salin"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Pemberitahuan Audio",
         "NOTE": "Aktifkan pemberitahuan audio di dashboard untuk pesan dan percakapan baru.",
+        "ALERT_TYPES": {
+          "NONE": "Tidak ada",
+          "MINE": "Assigned",
+          "ALL": "Semua"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Jenis pemberitahuan:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Tidak ada",
           "ASSIGNED": "Percakapan yang ditetapkan",
           "ALL_CONVERSATIONS": "Semua Percakapan"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Preferensi notifikasi Anda berhasil diperbarui",
         "UPDATE_ERROR": "Terjadi kesalahan saat memperbarui preferensi, silakan coba lagi"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Buka sidebar Laporan",
       "MOVE_TO_NEXT_TAB": "Pindah ke tab berikutnya dalam daftar percakapan",
       "GO_TO_SETTINGS": "Buka Pengaturan",
-      "SWITCH_CONVERSATION_STATUS": "Beralih ke status percakapan berikutnya",
       "SWITCH_TO_PRIVATE_NOTE": "Beralih ke Catatan Pribadi",
       "SWITCH_TO_REPLY": "Beralih ke Balasan",
       "TOGGLE_SNOOZE_DROPDOWN": "Buka/Tutup dropdown penundaan"
diff --git a/app/javascript/dashboard/i18n/locale/id/sla.json b/app/javascript/dashboard/i18n/locale/id/sla.json
index c12c5a6c9fdd8..dde6eed17e480 100644
--- a/app/javascript/dashboard/i18n/locale/id/sla.json
+++ b/app/javascript/dashboard/i18n/locale/id/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/is/bulkActions.json b/app/javascript/dashboard/i18n/locale/is/bulkActions.json
index dbdb2d9700fa8..fbdab2cdb191c 100644
--- a/app/javascript/dashboard/i18n/locale/is/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/is/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/is/contact.json b/app/javascript/dashboard/i18n/locale/is/contact.json
index b3f3dd4e73303..507ca46641327 100644
--- a/app/javascript/dashboard/i18n/locale/is/contact.json
+++ b/app/javascript/dashboard/i18n/locale/is/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Sérsniðnir Eiginleikar",
       "CONTACT_LABELS": "Merkingar Tengiliða",
-      "PREVIOUS_CONVERSATIONS": "Fyrri samtöl"
+      "PREVIOUS_CONVERSATIONS": "Fyrri samtöl",
+      "NO_RECORDS_FOUND": "Engir eiginleikar fundust"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/is/conversation.json b/app/javascript/dashboard/i18n/locale/is/conversation.json
index 9d582670f0ab9..072148ec58084 100644
--- a/app/javascript/dashboard/i18n/locale/is/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/is/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "Engir eiginleikar fundust",
     "UPDATE": {
       "SUCCESS": "Eiginleika breytt",
       "ERROR": "Ekki er hægt að uppfæra eigindina. Vinsamlegast reyndu aftur síðar"
diff --git a/app/javascript/dashboard/i18n/locale/is/datePicker.json b/app/javascript/dashboard/i18n/locale/is/datePicker.json
new file mode 100644
index 0000000000000..90bf342a9c539
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/is/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Síðustu 7 daga",
+      "LAST_30_DAYS": "Síðustu 30 daga",
+      "LAST_3_MONTHS": "Síðustu 3 mánuði",
+      "LAST_6_MONTHS": "Síðustu 6 mánuði",
+      "LAST_YEAR": "Síðasta ár",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
index 8c6e8d3959144..02e892c26b474 100644
--- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Almennar",
       "REPORTS": "Skýrslur",
       "CONVERSATION": "Samtal",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Breyta úthlutun",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Breyta Teymi",
diff --git a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
index bf624f7e52dda..259c9193f91e3 100644
--- a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Bæta þjónustufulltrúum á nýja innhólfið."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Þú ert tilbúin til að halda áfram!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Veldu síðu úr listanum",
         "INBOX_NAME": "Nafn Innhólfs",
         "ADD_NAME": "Bættu við nafni á innhólfið",
-        "PICK_NAME": "Veldu nafn fyrir innhólfið",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Veldu gildi"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Vefkróks URL",
-          "PLACEHOLDER": "Sláðu inn URL Vefkróks",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Vinsamlega skráðu gilt URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Lykill",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Það er nauðsynlegt að fylla út þennan reit"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Það er nauðsynlegt að fylla út þennan reit"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Sláðu inn staðfestingartákn sem þú vilt stilla fyrir Facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Vinsamlegast sláðu inn gilt gildi."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Stilltu slóðina þar sem þú vilt fá svarhringingar á atburði.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL Vefkróks"
         },
         "SUBMIT_BUTTON": "Skrá API Rás",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Tölvupóst Rás",
-        "DESC": "Innleiða tölvupósthólfið þitt.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nafn Rásar",
           "PLACEHOLDER": "Vinsamlegast sláðu inn nafn rásar",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Þjónustufulltrúar",
         "DESC": "Hér geturðu bætt við þjónustufulltrúum til að hafa umsjón með nýstofnuða innhólfinu þínu. Aðeins þessir völdu Þjónustufulltrúar munu hafa aðgang að innhólfinu þínu. Þjónustufulltrúar sem eru ekki hluti af þessu innhólfi munu ekki geta séð eða svarað skilaboðum í þessu innhólfi þegar þeir skrá sig inn. <br> <b>PS:</b> Sem stjórnandi, ef þú þarft aðgang að öllum pósthólfum, ættir þú að bæta sjálfum þér sem þjónustufulltrúa við öll innhólf sem þú býrð til.",
-        "VALIDATION_ERROR": "Bættu við að minnsta kosti einum þjónustufulltrúa á innhólfið",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Veldu þjónustufulltrúa fyrir innhólfið"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Leyfa skilaboð eftir að samtal hefur verið leyst",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Leyfa endanotendum að senda skilaboð jafnvel eftir að samtalið er leyst.",
       "WHATSAPP_SECTION_SUBHEADER": "Þessi API lykill er notaður fyrir samþættingu við WhatsApp API.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Lykill",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Uppfæra",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Vinsamlegast tilltu IMAP til að virkja SMTP.",
       "UPDATE": "Uppfæra IMAP stilingar",
       "TOGGLE_AVAILABILITY": "Virkja IMAP stillingar fyrir þetta innhólf",
-      "TOGGLE_HELP": "Að virkja IMAP mun hjálpa notandanum að fá tölvupóst",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP stillingar voru uppfærðar",
         "ERROR_MESSAGE": "Tókst ekki að uppfæra IMAP stillingar"
diff --git a/app/javascript/dashboard/i18n/locale/is/settings.json b/app/javascript/dashboard/i18n/locale/is/settings.json
index d39d973af7fea..32acdec203b80 100644
--- a/app/javascript/dashboard/i18n/locale/is/settings.json
+++ b/app/javascript/dashboard/i18n/locale/is/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Lykilorðinu þínu hefur verið breytt",
     "AFTER_EMAIL_CHANGED": "Prófíllinn þinn hefur verið uppfærður, vinsamlegast skráðu þig inn aftur þar sem innskráningarskilríkjum þínum er breytt",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Prófílmynd",
       "ERROR": "Vinsamlegast lagfærðu villurnar",
       "REMOVE_IMAGE": "Fjarlægja",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Aðgangslykill",
-        "NOTE": "Þetta token er hægt að nota ef þú ert að byggja upp API byggða samþættingu"
+        "NOTE": "Þetta token er hægt að nota ef þú ert að byggja upp API byggða samþættingu",
+        "COPY": "Afrita"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Hljóðtilkynningar",
         "NOTE": "Virkjaðu hljóðtilkynningar á mælaborðinu fyrir ný skilaboð og samtöl.",
+        "ALERT_TYPES": {
+          "NONE": "Enginn",
+          "MINE": "Assigned",
+          "ALL": "Allt"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Enginn",
           "ASSIGNED": "Úthlutuð Samtöl",
           "ALL_CONVERSATIONS": "Öll Samtöl"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Tölvupóstfang",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Tilkynningarstillingarnar þínar hafa verið uppfærðar",
         "UPDATE_ERROR": "Villa kom upp við að uppfæra stillingarnar, vinsamlegast reyndu aftur"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/is/sla.json b/app/javascript/dashboard/i18n/locale/is/sla.json
index 69ace6258c444..1e2260904f040 100644
--- a/app/javascript/dashboard/i18n/locale/is/sla.json
+++ b/app/javascript/dashboard/i18n/locale/is/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/it/bulkActions.json b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
index 5a4465ac5c530..320d61f817cde 100644
--- a/app/javascript/dashboard/i18n/locale/it/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Caricamento agenti",
     "UPDATE": {
       "CHANGE_STATUS": "Cambia stato",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Posticipa fino alla prossima risposta.",
+      "SNOOZE_UNTIL": "Posticipa",
       "UPDATE_SUCCESFUL": "Stato della conversazione aggiornata correttamente.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 4c02aa1689216..02e813746c013 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Attributi personalizzati",
       "CONTACT_LABELS": "Etichette di contatto",
-      "PREVIOUS_CONVERSATIONS": "Conversazioni precedenti"
+      "PREVIOUS_CONVERSATIONS": "Conversazioni precedenti",
+      "NO_RECORDS_FOUND": "Nessun attributo trovato"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index 164dd73c3b470..494b9f095cfcb 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Crea attributo",
+    "NO_RECORDS_FOUND": "Nessun attributo trovato",
     "UPDATE": {
       "SUCCESS": "Attributo aggiornato con successo",
       "ERROR": "Impossibile aggiornare l'attributo. Riprova più tardi"
diff --git a/app/javascript/dashboard/i18n/locale/it/datePicker.json b/app/javascript/dashboard/i18n/locale/it/datePicker.json
new file mode 100644
index 0000000000000..5fde2beecdd31
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Applica",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Ultimi 7 giorni",
+      "LAST_30_DAYS": "Ultimi 30 giorni",
+      "LAST_3_MONTHS": "Ultimi 3 mesi",
+      "LAST_6_MONTHS": "Ultimi 6 mesi",
+      "LAST_YEAR": "Ultimo anno",
+      "CUSTOM_RANGE": "Intervallo di date personalizzato"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index 9041bc210cae0..ee72c3e972f39 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Generale",
       "REPORTS": "Rapporti",
       "CONVERSATION": "Conversazioni",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Cambia assegnatario",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Cambia Team",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index b83dbb54721cb..0018cdf25fe7b 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Aggiungi agenti alla casella creata."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "Finitura",
         "body": "Sei pronto per iniziare!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Seleziona una pagina dalla lista",
         "INBOX_NAME": "Nome casella",
         "ADD_NAME": "Aggiungi un nome per la tua casella",
-        "PICK_NAME": "Scegli un nome per la tua casella",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Scegli un valore"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "PLACEHOLDER": "Inserisci l'URL del Webhook",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Inserisci un URL valido"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Chiave API",
-            "PLACEHOLDER": "Inserisci la tua chiave di Bandwith API",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Questo campo è obbligatorio"
           },
           "API_SECRET": {
             "LABEL": "Chiave API segreta",
-            "PLACEHOLDER": "Inserisci la tua chiave segreta di Bandwith API",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Questo campo è obbligatorio"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook verifica token",
-          "PLACEHOLDER": "Inserisci un token di verifica che vuoi configurare peri webhook di facebook.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Inserisci un valore valido."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "SUBTITLE": "Configurare l'URL in cui si desidera ricevere i callback sugli eventi.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL del webhook"
         },
         "SUBMIT_BUTTON": "Crea un canale API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Canale email",
-        "DESC": "Integra la casella di posta in arrivo.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nome canale",
           "PLACEHOLDER": "Inserisci un nome del canale",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenti",
         "DESC": "Qui puoi aggiungere agenti per gestire la tua casella appena creata. Solo questi agenti selezionati avranno accesso alla tua casella. Gli operatori che non fanno parte di questa casella non saranno in grado di vedere o rispondere ai messaggi in questa casella quando effettuano il login. <br> <b>PS:</b> come amministratore, se hai bisogno di accedere a tutte le caselle, dovresti aggiungerti come agente a tutte le caselle che crei.",
-        "VALIDATION_ERROR": "Aggiungi almeno un agente alla tua nuova casella",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Scegli gli agenti per la casella"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Consenti messaggi dopo la risoluzione della conversazione",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Consenti agli utenti finali di inviare messaggi anche dopo la risoluzione della conversazione.",
       "WHATSAPP_SECTION_SUBHEADER": "Questa chiave API viene utilizzata per l'integrazione con le API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Chiave API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Aggiorna",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook verifica token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Per abilitare SMTP, configurare IMAP.",
       "UPDATE": "Aggiorna impostazioni IMAP",
       "TOGGLE_AVAILABILITY": "Abilita la configurazione IMAP per questa casella",
-      "TOGGLE_HELP": "Abilitare IMAP aiuterà l'utente a ricevere email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Impostazioni IMAP aggiornate con successo",
         "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 2294cb65dfc3c..7f3ff362726db 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "La tua password è stata modificata con successo",
     "AFTER_EMAIL_CHANGED": "Il tuo profilo è stato aggiornato correttamente, effettua nuovamente l'accesso, siccome le tue credenziali di accesso sono state modificate",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Immagine del profilo",
       "ERROR": "Correggi gli errori del modulo",
       "REMOVE_IMAGE": "Rimuovi",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token di accesso",
-        "NOTE": "Questo token può essere usato se stai costruendo un'integrazione basata su API"
+        "NOTE": "Questo token può essere usato se stai costruendo un'integrazione basata su API",
+        "COPY": "Copia"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Notifiche audio",
         "NOTE": "Abilita le notifiche audio nella dashboard per nuovi messaggi e conversazioni.",
+        "ALERT_TYPES": {
+          "NONE": "Nessuno",
+          "MINE": "Assigned",
+          "ALL": "Tutti"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Nessuno",
           "ASSIGNED": "Conversazioni assegnate",
           "ALL_CONVERSATIONS": "Tutte le conversazioni"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Le preferenze per le notifiche sono state aggiornate con successo",
         "UPDATE_ERROR": "C'è stato un errore durante l'aggiornamento delle preferenze, si prega di riprovare"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Vai alla barra laterale dei rapporti",
       "MOVE_TO_NEXT_TAB": "Vai alla scheda successiva nell'elenco delle conversazioni",
       "GO_TO_SETTINGS": "Vai alle impostazioni",
-      "SWITCH_CONVERSATION_STATUS": "Passa allo stato successivo della conversazione",
       "SWITCH_TO_PRIVATE_NOTE": "Passa alle note private",
       "SWITCH_TO_REPLY": "Passa a Risposta",
       "TOGGLE_SNOOZE_DROPDOWN": "Attiva/Disattiva sospensione a discesa"
diff --git a/app/javascript/dashboard/i18n/locale/it/sla.json b/app/javascript/dashboard/i18n/locale/it/sla.json
index bc5bfea13771a..dd1a06481f535 100644
--- a/app/javascript/dashboard/i18n/locale/it/sla.json
+++ b/app/javascript/dashboard/i18n/locale/it/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ja/bulkActions.json b/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
index 029b191a981fb..223ceeb877fd6 100644
--- a/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "エージェントを読み込む",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "スヌーズ",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 59cc3cab7c534..20a70df5b1ab9 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "カスタム属性",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "前の会話"
+      "PREVIOUS_CONVERSATIONS": "前の会話",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 8b7084fbd1f89..f040383237f56 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ja/datePicker.json b/app/javascript/dashboard/i18n/locale/ja/datePicker.json
new file mode 100644
index 0000000000000..c31094a41976e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "過去 7 日間",
+      "LAST_30_DAYS": "過去 30 日間",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 0127bf42c7211..df9e36055d8bf 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "レポート",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 10ff561894bf3..954d374f2d28e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "作成した受信トレイに担当者を追加します。"
       },
       {
-        "title": "ほら、",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "すべての準備が完了しました！"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "リストからページを選択",
         "INBOX_NAME": "受信トレイ名",
         "ADD_NAME": "受信トレイに名前をつける",
-        "PICK_NAME": "受信トレイの名前を選択",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "値を選択"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "有効な URL を入力してください"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "このフィールドは必須項目です"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "このフィールドは必須項目です"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "イベントのコールバックを受信するURLを設定してください。",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "API チャンネルを作成",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Eメールチャンネル",
-        "DESC": "メール受信トレイを連携する",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "チャンネル名",
           "PLACEHOLDER": "チャンネル名を入力してください",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "担当者",
         "DESC": "ここでは、新しく作成した受信トレイを管理するエージェントを追加できます。選択された担当者のみが受信トレイにアクセスできます。 この受信トレイに割り当てられていない担当者は、ログイン時にこの受信トレイ内のメッセージを表示または応答することができません。 <br> <b>PS:</b> 管理者として、すべての受信ボックスにアクセスする必要がある場合、 あなたが作成したすべての受信トレイに担当者として自分自身を追加する必要があります。",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 152aac5dfcef0..ddac71cdbf04f 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "あなたのプロフィールは正常に更新されました。ログイン情報（パスワード等）が変更されたため、再度ログインしてください。",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "プロフィール画像",
       "ERROR": "正しくフォームに入力してください",
       "REMOVE_IMAGE": "削除",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "アクセストークン",
-        "NOTE": "このトークンは、API 連携を構築する場合に利用します。"
+        "NOTE": "このトークンは、API 連携を構築する場合に利用します。",
+        "COPY": "コピー"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "該当なし",
+          "MINE": "Assigned",
+          "ALL": "すべて"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "該当なし",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Eメール",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "通知設定が正常に更新されました",
         "UPDATE_ERROR": "設定の更新中にエラーが発生しました。もう一度やり直して下さい。"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ja/sla.json b/app/javascript/dashboard/i18n/locale/ja/sla.json
index f55832270dfad..c8818fabbe476 100644
--- a/app/javascript/dashboard/i18n/locale/ja/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ja/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ka/bulkActions.json b/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ka/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ka/contact.json b/app/javascript/dashboard/i18n/locale/ka/contact.json
index 939138482f9b9..7a4a3af3721fa 100644
--- a/app/javascript/dashboard/i18n/locale/ka/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ka/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ka/conversation.json b/app/javascript/dashboard/i18n/locale/ka/conversation.json
index f1b7d1fb92c10..cc3e4569bc729 100644
--- a/app/javascript/dashboard/i18n/locale/ka/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ka/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ka/datePicker.json b/app/javascript/dashboard/i18n/locale/ka/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
index ba83549cf10ac..2cd3c1f065788 100644
--- a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
index 11a6a914aea0c..fc8d9982778da 100644
--- a/app/javascript/dashboard/i18n/locale/ka/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ka/sla.json b/app/javascript/dashboard/i18n/locale/ka/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/ka/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ka/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ko/bulkActions.json b/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
index bf75d939937be..2a774aecd95b2 100644
--- a/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 10e5d533d5d3d..a73b63deb7d08 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "사용자 지정 특성",
       "CONTACT_LABELS": "연락처 라벨",
-      "PREVIOUS_CONVERSATIONS": "이전 대화"
+      "PREVIOUS_CONVERSATIONS": "이전 대화",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index dfcce45985337..ba8552a94ffe1 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ko/datePicker.json b/app/javascript/dashboard/i18n/locale/ko/datePicker.json
new file mode 100644
index 0000000000000..03ba71742dfb8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "지난 7일",
+      "LAST_30_DAYS": "지난 30일",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 2dc7b730a0d79..a2eb25cd70cea 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "보고서",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index 110a49b468aca..99d402fef6b0d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "생성된 받은 메시지함에 에이전트를 추가하십시오."
       },
       {
-        "title": "여기 있습니다.",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "준비가 완료되었습니다."
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "목록에서 페이지 선택",
         "INBOX_NAME": "받은 메시지함 이름",
         "ADD_NAME": "받은 메시지함의 이름 추가",
-        "PICK_NAME": "받은 편지함 이름 선택",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "값 선택"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "웹훅 URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "올바른 URL을 입력하십시오."
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "해당 입력란은 필수 입력 사항입니다."
         },
         "PHONE_NUMBER": {
-          "LABEL": "휴대폰 번호",
+          "LABEL": "전화 번호",
           "PLACEHOLDER": "메시지를 보낼 전화 번호를 입력하십시오.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "해당 입력란은 필수 입력 사항입니다."
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "해당 입력란은 필수 입력 사항입니다."
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "웹훅 URL",
-          "SUBTITLE": "이벤트에 대한 콜백을 수신할 URL을 구성하십시오.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "웹훅 URL"
         },
         "SUBMIT_BUTTON": "API 채널 만들기",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "이메일 채널",
-        "DESC": "이메일 받은 편지함을 통합하십시오.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "채널 이름",
           "PLACEHOLDER": "채널 이름을 입력하십시오.",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "에이전트",
         "DESC": "여기서 에이전트를 추가하여 새로 만든 받은 메시지함을 관리할 수 있습니다. 선택된 에이전트만 받은 메시지함에 엑세스할 수 있습니다. 해당 받은 메시지함에 선택되지 않은 에이전트는 메시지를 보거나 응답할 수 없습니다. <br> <b>추신:</b> 관리자로서 모든 받은 문서에 대한 액세스 권한이 필요한 경우, 자신이 만든 모든 받은 문서에 자신을 에이전트로 추가해야 합니다.",
-        "VALIDATION_ERROR": "새 받은 메시지함에 하나 이상의 에이전트 추가",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "받은 메시지함에 대한 에이전트 선택"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "업데이트",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index c48c8934a9716..b8628279fa128 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "프로필이 성공적으로 업데이트되었습니다. 로그인 자격 증명이 변경된 경우 다시 로그인하십시오.",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "프로필 이미지",
       "ERROR": "양식 오류를 수정하십시오",
       "REMOVE_IMAGE": "제거",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "엑세스 토큰",
-        "NOTE": "API 기반 통합을 구축하는 경우 이 토큰을 사용할 수 있음"
+        "NOTE": "API 기반 통합을 구축하는 경우 이 토큰을 사용할 수 있음",
+        "COPY": "복사"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "음성 알림",
         "NOTE": "대시보드에서 새 메시지 및 대화에 대한 오디오 알림을 활성화합니다.",
+        "ALERT_TYPES": {
+          "NONE": "없음",
+          "MINE": "Assigned",
+          "ALL": "모두"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "없음",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "이메일",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "알림 기본 설정이 성공적으로 업데이트됨",
         "UPDATE_ERROR": "기본 설정을 업데이트하는 동안 오류가 발생했습니다. 다시 시도하십시오."
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ko/sla.json b/app/javascript/dashboard/i18n/locale/ko/sla.json
index 8080d2b80e605..94ac237d333ac 100644
--- a/app/javascript/dashboard/i18n/locale/ko/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ko/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/lt/bulkActions.json b/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
index 976da20dbce5e..b89464acdf189 100644
--- a/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Agentai užkraunami",
     "UPDATE": {
       "CHANGE_STATUS": "Pakeisti būseną",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Atidėti iki kito atsakymo.",
+      "SNOOZE_UNTIL": "Atidėti",
       "UPDATE_SUCCESFUL": "Pokalbio būsena atnaujinta sėkmingai.",
       "UPDATE_FAILED": "Nepavyko atnaujinti pokalbių. Bandykite dar kartą."
     },
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index cc46162ffc800..fa49f97492200 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Personalizuoti Požymiai",
       "CONTACT_LABELS": "Kontakto Žymeklis",
-      "PREVIOUS_CONVERSATIONS": "Ankstesni pokalbiai"
+      "PREVIOUS_CONVERSATIONS": "Ankstesni pokalbiai",
+      "NO_RECORDS_FOUND": "Požymių nerasta"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Eksportuoti Kontaktus",
       "MESSAGE": "Ar esate tikri, kad norite išeksportuoti visus kontaktus?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Taip, išeksportuoti",
       "NO": "Ne, atšaukti"
     }
diff --git a/app/javascript/dashboard/i18n/locale/lt/conversation.json b/app/javascript/dashboard/i18n/locale/lt/conversation.json
index 278ecfe51c87a..ac106c525606e 100644
--- a/app/javascript/dashboard/i18n/locale/lt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Sukurti požymį",
+    "NO_RECORDS_FOUND": "Požymių nerasta",
     "UPDATE": {
       "SUCCESS": "Požymis atnaujintas sėkmingai",
       "ERROR": "Nepavyko atnaujinti požymio. Pabandykite dar kartą vėliau"
diff --git a/app/javascript/dashboard/i18n/locale/lt/datePicker.json b/app/javascript/dashboard/i18n/locale/lt/datePicker.json
new file mode 100644
index 0000000000000..307e936c45f2a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lt/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Taikyti",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Paskutines 7 dienas",
+      "LAST_30_DAYS": "Paskutines 30 dienų",
+      "LAST_3_MONTHS": "Paskutinius 3 mėnesius",
+      "LAST_6_MONTHS": "Paskutinius 6 mėnesius",
+      "LAST_YEAR": "Paskutinius metus",
+      "CUSTOM_RANGE": "Pritaikytas datos intervalas"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index 1b38b01418944..b3488d4d06c59 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Pagrindinis",
       "REPORTS": "Ataskaitos",
       "CONVERSATION": "Pokalbis",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Pakeisti Priskirtąjį",
       "CHANGE_PRIORITY": "Pakeisti Prioritetą",
       "CHANGE_TEAM": "Pakeisti Komandą",
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index 2ea756b3075b5..cdc9ed65f41f6 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Pridėti agentus pire gautų laiškų oplanko."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Esate pasiruošę pradėti!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Psirinkti puslapį iš sąrašo",
         "INBOX_NAME": "Gautų Laiškų Aplanko Pavadinimas",
         "ADD_NAME": "Prašome įrašyti gautų laiškų aplanko pavadinimą",
-        "PICK_NAME": "Pasirinkite Gautų Laiškų Aplanko Pavadinimą",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pasirinkti reikšmę"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Įveskite savo Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Prašome įvesti tesingą URL adresą"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API raktas",
-            "PLACEHOLDER": "Įveskite savo Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Šis laukas yra privalomas"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Įveskite savo Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Šis laukas yra privalomas"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Tikrinti Prieigos Raktą",
-          "PLACEHOLDER": "Įveskite patvirtinimo prieigos raktą, kurį norite sukonfigūruoti Facebook Webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Prašau įveskite teisingą reikšmę."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Sukonfigūruokite URL, į kurį norite gauti atgalinius skambučius.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Sukurti API kanalą",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "El. pašto kanalas",
-        "DESC": "Integruokite el. pašto dėžutę.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Kanalo Pavadinimas",
           "PLACEHOLDER": "Prašome įrašyti kanalo pavadinimą",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agentai",
         "DESC": "Čia galite pridėti agentų, kad galėtumėte tvarkyti naujai sukurtus gautų laiškų aplanką. Tik šie pasirinkti agentai turės prieigą prie jūsų gautų laiškų aplanko. Agentai, kurie nėra šio dalis, prisijungę negalės matyti pranešimų arba atsakyti į juos. <br> <b>PS:</b> Jei jums reikia prieigos prie visų gautų laiškų aplankų, turėtumėte įtraukti save kaip agentą prie visų sukurtų aplankų, kaip administratorius.",
-        "VALIDATION_ERROR": "Pridėkite bent vieną agentą prie naujojo gautų laiškų aplanko",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pasirinkite agentus gautų laiškų aplankams"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Siuntėjo vardas",
-        "SUB_TEXT": "Pasirinkite vardą, kuris bus rodomas jūsų klientui, kai jis gauna el. laiškus iš jūsų agentų.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "Pvz:",
         "FRIENDLY": {
           "TITLE": "Draugiškas",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Leisti pranešimus pokalbiui pasibaigus",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Leiskite galutiniams vartotojams siųsti pranešimus net pokalbiui pasibaigus.",
       "WHATSAPP_SECTION_SUBHEADER": "Šis API Raktas naudojamas integracijai su WhatsApp API.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Įveskite atnaujintą raktą, kuris bus naudojamas integruojant su WhatsApp API.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API raktas",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Atnaujinti API raktą",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Įveskite naują API Raktą čia",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atnaujinti",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Tikrinti Prieigos Raktą",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Patikros Prieigos Raktas",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Šis prieigos raktas naudojamas „webhook“ galutinio taško autentiškumui patikrinti.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atnaujinkite išankstinio pokalbio internetu formos nustatymus"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Norėdami įjungti SMTP, sukonfigūruokite IMAP.",
       "UPDATE": "Atnaujinti IMAP nustatymus",
       "TOGGLE_AVAILABILITY": "Leisti IMAP konfigūraciją šiam gautų laiškų aplankui",
-      "TOGGLE_HELP": "Įjungus IMAP, vartotojas galės gauti el. laiškus",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP nustatymai atnaujinti sėkmingai",
         "ERROR_MESSAGE": "Nepavyko atnaujinti IMAP nustatymų"
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index 13ac1d879e2d9..e1e9a17e84673 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Jūsų slaptažodis buvo sėkmingai pakeistas",
     "AFTER_EMAIL_CHANGED": "Jūsų profilis buvo sėkmingai atnaujintas, prisijunkite dar kartą, nes jūsų prisijungimo duomenys yra pakeisti",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profilio paveikslėlis",
       "ERROR": "Ištaisykite formos klaidas",
       "REMOVE_IMAGE": "Pašalinti",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Prieeigos raktas",
-        "NOTE": "Šis prieigos raktas gali būti naudojamas, jei kuriate API pagrįstą integraciją"
+        "NOTE": "Šis prieigos raktas gali būti naudojamas, jei kuriate API pagrįstą integraciją",
+        "COPY": "Kopijuoti"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Garsiniai Perspėjimai",
         "NOTE": "Prietaisų skydelyje įgalinkite garso perspėjimus apie naujus pranešimus ir pokalbius.",
+        "ALERT_TYPES": {
+          "NONE": "Nėra",
+          "MINE": "Assigned",
+          "ALL": "Visi"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Įspėjimo įvykiai:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Nėra",
           "ASSIGNED": "Priskirti Pokalbiai",
           "ALL_CONVERSATIONS": "Visi Pokalbiai"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "El. paštas",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Jūsų perspėjimų nuostatos sėkmingai atnaujintos",
         "UPDATE_ERROR": "Atnaujinant nuostatas įvyko klaida, pabandykite dar kartą"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Eikite į Ataskaitų šoninę juostą",
       "MOVE_TO_NEXT_TAB": "Pereiti į kitą skirtuką pokalbių sąraše",
       "GO_TO_SETTINGS": "Eiti į Nustatymus",
-      "SWITCH_CONVERSATION_STATUS": "Perjungti į kitą pokalbio būseną",
       "SWITCH_TO_PRIVATE_NOTE": "Perjungti į Privatų užrašą",
       "SWITCH_TO_REPLY": "Perjungti į Atsakyti",
       "TOGGLE_SNOOZE_DROPDOWN": "Perjungti snooze išskleidžiamąjį meniu"
diff --git a/app/javascript/dashboard/i18n/locale/lt/sla.json b/app/javascript/dashboard/i18n/locale/lt/sla.json
index 3e2a553149346..4016b5024f22a 100644
--- a/app/javascript/dashboard/i18n/locale/lt/sla.json
+++ b/app/javascript/dashboard/i18n/locale/lt/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/lv/bulkActions.json b/app/javascript/dashboard/i18n/locale/lv/bulkActions.json
index a2ad9bfb99585..42b88f9c4bd21 100644
--- a/app/javascript/dashboard/i18n/locale/lv/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/lv/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Notiek aģentu ielāde",
     "UPDATE": {
       "CHANGE_STATUS": "Mainīt statusu",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Atlikt līdz nākamajai atbildei.",
+      "SNOOZE_UNTIL": "Atlikt",
       "UPDATE_SUCCESFUL": "Sarunas statuss ir veiksmīgi atjaunināts.",
       "UPDATE_FAILED": "Neizdevās atjaunināt sarunas. Lūdzu mēģiniet vēlreiz."
     },
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index 4ffdfd5bc3fd4..f14e919580e6f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Pielāgot Īpašības",
       "CONTACT_LABELS": "Kontaktpersonu Etiķetes",
-      "PREVIOUS_CONVERSATIONS": "Iepriekšējās Sarunas"
+      "PREVIOUS_CONVERSATIONS": "Iepriekšējās Sarunas",
+      "NO_RECORDS_FOUND": "Īpašības nav atrastas"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Eksportēt Kontaktpersonas",
       "MESSAGE": "Vai vēlaties eksportēt visas kontaktpersonas?",
+      "FILTERED_MESSAGE": "Vai tiešām vēlaties eksportēt visas filtrētās kontaktpersonas?",
       "YES": "Jā, Eksportēt",
       "NO": "Nē, Atcelt"
     }
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index fc29f433d4418..1bf543b8a2084 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Izveidot Īpašību",
+    "NO_RECORDS_FOUND": "Īpašības nav atrastas",
     "UPDATE": {
       "SUCCESS": "Īpašība ir veiksmīgi atjaunināta",
       "ERROR": "Nevar atjaunināt īpašību. Lūdzu, pamēģiniet vēlāk vēlreiz"
diff --git a/app/javascript/dashboard/i18n/locale/lv/datePicker.json b/app/javascript/dashboard/i18n/locale/lv/datePicker.json
new file mode 100644
index 0000000000000..b1e7894ab0cda
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Pielietot",
+    "CLEAR_BUTTON": "Notīrīt",
+    "DATE_RANGE_INPUT": {
+      "START": "Sākuma Datums",
+      "END": "Beigu Datums"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATUMU DIAPAZONS",
+      "LAST_7_DAYS": "Pēdējās 7 dienas",
+      "LAST_30_DAYS": "Pēdējās 30 dienas",
+      "LAST_3_MONTHS": "Pēdējie 3 mēneši",
+      "LAST_6_MONTHS": "Pēdējie 6 mēneši",
+      "LAST_YEAR": "Pagājušais gads",
+      "CUSTOM_RANGE": "Pielāgots datumu diapazons"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index cda081602ce4a..860edb902c4cc 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Vispārēji",
       "REPORTS": "Pārskati",
       "CONVERSATION": "Saruna",
+      "BULK_ACTIONS": "Lielapjoma Darbības",
       "CHANGE_ASSIGNEE": "Mainīt Pilnvaroto",
       "CHANGE_PRIORITY": "Mainīt prioritāti",
       "CHANGE_TEAM": "Mainīt Komandu",
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index f31abe266a8fc..e39f07ee581a9 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Izvēlieties lapu no saraksta",
         "INBOX_NAME": "Iesūtnes Nosaukums",
         "ADD_NAME": "Pievienojiet savas iesūtnes nosaukumu",
-        "PICK_NAME": "Izvēlieties savai iesūtnei nosaukumu",
+        "PICK_NAME": "Lūdzu ievadiet Iesūtnes nosaukumu",
         "PICK_A_VALUE": "Izvēlieties vērtību"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Ievadiet savu Webhook URL",
+          "PLACEHOLDER": "Lūdzu ievadiet Webhook URL",
           "ERROR": "Lūdzu, ievadiet derīgu URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "Šis lauks ir nepieciešams"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Tālruņa numurs",
+          "LABEL": "Telefona numurs",
           "PLACEHOLDER": "Lūdzu, ievadiet tālruņa numuru, no kura tiks nosūtīts ziņojums.",
           "ERROR": "Lūdzu, norādiet derīgu tālruņa numuru, kas sākas ar zīmi “+” un nesatur atstarpes."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API atslēga",
-            "PLACEHOLDER": "Lūdzu, ievadiet savu Bandwith API atslēgu",
+            "PLACEHOLDER": "Lūdzu ievadiet Bandwidth API Key",
             "ERROR": "Šis lauks ir nepieciešams"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Lūdzu, ievadiet savu Bandwith API Secret",
+            "PLACEHOLDER": "Lūdzu ievadiet Bandwidth API Secret",
             "ERROR": "Šis lauks ir nepieciešams"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Pārbaudes Token",
-          "PLACEHOLDER": "Ievadiet verifikācijas token, kuru vēlaties nokonfigurēt priekš Facebook webhooks.",
+          "PLACEHOLDER": "Ievadiet verifikācijas token, ko vēlaties izmantot priekš Facebook webhook.",
           "ERROR": "Lūdzu, ievadiet derīgu vērtību."
         },
         "API_KEY": {
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "E-pasta Kanāls",
-        "DESC": "Integrēt savu e-pasta iesūtni.",
+        "DESC": "Integrēt sava e-pasta iesūtni.",
         "CHANNEL_NAME": {
           "LABEL": "Kanāla Nosaukums",
           "PLACEHOLDER": "Lūdzu, ievadiet kanāla nosaukumu",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Aģenti",
         "DESC": "Šeit Jūs varat pievienot aģentus, lai pārvaldītu savu jaunizveidoto iesūtni. Tikai šiem atlasītajiem aģentiem būs piekļuve Jūsu iesūtnei. Aģenti, kas neietilpst šajā iesūtnē, nevarēs redzēt ziņojumus vai atbildēt uz ziņojumiem šajā iesūtnē, kad būs pierakstījušies sistēmā. <br> <b>PS:</b> Ja jums kā administratoram ir nepieciešama piekļuve pie visām iesūtnēm, jums ir jāpievieno sevi kā aģentu visām izveidotajām iesūtnēm.",
-        "VALIDATION_ERROR": "Pievienojiet savai jaunajai Iesūtnei vismaz vienu aģentu",
+        "VALIDATION_ERROR": "Pievienojiet savai jaunajai iesūtnei vismaz vienu aģentu",
         "PICK_AGENTS": "Izvēlieties aģentus priekš iesūtnes"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sūtītāja vārds",
-        "SUB_TEXT": "Izvēlieties vārdu, kas uzrādīsies Jūsu klientam kad viņš saņems e-pasta ziņojumus no Jūsu aģentiem.",
+        "SUB_TEXT": "Izvēlieties vārdu, kas tiks rādīts jūsu klientam, saņemot e-pasta ziņojumus no jūsu aģentiem.",
         "FOR_EG": "Piemēram:",
         "FRIENDLY": {
           "TITLE": "Draudzīgs",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Atļaut ziņojumus pēc sarunas pabeigšanas",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Ļaut galalietotājiem sūtīt ziņojumus pat pēc sarunas atrisināšanas.",
       "WHATSAPP_SECTION_SUBHEADER": "Šī API atslēga tiek izmantota integrācijai ar WhatsApp API.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Ievadiet atjaunināto atslēgu, kas tiks izmantota integrācijai ar WhatsApp API.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Ievadiet jauno API atslēgu, kas tiks izmantota integrācijai ar WhatsApp API.",
       "WHATSAPP_SECTION_TITLE": "API atslēga",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Atjaunināt API atslēgu",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Ievadiet šeit jauno API atslēgu",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atjaunināt",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Pārbaudes Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verifikācijas Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Šis marķieris tiek izmantots, lai pārbaudītu webhook endpoint autentiskumu.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atjaunināt pirms-tērzēšanas veidlapas iestatījumus"
     },
diff --git a/app/javascript/dashboard/i18n/locale/lv/report.json b/app/javascript/dashboard/i18n/locale/lv/report.json
index 97d3b886be712..5677165c77c7f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/report.json
+++ b/app/javascript/dashboard/i18n/locale/lv/report.json
@@ -140,7 +140,7 @@
     ],
     "BUSINESS_HOURS": "Darba Laiks",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "Notīrīt filtru",
       "EMPTY_LIST": "Nav atrasts"
     }
   },
@@ -518,13 +518,13 @@
     "DOWNLOAD_FAILED": "Neizdevās lejupielādēt SLA atskaites",
     "DROPDOWN": {
       "ADD_FIlTER": "Pievienot filtru",
-      "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_ALL": "Notīrīt visu",
+      "CLEAR_FILTER": "Notīrīt filtru",
       "EMPTY_LIST": "Nav atrasts",
-      "NO_FILTER": "No filters available",
-      "SEARCH": "Search filter",
+      "NO_FILTER": "Nav pieejami filtri",
+      "SEARCH": "Meklēšanas filtrs",
       "INPUT_PLACEHOLDER": {
-        "SLA": "SLA name",
+        "SLA": "SLA nosaukums",
         "AGENTS": "Aģenta vārds",
         "INBOXES": "Iesūtnes nosaukums",
         "LABELS": "Etiķetes nosaukums",
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index ef6b9fb3f54df..f3a0b36da6e49 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Jūsu parole ir veiksmīgi nomainīta",
     "AFTER_EMAIL_CHANGED": "Jūsu profils ir veiksmīgi atjaunināts. Lūdzu, atkārtoti pierakstieties, jo Jūsu akreditācijas dati ir mainīti",
     "FORM": {
+      "PICTURE": "Profila Attēls",
       "AVATAR": "Profila Attēls",
       "ERROR": "Lūdzu, izlabojiet veidlapas kļūdas",
       "REMOVE_IMAGE": "Noņemt",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Piekļuves Token",
-        "NOTE": "Šo token var izmantot, ja veidojat uz API balstītu integrāciju"
+        "NOTE": "Šo token var izmantot, ja veidojat uz API balstītu integrāciju",
+        "COPY": "Kopēt"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Paziņojumi",
         "NOTE": "Iespējot audio paziņojumus informācijas panelī jauniem ziņojumiem un sarunām.",
+        "ALERT_TYPES": {
+          "NONE": "Nav",
+          "MINE": "Piešķirts",
+          "ALL": "Visi"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Brīdinājumu notikumi:",
+          "TITLE": "Brīdinājuma notikumi sarunām:",
           "NONE": "Nav",
           "ASSIGNED": "Piešķirtās Sarunas",
           "ALL_CONVERSATIONS": "Visas Sarunas"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Nosūtīt e-pasta paziņojumus, ja sarunā tiek nokavēts nākamās atbildes SLA",
         "SLA_MISSED_RESOLUTION": "Nosūtīt e-pasta paziņojumus, ja sarunā tiek nokavēts atrisināšanas SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Paziņojumu preferences",
+        "TYPE_TITLE": "Paziņojuma veids",
+        "EMAIL": "E-pasts",
+        "PUSH": "Push paziņojums",
+        "TYPES": {
+          "CONVERSATION_CREATED": "Tiek izveidota jauna saruna",
+          "CONVERSATION_ASSIGNED": "Jums ir piešķirta saruna",
+          "CONVERSATION_MENTION": "Jūs esat pieminēts sarunā",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Piešķirtajā sarunā ir izveidots jauns ziņojums",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Dalības sarunā ir izveidots jauns ziņojums",
+          "SLA_MISSED_FIRST_RESPONSE": "Sarunā ir nokavēts pirmās atbildes SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "Sarunā ir nokavēts nākamās atbildes SLA",
+          "SLA_MISSED_RESOLUTION": "Sarunā ir nokavēts atrisināšanas SLA"
+        },
+        "BROWSER_PERMISSION": "Iespējojiet push paziņojumus savā pārlūkprogrammā, lai varētu tos saņemt"
+      },
       "API": {
         "UPDATE_SUCCESS": "Jūsu paziņojumu preferences ir veiksmīgi atjauninātas",
         "UPDATE_ERROR": "Preferenču atjaunināšanas laikā radās kļūda. Lūdzu, mēģiniet vēlreiz"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Doties uz Pārskatu sānjoslu",
       "MOVE_TO_NEXT_TAB": "Pāriet uz sarunu saraksta nākamo cilni",
       "GO_TO_SETTINGS": "Doties uz Iestatījumiem",
-      "SWITCH_CONVERSATION_STATUS": "Pārslēgties uz nākamās sarunas statusu",
       "SWITCH_TO_PRIVATE_NOTE": "Pārslēgties uz Privāto Piezīmi",
       "SWITCH_TO_REPLY": "Pārslēgties uz Atbildi",
       "TOGGLE_SNOOZE_DROPDOWN": "Pārslēgt atlikšanas nolaižamo izvēlni"
diff --git a/app/javascript/dashboard/i18n/locale/lv/sla.json b/app/javascript/dashboard/i18n/locale/lv/sla.json
index cfc634c3c45da..405c190578a6a 100644
--- a/app/javascript/dashboard/i18n/locale/lv/sla.json
+++ b/app/javascript/dashboard/i18n/locale/lv/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Pakalpojuma līmeņa līgumi (SLA) ir līgumi, kas nosaka skaidras cerības starp jūsu komandu un klientiem. Tie nosaka atbildes un atrisināšanas laika standartus, veidojot pārskatatbildības sistēmu un nodrošinot konsekventu, augstas kvalitātes pieredzi.",
     "LEARN_MORE": "Uzzināt vairāk par SLA",
     "LOADING": "Notiek SLA iegūšana",
+    "PAYWALL": {
+      "TITLE": "Pārejiet uz maksas versiju, lai izveidotu SLA",
+      "AVAILABLE_ON": "SLA funkcija ir pieejama tikai Business un Enterprise versijās.",
+      "UPGRADE_PROMPT": "Pārejiet uz maksas versiju, lai iegūtu piekļuvi pie papildu funkcijām. Piemēram: komandas pārvaldībai, automatizācijai, pielāgotiem atribūtiem, un citām.",
+      "UPGRADE_NOW": "Pāriet uz maksas versiju tagad",
+      "CANCEL_ANYTIME": "Jūs varat jebkurā laikā mainīt vai atcelt savu versiju"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "SLA funkcija ir pieejama tikai maksas versijās.",
+      "UPGRADE_PROMPT": "Pārejiet uz maksas versiju, lai piekļūtu papildu funkcijām. Piemēram: audita žurnāliem, aģentu kapacitātei, un citām.",
+      "ASK_ADMIN": "Lai pārietu uz maksas versiju, lūdzu sazinieties ar savu administratoru."
+    },
     "LIST": {
       "404": "Šim kontam nav piesaistīti SLA līgumi.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Slēpt {count} rindas"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ml/bulkActions.json b/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
index 54c937673a5a1..47c320750f86d 100644
--- a/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 2107fb3042304..ccf5b3f0302d7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "മുമ്പത്തെ സംഭാഷണങ്ങൾ"
+      "PREVIOUS_CONVERSATIONS": "മുമ്പത്തെ സംഭാഷണങ്ങൾ",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index bafd5d580a466..51b38cebe77d1 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ml/datePicker.json b/app/javascript/dashboard/i18n/locale/ml/datePicker.json
new file mode 100644
index 0000000000000..55c6777ba0ad0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "അപേക്ഷിക്കുക",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "കഴിഞ്ഞ 7 ദിവസം",
+      "LAST_30_DAYS": "കഴിഞ്ഞ 30 ദിവസം",
+      "LAST_3_MONTHS": "കഴിഞ്ഞ 3 മാസം",
+      "LAST_6_MONTHS": "കഴിഞ്ഞ 6 മാസം",
+      "LAST_YEAR": "കഴിഞ്ഞ വർഷം",
+      "CUSTOM_RANGE": "ഇഷ്‌ടാനുസൃത തീയതി ശ്രേണി"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index 220e515cef5df..71cb85b6b43ae 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "റിപ്പോർട്ടുകൾ",
       "CONVERSATION": "സംഭാഷണം",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 5dfd3e3adc19a..af719a2cb7a24 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "സൃഷ്ടിച്ച ഇൻ‌ബോക്സിലേക്ക് ഏജന്റുമാരെ ചേർക്കുക."
       },
       {
-        "title": "പൊളിച്ചു!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "എല്ലാം ഭംഗിയായി പാപര്യവസാനിച്ചിരിക്കുന്നു. വരൂ നമുക്ക്‌ പോകാം!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "ലിസ്റ്റിൽ നിന്ന് ഒരു പേജ് തിരഞ്ഞെടുക്കുക",
         "INBOX_NAME": "ഇൻ‌ബോക്സ് നാമം",
         "ADD_NAME": "നിങ്ങളുടെ ഇൻ‌ബോക്‌സിനായി ഒരു പേര് ചേർക്കുക",
-        "PICK_NAME": "നിങ്ങളുടെ ഇൻ‌ബോക്സിന്റെ പേര് തിരഞ്ഞെടുക്കുക",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "വെബ്‌ഹുക്ക് യുആർഎൽ",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "ദയവായി സാധുവായ ഒരു യുആർഎൽ നൽകുക"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
         },
         "PHONE_NUMBER": {
-          "LABEL": "ഫോൺ നമ്പർ",
+          "LABEL": "ഫോൺ നമ്പർ",
           "PLACEHOLDER": "ദയവായി സന്ദേശം അയയ്‌ക്കുന്ന ഫോൺ നമ്പർ നൽകുക.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "വെബ്‌ഹുക്ക് യുആർഎൽ",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "വെബ്‌ഹുക്ക് യുആർഎൽ"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "ചാനലിന്റെ പേര്",
           "PLACEHOLDER": "ഈ ചാനലിനു ദയവായി ഒരു പേര് നൽകുക",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "ഏജന്റുമാർ",
         "DESC": "നിങ്ങളുടെ പുതുതായി സൃഷ്ടിച്ച ഇൻ‌ബോക്സ് മാനേജു ചെയ്യുന്നതിന് ഇവിടെ നിങ്ങൾക്ക് ഏജന്റുമാരെ ചേർക്കാൻ‌ കഴിയും. ഈ തിരഞ്ഞെടുത്ത ഏജന്റുമാർ‌ക്ക് മാത്രമേ നിങ്ങളുടെ ഇൻ‌ബോക്സിലേക്ക് ആക്‌സസ് ഉണ്ടായിരിക്കുകയുള്ളൂ. ഈ ഇൻ‌ബോക്സിന്റെ ഭാഗമല്ലാത്ത ഏജന്റുമാർ‌ക്ക് ഈ ഇൻ‌ബോക്സിലെ സന്ദേശങ്ങൾ‌ കാണാനോ പ്രതികരിക്കാനോ കഴിയില്ല. <br> ഒരു അഡ്മിനിസ്ട്രേറ്റർ എന്ന നിലയിൽ, നിങ്ങൾക്ക് എല്ലാ ഇൻ‌ബോക്സുകളിലേക്കും ആക്സസ് ആവശ്യമുണ്ടെങ്കിൽ, നിങ്ങൾ സൃഷ്ടിക്കുന്ന എല്ലാ ഇൻ‌ബോക്സുകളിലേക്കും നിങ്ങൾ സ്വയം ഏജന്റായി ചേർക്കണം.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "സംഭാഷണം പരിഹരിച്ചതിന് ശേഷം സന്ദേശങ്ങൾ അനുവദിക്കുക",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "സംഭാഷണം പരിഹരിച്ചതിന് ശേഷവും സന്ദേശങ്ങൾ അയയ്ക്കാൻ അന്തിമ ഉപയോക്താക്കളെ അനുവദിക്കുക.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "അപ്‌ഡേറ്റ്",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 3fd9a9e1e0903..834022d9c80cd 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "നിങ്ങളുടെ പ്രൊഫൈൽ വിജയകരമായി അപ്‌ഡേറ്റു ചെയ്തിരിക്കുന്നു, ലോഗിൻ ക്രെഡൻഷ്യലുകൾ മാറ്റിയതിനാൽ ദയവായി വീണ്ടും ലോഗിൻ ചെയ്യുക",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "പ്രൊഫൈൽ ചിത്രം",
       "ERROR": "ദയവായി ഫോമിലെ പിശകുകൾ പരിഹരിക്കുക",
       "REMOVE_IMAGE": "നീക്കം ചെയ്യുക",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "ആക്സസ് ടോക്കൺ",
-        "NOTE": "നിങ്ങൾ ഒരു എപിഐ അടിസ്ഥാനമാക്കിയുള്ള സംയോജനം നിർമ്മിക്കുകയാണെങ്കിൽ ഈ ടോക്കൺ ഉപയോഗിക്കാൻ കഴിയും"
+        "NOTE": "നിങ്ങൾ ഒരു എപിഐ അടിസ്ഥാനമാക്കിയുള്ള സംയോജനം നിർമ്മിക്കുകയാണെങ്കിൽ ഈ ടോക്കൺ ഉപയോഗിക്കാൻ കഴിയും",
+        "COPY": "പകർത്തുക"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "ഒന്നുമില്ല",
+          "MINE": "Assigned",
+          "ALL": "എല്ലാം"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "ഒന്നുമില്ല",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "ഇമെയിൽ",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "മുൻ‌ഗണനകൾ അപ്‌ഡേറ്റു ചെയ്യുമ്പോൾ ഒരു പിശക് ഉണ്ട്, ദയവായി വീണ്ടും ശ്രമിക്കുക"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ml/sla.json b/app/javascript/dashboard/i18n/locale/ml/sla.json
index e11829eaffa70..babea8fe6be6d 100644
--- a/app/javascript/dashboard/i18n/locale/ml/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ml/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ms/bulkActions.json b/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
index 16551c556bace..d13e78b4aced3 100644
--- a/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ms/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ms/contact.json b/app/javascript/dashboard/i18n/locale/ms/contact.json
index a3f1238a5179b..3c22bbeaf3c4c 100644
--- a/app/javascript/dashboard/i18n/locale/ms/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ms/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ms/conversation.json b/app/javascript/dashboard/i18n/locale/ms/conversation.json
index cbedd030cc380..f0e107a1da1e1 100644
--- a/app/javascript/dashboard/i18n/locale/ms/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ms/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ms/datePicker.json b/app/javascript/dashboard/i18n/locale/ms/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ms/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
index 67fdef7d10499..e617756b9802d 100644
--- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
index 6c9b031c1bab3..d7005962995ca 100644
--- a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Ejen",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ms/settings.json b/app/javascript/dashboard/i18n/locale/ms/settings.json
index 16fc6aa9c8824..5f504c37fd97c 100644
--- a/app/javascript/dashboard/i18n/locale/ms/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "Tiada",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Tiada",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ms/sla.json b/app/javascript/dashboard/i18n/locale/ms/sla.json
index 3e869c8f7532d..b7376cd16d88e 100644
--- a/app/javascript/dashboard/i18n/locale/ms/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ms/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ne/bulkActions.json b/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index 9b9ff14535e89..783c6edb72a48 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 0ae3156cae554..088e785a42ec7 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ne/datePicker.json b/app/javascript/dashboard/i18n/locale/ne/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 1e635b760cf24..8c62e90bbfd87 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index e7217f233a99b..fa1f07ed7dca2 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ne/sla.json b/app/javascript/dashboard/i18n/locale/ne/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/ne/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ne/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/nl/bulkActions.json b/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
index 7190b1090b910..6ea5298e71188 100644
--- a/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Agents worden geladen",
     "UPDATE": {
       "CHANGE_STATUS": "Status wijzigen",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze tot het volgende antwoord.",
+      "SNOOZE_UNTIL": "Sluimeren",
       "UPDATE_SUCCESFUL": "Gespreksstatus succesvol bijgewerkt.",
       "UPDATE_FAILED": "Update van gesprekken mislukt, probeer het opnieuw."
     },
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 149f479c47e8d..71b84608539a5 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Aanpasbare attributen",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Vorige gesprekken"
+      "PREVIOUS_CONVERSATIONS": "Vorige gesprekken",
+      "NO_RECORDS_FOUND": "Geen attributen gevonden"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Contactpersonen exporteren",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index a70ccfa4efca0..5146497c0b92b 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Maak kenmerk aan",
+    "NO_RECORDS_FOUND": "Geen attributen gevonden",
     "UPDATE": {
       "SUCCESS": "Attribuut succesvol toegevoegd",
       "ERROR": "Kan het attribuut niet bijwerken. Probeer het later opnieuw"
diff --git a/app/javascript/dashboard/i18n/locale/nl/datePicker.json b/app/javascript/dashboard/i18n/locale/nl/datePicker.json
new file mode 100644
index 0000000000000..92a28fa2b8393
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Afgelopen 7 dagen",
+      "LAST_30_DAYS": "Laatste 30 dagen",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index fcfc620f9a017..42a1c6746175d 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Algemeen",
       "REPORTS": "Rapporten",
       "CONVERSATION": "Gesprek",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index c0233071c9052..d16eb2267da9a 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Voeg agenten toe aan de aangemaakte inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Je bent helemaal klaar om te beginnen!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Voer een geldige URL in"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "Dit veld is verplicht"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Telefoon nummer",
+          "LABEL": "Telefoonnummer",
           "PLACEHOLDER": "Voer het telefoonnummer in waaruit het bericht wordt verzonden.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API sleutel",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Dit veld is verplicht"
           },
           "API_SECRET": {
             "LABEL": "API-geheim",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Dit veld is verplicht"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Kanaal naam",
           "PLACEHOLDER": "Voer een kanaal naam in",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenten",
         "DESC": "Hier kunt u agenten toevoegen om uw nieuw gecreëerde inbox te beheren. Alleen deze agenten hebben toegang tot uw inbox. Agents die geen deel uitmaken van dit postvak in zullen niet in staat zijn om berichten in dit postvak te zien of te reageren wanneer ze inloggen. <br> <b>PS:</b> Als beheerder als u toegang wilt krijgen tot alle inboxen, voeg jezelf toe als agent aan alle inboxen die je maakt.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Vriendelijk",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API sleutel",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Vernieuwen",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index a68fb55149c81..511e3f9c721e2 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Uw wachtwoord is succesvol gewijzigd",
     "AFTER_EMAIL_CHANGED": "Uw profiel is succesvol bijgewerkt. Log opnieuw in als uw inloggegevens zijn gewijzigd",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profiel afbeelding",
       "ERROR": "Corrigeer formulierfouten",
       "REMOVE_IMAGE": "Verwijderen",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Toegangs-token",
-        "NOTE": "Dit token kan worden gebruikt als u een API gebaseerde integratie bouwt"
+        "NOTE": "Dit token kan worden gebruikt als u een API gebaseerde integratie bouwt",
+        "COPY": "Kopiëren"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notificaties",
         "NOTE": "Audio-meldingen inschakelen in dashboard voor nieuwe berichten en gesprekken.",
+        "ALERT_TYPES": {
+          "NONE": "Geen",
+          "MINE": "Assigned",
+          "ALL": "Allemaal"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Melding gebeurtenissen:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Geen",
           "ASSIGNED": "Toegewezen gesprekken",
           "ALL_CONVERSATIONS": "Alle gesprekken"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-mailadres",
+        "PUSH": "Push-melding",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Uw notificatie-instellingen zijn succesvol bijgewerkt",
         "UPDATE_ERROR": "Er is een fout opgetreden tijdens het bijwerken van de voorkeuren, probeer het opnieuw"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/nl/sla.json b/app/javascript/dashboard/i18n/locale/nl/sla.json
index 963009366639d..2f05a6171d372 100644
--- a/app/javascript/dashboard/i18n/locale/nl/sla.json
+++ b/app/javascript/dashboard/i18n/locale/nl/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/no/bulkActions.json b/app/javascript/dashboard/i18n/locale/no/bulkActions.json
index de4c1a6b6cf88..11487cb77a013 100644
--- a/app/javascript/dashboard/i18n/locale/no/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/no/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index 9e75809247144..3923ecc8f27d8 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Egendefinerte verdier",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Tidligere samtaler"
+      "PREVIOUS_CONVERSATIONS": "Tidligere samtaler",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index f5aabf7704fb9..0935ee275c084 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/no/datePicker.json b/app/javascript/dashboard/i18n/locale/no/datePicker.json
new file mode 100644
index 0000000000000..69f4ec40028bc
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Siste 7 dager",
+      "LAST_30_DAYS": "Siste 30 dager",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index 94ec5627a3940..7d0829020b1f0 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Rapporter",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index a7aa3e4fca881..c3ba99aabe848 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Legg agenter til i den opprettede innboksen."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Klar - ferdig - gå!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Velg en side fra listen",
         "INBOX_NAME": "Navn på innboks",
         "ADD_NAME": "Legge til et navn på innboksen din",
-        "PICK_NAME": "Velg et navn din innboks",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Velg en verdi"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Vennligst skriv inn en gyldig URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Dette feltet er obligatorisk"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Dette feltet er obligatorisk"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Konfigurere nettadressen du vil motta callbacks fra hendelser.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Opprett API-kanal",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "E-postkanal",
-        "DESC": "Integrer din e-postinnboks.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Kanalnavn",
           "PLACEHOLDER": "Vennligst skriv inn et kanalnavn",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenter",
         "DESC": "Her kan du legge til agenter for å administrere innboksen din. Bare de valgte agentene har tilgang til innboksen din. Agenter som ikke er en del av denne innboksen vil ikke kunne se eller svare på meldinger i denne innboksen når de logger inn. <br> <b>PS:</b> Dersom du som administrator trenger tilgang til alle innbokser, må du legge deg selv til som agent i alle innbokser du lager.",
-        "VALIDATION_ERROR": "Legg til minst én agent i den nye innboksen",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Velg agenter for innboksen"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Oppdater",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 0ef3954d59bdd..4a142b2347511 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Ditt passord er endret",
     "AFTER_EMAIL_CHANGED": "Din profil har blitt oppdatert, vennligst logg inn igjen ettersom din innloggingsinformasjon er endret",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profilbilde",
       "ERROR": "Vennligst fiks skjemafeil",
       "REMOVE_IMAGE": "Fjern",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Tilgangstoken",
-        "NOTE": "Dette tokenet kan brukes hvis du lager en API-basert integrasjon"
+        "NOTE": "Dette tokenet kan brukes hvis du lager en API-basert integrasjon",
+        "COPY": "Kopier"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "Alle"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-post",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Dine varslingsinnstillinger er oppdatert",
         "UPDATE_ERROR": "Det oppstod en feil under oppdatering av innstillingene. Prøv igjen"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/no/sla.json b/app/javascript/dashboard/i18n/locale/no/sla.json
index 3ba88e362c438..021b0a04dd37a 100644
--- a/app/javascript/dashboard/i18n/locale/no/sla.json
+++ b/app/javascript/dashboard/i18n/locale/no/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/pl/bulkActions.json b/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
index 57b683b8a5d95..ef1863750cd89 100644
--- a/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Ładowanie agentów",
     "UPDATE": {
       "CHANGE_STATUS": "Zmień status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Uśpienie do następnej odpowiedzi.",
+      "SNOOZE_UNTIL": "Uśpij",
       "UPDATE_SUCCESFUL": "Status rozmowy został pomyślnie zaktualizowany.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 86c5a52ea5236..83b173659c4b1 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty",
       "CONTACT_LABELS": "Etykiety kontaktu",
-      "PREVIOUS_CONVERSATIONS": "Poprzednie rozmowy"
+      "PREVIOUS_CONVERSATIONS": "Poprzednie rozmowy",
+      "NO_RECORDS_FOUND": "Brak wyników"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Eksportuj kontakty",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 4d02ec21de15d..30ac433ac0319 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Utwórz atrybut",
+    "NO_RECORDS_FOUND": "Brak wyników",
     "UPDATE": {
       "SUCCESS": "Atrybut zaktualizowany pomyślnie",
       "ERROR": "Nie można zaktualizować atrybutu. Spróbuj ponownie później"
diff --git a/app/javascript/dashboard/i18n/locale/pl/datePicker.json b/app/javascript/dashboard/i18n/locale/pl/datePicker.json
new file mode 100644
index 0000000000000..6a3ca9491db09
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Zastosuj",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Ostatnie 7 dni",
+      "LAST_30_DAYS": "Ostatnie 30 dni",
+      "LAST_3_MONTHS": "Ostatnie 3 miesiące",
+      "LAST_6_MONTHS": "Ostatnie 6 miesięcy",
+      "LAST_YEAR": "Ostatni rok",
+      "CUSTOM_RANGE": "Niestandardowy zakres dat"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index 8b2f63b821080..710b006ff9be0 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Ogólne",
       "REPORTS": "Raporty",
       "CONVERSATION": "Rozmowa",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Zmień przypisanego",
       "CHANGE_PRIORITY": "Zmień priorytet",
       "CHANGE_TEAM": "Zmień zespół",
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index c799d3cf349b8..43db2cfe863e9 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Dodaj agentów do utworzonej skrzynki odbiorczej."
       },
       {
-        "title": "Gotowe!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Wszystko jest gotowe!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Wybierz stronę z listy",
         "INBOX_NAME": "Nazwa skrzynki odbiorczej",
         "ADD_NAME": "Dodaj nazwę skrzynki odbiorczej",
-        "PICK_NAME": "Wybierz nazwę skrzynki odbiorczej",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Wybierz wartość"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL webhooka",
-          "PLACEHOLDER": "Wprowadź adres URL webhooka",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Wprowadź poprawny adres URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Klucz API",
-            "PLACEHOLDER": "Wprowadź klucz API przepustowości",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "To pole jest wymagane"
           },
           "API_SECRET": {
             "LABEL": "Sekret API",
-            "PLACEHOLDER": "Wprowadź sekret API przepustowości",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "To pole jest wymagane"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Token weryfikujący Webhook",
-          "PLACEHOLDER": "Wprowadź token weryfikacyjny webhooka, który chcesz skonfigurować dla webhooków Facebooka.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Wprowadź poprawną wartość."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Adres URL webhooka",
-          "SUBTITLE": "Skonfiguruj adres URL, na którym chcesz otrzymywać zwroty dla zdarzeń.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Adres URL webhooka"
         },
         "SUBMIT_BUTTON": "Utwórz kanał API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Kanał e-mail",
-        "DESC": "Zintegruj skrzynkę pocztową.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nazwa kanału",
           "PLACEHOLDER": "Wprowadź nazwę kanału",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenci",
         "DESC": "Tutaj możesz dodać agentów do zarządzania swoją nowo utworzoną skrzynką odbiorczą. Tylko ci wybrani agenci będą mieli dostęp do Twojej skrzynki odbiorczej. Agenci, którzy nie są częścią tej skrzynki odbiorczej nie będą mogli zobaczyć ani odpowiadać na wiadomości w tej skrzynce odbiorczej podczas logowania. <br> <b>PS:</b> Jako administrator, jeśli potrzebujesz dostępu do wszystkich skrzynek odbiorczych, powinieneś dodać siebie jako agenta do wszystkich skrzynek odbiorczych, które tworzysz.",
-        "VALIDATION_ERROR": "Dodaj co najmniej jednego agenta do swojej nowej skrzynki odbiorczej",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Wybierz agentów dla skrzynki odbiorczej"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Przyjazna",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Zezwalaj na wiadomości po rozwiązaniu konwersacji",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Zezwalaj użytkownikom końcowym na wysyłanie wiadomości nawet po zakończeniu konwersacji.",
       "WHATSAPP_SECTION_SUBHEADER": "Ten klucz API jest używany do integracji z interfejsami API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Wprowadź zaktualizowany klucz, który będzie używany do integracji z interfejsami API WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Klucz API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Aktualizacja klucza API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Wprowadź nowy klucz API tutaj",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualizuj",
-      "WHATSAPP_WEBHOOK_TITLE": "Token weryfikujący Webhook",
+      "WHATSAPP_WEBHOOK_TITLE": "Token weryfikacyjny webhooka",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Ten token służy do weryfikacji autentyczności punktu końcowego webhooka.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Aktualizacja ustawień formularza czatu wstępnego"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Aby włączyć SMTP, należy skonfigurować IMAP.",
       "UPDATE": "Aktualizuj ustawienia IMAP",
       "TOGGLE_AVAILABILITY": "Włącz konfigurację IMAP dla tej skrzynki odbiorczej",
-      "TOGGLE_HELP": "Włączenie IMAP pomoże użytkownikowi otrzymywać e-mail",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Ustawienia IMAP zostały zaktualizowane",
         "ERROR_MESSAGE": "Nie można zaktualizować ustawień IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 2727f7c4bdcb6..c72b3deec8f12 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Twoje hasło zostało zmienione",
     "AFTER_EMAIL_CHANGED": "Twój profil został pomyślnie zaktualizowany, zaloguj się ponownie po zmianie danych logowania",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Zdjęcie profilowe",
       "ERROR": "Proszę naprawić błędy formularza",
       "REMOVE_IMAGE": "Usuń",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token dostępu",
-        "NOTE": "Ten token może być użyty, jeśli budujesz integrację opartą na API"
+        "NOTE": "Ten token może być użyty, jeśli budujesz integrację opartą na API",
+        "COPY": "Kopiuj"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Powiadomienia dźwiękowe",
         "NOTE": "Włącz powiadomienia dźwiękowe na pulpicie dla nowych wiadomości i konwersacji.",
+        "ALERT_TYPES": {
+          "NONE": "Brak",
+          "MINE": "Assigned",
+          "ALL": "Wszystkie"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Wydarzenia powiadomień:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Brak",
           "ASSIGNED": "Przypisane rozmowy",
           "ALL_CONVERSATIONS": "Rozmowy"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-mail",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Twoje preferencje powiadomień zostały pomyślnie zaktualizowane",
         "UPDATE_ERROR": "Wystąpił błąd podczas aktualizacji preferencji, spróbuj ponownie"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Przejdź do panelu raportów",
       "MOVE_TO_NEXT_TAB": "Przejdź do następnej karty na liście rozmów",
       "GO_TO_SETTINGS": "Przejdź do ustawień",
-      "SWITCH_CONVERSATION_STATUS": "Przełącz do następnego statusu rozmowy",
       "SWITCH_TO_PRIVATE_NOTE": "Przełącz do prywatnej notatki",
       "SWITCH_TO_REPLY": "Przełącz do odpowiedzi",
       "TOGGLE_SNOOZE_DROPDOWN": "Przełącz menu rozwijane drzemki"
diff --git a/app/javascript/dashboard/i18n/locale/pl/sla.json b/app/javascript/dashboard/i18n/locale/pl/sla.json
index b59df60185125..3d181907cf064 100644
--- a/app/javascript/dashboard/i18n/locale/pl/sla.json
+++ b/app/javascript/dashboard/i18n/locale/pl/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/pt/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
index 05a44cff0ca9a..94df40284094d 100644
--- a/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Carregando agentes",
     "UPDATE": {
       "CHANGE_STATUS": "Alterar estado",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Adiar até a próxima resposta.",
+      "SNOOZE_UNTIL": "Adiar",
       "UPDATE_SUCCESFUL": "Estado da conversa atualizado com sucesso.",
       "UPDATE_FAILED": "Falha ao atualizar conversas. Por favor, tente novamente."
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt/chatlist.json b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
index c3c1c97eea357..c26e15f117b60 100644
--- a/app/javascript/dashboard/i18n/locale/pt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
@@ -8,7 +8,7 @@
     },
     "TAB_HEADING": "Conversas",
     "MENTION_HEADING": "Menções",
-    "UNATTENDED_HEADING": "Por tratar",
+    "UNATTENDED_HEADING": "Por responder",
     "SEARCH": {
       "INPUT": "Pesquisar pessoas, conversas, respostas salvas .."
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 2710dac57136a..d614fdbce1f34 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Atributos personalizados",
       "CONTACT_LABELS": "Etiquetas de Contacto",
-      "PREVIOUS_CONVERSATIONS": "Conversas anteriores"
+      "PREVIOUS_CONVERSATIONS": "Conversas anteriores",
+      "NO_RECORDS_FOUND": "Nenhum atributo encontrado"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Exportar contactos",
       "MESSAGE": "Tem certeza de que deseja exportar todos os contatos?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Sim, Exportar",
       "NO": "Não, Cancelar"
     }
@@ -296,8 +298,8 @@
     "BUTTON": "Adicionar atributo personalizado",
     "NOT_AVAILABLE": "Não há atributos personalizados disponíveis para este contacto.",
     "COPY_SUCCESSFUL": "Copiado para área de transferência com sucesso",
-    "SHOW_MORE": "Show all attributes",
-    "SHOW_LESS": "Show less attributes",
+    "SHOW_MORE": "Mostrar todos os atributos",
+    "SHOW_LESS": "Mostrar menos atributos",
     "ACTIONS": {
       "COPY": "Copiar atributo",
       "DELETE": "Apagar atributo",
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index d2e0a475a000b..de2b2e2a51288 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Criar atributo",
+    "NO_RECORDS_FOUND": "Nenhum atributo encontrado",
     "UPDATE": {
       "SUCCESS": "Atributo atualizado com sucesso",
       "ERROR": "Não foi possível atualizar o atributo. Por favor tente mais tarde"
diff --git a/app/javascript/dashboard/i18n/locale/pt/datePicker.json b/app/javascript/dashboard/i18n/locale/pt/datePicker.json
new file mode 100644
index 0000000000000..501ba2bd1557d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Confirmar",
+    "CLEAR_BUTTON": "Limpar",
+    "DATE_RANGE_INPUT": {
+      "START": "Data Inicial",
+      "END": "Data Final"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "Intervalo de datas",
+      "LAST_7_DAYS": "Últimos 7 Dias",
+      "LAST_30_DAYS": "Últimos 30 Dias",
+      "LAST_3_MONTHS": "Últimos 3 meses",
+      "LAST_6_MONTHS": "Últimos 6 meses",
+      "LAST_YEAR": "Último ano",
+      "CUSTOM_RANGE": "Intervalo de tempo personalizado"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/general.json b/app/javascript/dashboard/i18n/locale/pt/general.json
index 25bb4dfb736d2..0cd2faabc55c8 100644
--- a/app/javascript/dashboard/i18n/locale/pt/general.json
+++ b/app/javascript/dashboard/i18n/locale/pt/general.json
@@ -1,5 +1,5 @@
 {
   "GENERAL": {
-    "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items"
+    "SHOWING_RESULTS": "A mostrar {firstIndex}-{lastIndex} de {totalCount} itens"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index d01d0b243ab4f..741f85f3fdc32 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Geral",
       "REPORTS": "relatórios",
       "CONVERSATION": "Conversa",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Alterar Responsável",
       "CHANGE_PRIORITY": "Alterar Prioridade",
       "CHANGE_TEAM": "Alterar Equipa",
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index c235f8c3b5d31..718e66d62d1f4 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Adicionar agentes à caixa de entrada criada."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Está tudo pronto para começar!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Escolher uma página da lista",
         "INBOX_NAME": "Nome Caixa de Entrada",
         "ADD_NAME": "Escolha um nome para a sua caixa de entrada",
-        "PICK_NAME": "Escolha um nome a sua caixa de entrada",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Escolha um valor"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL do Webhook",
-          "PLACEHOLDER": "Introduza o seu URL Webhook",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Por favor, insira uma URL válida"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Chave da API",
-            "PLACEHOLDER": "Por favor insira a palavra passe da API Bandwidth",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Este campo é obrigatório"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Por favor insira a palavra passe da API Bandwidth",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Este campo é obrigatório"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook de Verificação de Token",
-          "PLACEHOLDER": "Digite um token de verificação que deseja configurar para webhooks do Facebook.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Por favor, insira um valor válido."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL do Webhook",
-          "SUBTITLE": "Configurar a URL onde quer receber mensagens de retorno.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL do Webhook"
         },
         "SUBMIT_BUTTON": "Criar canal API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Canal de e-mail",
-        "DESC": "Integrar a caixa de entrada.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nome do Canal",
           "PLACEHOLDER": "Por favor, insira um nome de canal",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "agentes",
         "DESC": "Aqui você pode adicionar agentes para gerenciar a sua caixa de entrada recém-criada. Apenas esses agentes selecionados terão acesso à sua caixa de entrada. Agentes que não fazem parte desta caixa de entrada não serão capazes de ver ou responder a mensagens nesta caixa de entrada quando eles acessarem. <br> <b>PS:</b> como administrador, se precisar de acesso a todas as caixas de entrada, você deve se adicionar como agente em todas as caixas de entrada que você criar.",
-        "VALIDATION_ERROR": "Adicionar pelo menos um agente à sua nova caixa de entrada",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Escolha os agentes da caixa de entrada"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Nome do remetente",
-        "SUB_TEXT": "Selecione o nome a apresentar ao seu cliente quando ele receber e-mails dos seus agentes.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "Por exemplo:",
         "FRIENDLY": {
           "TITLE": "Amigável",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Permitir mensagens após a resolução da conversa",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permite que os utilizadores finais enviem mensagens após a conversa estar resolvida.",
       "WHATSAPP_SECTION_SUBHEADER": "Esta chave de API é usada para a integração com as APIs do WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Escreva a chave atualizada a ser usada para a integração com as APIs do WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Chave da API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Atualizar Chave de API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Digite a nova chave da API aqui",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualização",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook de Verificação de Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook de Verificação do Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Este token é usado para verificar a autenticidade do endpoint do webhook.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Para ativar o SMTP, por favor configure o IMAP.",
       "UPDATE": "Atualizar configurações IMAP",
       "TOGGLE_AVAILABILITY": "Ativar a configuração IMAP para esta caixa de entrada",
-      "TOGGLE_HELP": "Habilitar o IMAP ajudará o utilizador a receber o email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Configurações IMAP atualizadas com sucesso",
         "ERROR_MESSAGE": "Não foi possível atualizar as configurações do IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/pt/report.json b/app/javascript/dashboard/i18n/locale/pt/report.json
index 5d194e8fdf3bb..fb9ae47acd295 100644
--- a/app/javascript/dashboard/i18n/locale/pt/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt/report.json
@@ -140,7 +140,7 @@
     ],
     "BUSINESS_HOURS": "Horário comercial",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "Limpar filtros",
       "EMPTY_LIST": "Nenhum resultado encontrado"
     }
   },
@@ -473,7 +473,7 @@
       "HEADER": "Conversas Abertas",
       "LOADING_MESSAGE": "A importar métricas de conversa...",
       "OPEN": "Abertas",
-      "UNATTENDED": "Por tratar",
+      "UNATTENDED": "Por responder",
       "UNASSIGNED": "Não atribuído",
       "PENDING": "Pendente"
     },
@@ -489,9 +489,9 @@
       "NO_AGENTS": "Não existem conversas por agentes",
       "TABLE_HEADER": {
         "AGENT": "Representante",
-        "OPEN": "ABRIR",
-        "UNATTENDED": "Por tratar",
-        "STATUS": "SItuação"
+        "OPEN": "Abertas",
+        "UNATTENDED": "Por responder",
+        "STATUS": "Estado"
       }
     },
     "AGENT_STATUS": {
@@ -511,15 +511,15 @@
     "SATURDAY": "Sábado"
   },
   "SLA_REPORTS": {
-    "HEADER": "SLA Reports",
-    "NO_RECORDS": "SLA applied conversations are not available.",
-    "LOADING": "Loading SLA data...",
-    "DOWNLOAD_SLA_REPORTS": "Download SLA reports",
-    "DOWNLOAD_FAILED": "Failed to download SLA Reports",
+    "HEADER": "Relatórios SLA",
+    "NO_RECORDS": "Conversas com SLA aplicados não estão disponíveis.",
+    "LOADING": "A importar dados de SLA...",
+    "DOWNLOAD_SLA_REPORTS": "Download relatórios de SLA",
+    "DOWNLOAD_FAILED": "Falha ao efetuar download dos relatórios de SLA",
     "DROPDOWN": {
       "ADD_FIlTER": "Adicionar filtro",
-      "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_ALL": "Limpar tudo",
+      "CLEAR_FILTER": "Limpar filtros",
       "EMPTY_LIST": "Nenhum resultado encontrado",
       "NO_FILTER": "No filters available",
       "SEARCH": "Search filter",
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 00ca8d69c1cdd..c872daa58e739 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Sua senha foi alterada com sucesso",
     "AFTER_EMAIL_CHANGED": "Seu perfil foi atualizado com sucesso, faça o login novamente pois suas credenciais foram alteradas",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Imagem do perfil",
       "ERROR": "Por favor, corrigir erros de formulário",
       "REMOVE_IMAGE": "Excluir",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token de acesso",
-        "NOTE": "Este token pode ser usado se você estiver construindo uma integração baseada em API"
+        "NOTE": "Este token pode ser usado se você estiver construindo uma integração baseada em API",
+        "COPY": "Copiar"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Notificações de som",
         "NOTE": "Ativar notificações de som no painel quando surgirem novas mensagens e conversas.",
+        "ALERT_TYPES": {
+          "NONE": "Nenhuma",
+          "MINE": "Assigned",
+          "ALL": "Todas"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Eventos de alerta:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Nenhuma",
           "ASSIGNED": "Conversas atribuídas",
           "ALL_CONVERSATIONS": "Todas as conversas"
@@ -85,8 +92,25 @@
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Enviar mensagem de email quando criada uma mensagem ou atribuída uma conversa",
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Enviar notificações por email quando uma nova mensagem é criada numa conversa em que está a participar",
         "SLA_MISSED_FIRST_RESPONSE": "Enviar notificações por e-mail quando uma conversa perder a primeira resposta SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_NEXT_RESPONSE": "Enviar notificações por email quando uma conversa falhar a SLA de primeira resposta",
+        "SLA_MISSED_RESOLUTION": "Enviar notificações por email quando uma conversa falhar a SLA de resolução"
+      },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "e-mail",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
       },
       "API": {
         "UPDATE_SUCCESS": "As suas preferências de notificação foram atualizadas com sucesso",
@@ -102,9 +126,9 @@
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Enviar notificações push quando uma nova mensagem é criada numa conversa em que está a participar",
         "HAS_ENABLED_PUSH": "Ativou notificações Push neste navegador.",
         "REQUEST_PUSH": "Ativar notificações Push",
-        "SLA_MISSED_FIRST_RESPONSE": "Send push notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send push notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send push notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "Enviar uma notificação Push quando uma conversa falhar a SLA de primeira resposta",
+        "SLA_MISSED_NEXT_RESPONSE": "Enviar uma notificação Push quando uma conversa falhar a SLA de resposta seguinte",
+        "SLA_MISSED_RESOLUTION": "Enviar uma notificação Push quando uma conversa falhar a SLA de resolução"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Imagem do perfil"
@@ -211,7 +235,7 @@
     "ALL_CONVERSATIONS": "Todas as conversas",
     "MENTIONED_CONVERSATIONS": "Menções",
     "PARTICIPATING_CONVERSATIONS": "Participando",
-    "UNATTENDED_CONVERSATIONS": "Por tratar",
+    "UNATTENDED_CONVERSATIONS": "Por responder",
     "REPORTS": "relatórios",
     "SETTINGS": "Configurações",
     "CONTACTS": "Contactos",
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Ir para barra lateral de Relatórios",
       "MOVE_TO_NEXT_TAB": "Mover para próximo separador da lista de conversas",
       "GO_TO_SETTINGS": "Ir para as configurações",
-      "SWITCH_CONVERSATION_STATUS": "Mudar para o próximo estado de conversa",
       "SWITCH_TO_PRIVATE_NOTE": "Alterar para nota privada",
       "SWITCH_TO_REPLY": "Mudar para resposta",
       "TOGGLE_SNOOZE_DROPDOWN": "Ativar/desativar suspensos"
diff --git a/app/javascript/dashboard/i18n/locale/pt/sla.json b/app/javascript/dashboard/i18n/locale/pt/sla.json
index 04e4ab1a8eaf3..d259bd4ea9a4b 100644
--- a/app/javascript/dashboard/i18n/locale/pt/sla.json
+++ b/app/javascript/dashboard/i18n/locale/pt/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLA) são contratos que definem expectativas claras entre a sua equipa e os clientes. Estabelecem normas para tempos de resposta e de resolução, criando um quadro de responsabilização e garantindo uma experiência coerente e de qualidade.",
     "LEARN_MORE": "Saiba mais sobre SLA",
     "LOADING": "A carregar SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade para criar SLAs",
+      "AVAILABLE_ON": "O recurso SLA apenas está disponível nos planos Business e Enterprise.",
+      "UPGRADE_PROMPT": "Faça upgrade do seu plano para obter acesso a recursos avançados, como gestão de equipas, automações, atributos personalizados e muito mais.",
+      "UPGRADE_NOW": "Fazer upgrade agora",
+      "CANCEL_ANYTIME": "Pode alterar ou cancelar o plano a qualquer momento"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "O recurso SLA apenas está disponível nos planos pagos.",
+      "UPGRADE_PROMPT": "Faça upgrade para um plano pago para obter recursos avançados, como logs de auditoria, capacidade de agentes e muito mais.",
+      "ASK_ADMIN": "Por favor, entre em contato com o administrador para atualização."
+    },
     "LIST": {
       "404": "Não há SLAs disponíveis nesta conta.",
       "EMPTY": {
@@ -65,7 +77,7 @@
     },
     "ADD": {
       "TITLE": "Adicionar SLA",
-      "DESC": "Friendly promises for great service!",
+      "DESC": "Acordos para um ótimo serviço!",
       "API": {
         "SUCCESS_MESSAGE": "SLA adicionado",
         "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
@@ -85,12 +97,12 @@
       }
     },
     "EVENTS": {
-      "TITLE": "SLA Misses",
+      "TITLE": "SLA Perdidas",
       "FRT": "Primeiro tempo de resposta",
-      "NRT": "Next response time",
-      "RT": "Resolution time",
-      "SHOW_MORE": "{count} more",
-      "HIDE": "Hide {count} rows"
+      "NRT": "Tempo para a próxima resposta",
+      "RT": "Tempo de resolução",
+      "SHOW_MORE": "{count} mais",
+      "HIDE": "Ocultar {count} linhas"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
index b79dbf0708850..34d11e23b6fc2 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
@@ -7,7 +7,7 @@
     "ADD_NEW_FILTER": "Adicionar filtro",
     "FILTER_DELETE_ERROR": "Ops! Parece que não podemos salvar nada! Por favor, adicione pelo menos um filtro para salvá-lo.",
     "SUBMIT_BUTTON_LABEL": "Aplicar filtros",
-    "UPDATE_BUTTON_LABEL": "Pasta de atualização",
+    "UPDATE_BUTTON_LABEL": "Atualizar pasta",
     "CANCEL_BUTTON_LABEL": "Cancelar",
     "CLEAR_BUTTON_LABEL": "Limpar filtros",
     "FOLDER_LABEL": "Nome da pasta",
@@ -38,7 +38,7 @@
       "STATUS": "SItuação",
       "ASSIGNEE_NAME": "Nome do responsável",
       "INBOX_NAME": "Nome da Caixa de Entrada",
-      "TEAM_NAME": "Nome do departamento",
+      "TEAM_NAME": "Nome do Time",
       "CONVERSATION_IDENTIFIER": "Identificador da conversa",
       "CAMPAIGN_NAME": "Nome da campanha",
       "LABELS": "Marcadores",
@@ -62,7 +62,7 @@
     "CUSTOM_VIEWS": {
       "ADD": {
         "TITLE": "Você quer salvar este filtro?",
-        "LABEL": "Nomeie este filtro",
+        "LABEL": "Nomear este filtro",
         "PLACEHOLDER": "Nomeie seu filtro para referenciá-lo posteriormente.",
         "ERROR_MESSAGE": "O nome é obrigatório.",
         "SAVE_BUTTON": "Salvar filtro",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
index 0ac5ff48afac9..8990e1eb438e8 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
@@ -2,17 +2,17 @@
   "AGENT_BOTS": {
     "HEADER": "Robôs",
     "LOADING_EDITOR": "Carregando Editor...",
-    "HEADER_BTN_TXT": "Adicionar configuração do bot",
+    "HEADER_BTN_TXT": "Adicionar configuração do robô",
     "SIDEBAR_TXT": "<p><b>Bots Agentes</b></p> <p>Bots Agentes são como os melhores membros da sua equipe. Eles podem lidar com coisas pequenas, para que você possa se concentrar no que realmente importa. Experimente-os.</p> <p>Você pode gerenciar seus bots desta página ou criar novos usando o botão 'Adicionar configuração de bot'.</p> <p>Abra o <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"_blank\">Manual do Bot Agente</a> em outra aba para obter ajuda.</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Nome do Bot",
-        "PLACEHOLDER": "Nomeie seu Bot.",
+        "LABEL": "Nome do Robô",
+        "PLACEHOLDER": "Nomeie seu Robô.",
         "ERROR": "O nome do bot é obrigatório."
       },
       "DESCRIPTION": {
-        "LABEL": "Descrição do Bot",
-        "PLACEHOLDER": "O que esse bot faz?"
+        "LABEL": "Descrição do Robô",
+        "PLACEHOLDER": "O que esse robô faz?"
       },
       "BOT_CONFIG": {
         "ERROR": "Por favor, insira a configuração CSML do bot acima.",
@@ -21,53 +21,53 @@
       "SUBMIT": "Validar e salvar"
     },
     "BOT_CONFIGURATION": {
-      "TITLE": "Selecione um bot de agente",
-      "DESC": "Atribua um Agente Bot à sua caixa de entrada. Eles podem lidar com as conversas iniciais e transferi-las para um agente humano quando necessário.",
+      "TITLE": "Selecione um robô de agente",
+      "DESC": "Atribua um Agente Robô à sua caixa de entrada. Eles podem lidar com as conversas iniciais e transferi-las para um agente humano quando necessário.",
       "SUBMIT": "Atualizar",
-      "DISCONNECT": "Desconectar Bot",
+      "DISCONNECT": "Desconectar Robô",
       "SUCCESS_MESSAGE": "Agente de bot atualizado com sucesso.",
       "DISCONNECTED_SUCCESS_MESSAGE": "Bot desconectado com sucesso.",
-      "ERROR_MESSAGE": "Não foi possível atualizar o agente bot. Por favor, tente novamente mais tarde.",
-      "DISCONNECTED_ERROR_MESSAGE": "Não foi possível desconectar o agente bot. Por favor, tente novamente mais tarde.",
-      "SELECT_PLACEHOLDER": "Selecionar Bot"
+      "ERROR_MESSAGE": "Não foi possível atualizar o agente robô. Por favor, tente novamente mais tarde.",
+      "DISCONNECTED_ERROR_MESSAGE": "Não foi possível desconectar o agente robô. Por favor, tente novamente mais tarde.",
+      "SELECT_PLACEHOLDER": "Selecionar Robô"
     },
     "ADD": {
-      "TITLE": "Configurar novo bot",
+      "TITLE": "Configurar novo robô",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "API": {
         "SUCCESS_MESSAGE": "Bot adicionado com sucesso.",
-        "ERROR_MESSAGE": "Não foi possível adicionar o agente bot! Por favor, tente novamente mais tarde."
+        "ERROR_MESSAGE": "Não foi possível adicionar o agente robô! Por favor, tente novamente mais tarde."
       }
     },
     "LIST": {
-      "404": "Nenhum bot encontrado. Você pode criar um bot clicando no botão 'Configurar novo bot' ↗",
-      "LOADING": "Buscando bots...",
-      "TYPE": "Tipo de Bot"
+      "404": "Nenhum robô encontrado. Você pode criar um robô clicando no botão 'Configurar novo robô' ↗",
+      "LOADING": "Buscando robôs...",
+      "TYPE": "Tipo de Robô"
     },
     "DELETE": {
       "BUTTON_TEXT": "Excluir",
-      "TITLE": "Excluir bot",
+      "TITLE": "Deletar robô",
       "SUBMIT": "Excluir",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "DESCRIPTION": "Tem certeza que deseja excluir este bot? Esta ação é irreversível.",
       "API": {
         "SUCCESS_MESSAGE": "Bot excluído com sucesso.",
-        "ERROR_MESSAGE": "Não foi possível excluir o bot. Por favor, tente novamente."
+        "ERROR_MESSAGE": "Não foi possível excluir o robô. Por favor, tente novamente."
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Alterar",
-      "LOADING": "Buscando bots...",
-      "TITLE": "Editar Bot",
+      "LOADING": "Buscando robôs...",
+      "TITLE": "Editar Robô",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "API": {
         "SUCCESS_MESSAGE": "Bot atualizado com sucesso.",
-        "ERROR_MESSAGE": "Não foi possível atualizar o bot. Por favor, tente novamente mais tarde."
+        "ERROR_MESSAGE": "Não foi possível atualizar o robô. Por favor, tente novamente mais tarde."
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook Bot",
-      "CSML": "CSML Bot"
+      "WEBHOOK": "Webhook robô",
+      "CSML": "CSML robô"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json b/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
index cc46dcdae1df2..0dd0a58333d80 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
@@ -26,46 +26,46 @@
       "DELETE": "%{agentName} excluida regra de automação (#%{id})"
     },
     "ACCOUNT_USER": {
-      "ADD": "%{agentName} convidou %{invitee} para sua conta como %{role}",
+      "ADD": "%{agentName} Convidou %{invitee} para sua conta como %{role}",
       "EDIT": {
-        "SELF": "%{agentName} alterado de %{attributes} para %{values}",
-        "OTHER": "%{agentName} alterado %{attributes} por %{user} para %{values}"
+        "SELF": "%{agentName} Alterado de %{attributes} para %{values}",
+        "OTHER": "%{agentName} Alterado %{attributes} por %{user} para %{values}"
       }
     },
     "INBOX": {
-      "ADD": "%{agentName} criou uma nova caixa de entrada (#%{id})",
-      "EDIT": "%{agentName} atualizou uma caixa de entrada (#%{id})",
-      "DELETE": "%{agentName} excluiu uma caixa de entrada (#%{id})"
+      "ADD": "%{agentName} Criou uma caixa de entrada (#%{id})",
+      "EDIT": "%{agentName} Atualizou uma caixa de entrada (#%{id})",
+      "DELETE": "%{agentName} Excluiu uma caixa de entrada (#%{id})"
     },
     "WEBHOOK": {
-      "ADD": "%{agentName} criou um novo webhook (#%{id})",
-      "EDIT": "%{agentName} atualizou um webhook (#%{id})",
-      "DELETE": "%{agentName} excluiu um webhook (#%{id})"
+      "ADD": "%{agentName} Criou um webhook (#%{id})",
+      "EDIT": "%{agentName} Atualizou um webhook (#%{id})",
+      "DELETE": "%{agentName} Excluiu um webhook (#%{id})"
     },
     "USER_ACTION": {
-      "SIGN_IN": "%{agentName} se conectou",
-      "SIGN_OUT": "%{agentName} se desconectou"
+      "SIGN_IN": "%{agentName} Se conectou",
+      "SIGN_OUT": "%{agentName} Se desconectou"
     },
     "TEAM": {
-      "ADD": "%{agentName} criou uma nova equipe (#%{id})",
+      "ADD": "%{agentName} Criou uma equipe (#%{id})",
       "EDIT": "%{agentName} atualizou uma equipe (#%{id})",
-      "DELETE": "%{agentName} excluiu uma equipe (#%{id})"
+      "DELETE": "%{agentName} Excluiu uma equipe (#%{id})"
     },
     "MACRO": {
-      "ADD": "%{agentName} criou um novo macro (#%{id})",
-      "EDIT": "%{agentName} atualizou uma macro (#%{id})",
-      "DELETE": "%{agentName} excluiu uma macro (#%{id})"
+      "ADD": "%{agentName} Criou um macro (#%{id})",
+      "EDIT": "%{agentName} Atualizou uma macro (#%{id})",
+      "DELETE": "%{agentName} Excluiu uma macro (#%{id})"
     },
     "INBOX_MEMBER": {
-      "ADD": "%{agentName} adicionou %{user} para a caixa de entrada (#%{inbox_id})",
-      "REMOVE": "%{agentName} removeu %{user} da caixa de entrada (#%{inbox_id})"
+      "ADD": "%{agentName} Adicionou %{user} para a caixa de entrada (#%{inbox_id})",
+      "REMOVE": "%{agentName} Removeu %{user} da caixa de entrada (#%{inbox_id})"
     },
     "TEAM_MEMBER": {
-      "ADD": "%{agentName} adicionou %{user} para a equipe (#%{team_id})",
-      "REMOVE": "%{agentName} removeu %{user} da equipe (#%{team_id})"
+      "ADD": "%{agentName} Adicionou %{user} para a equipe (#%{team_id})",
+      "REMOVE": "%{agentName} Removeu %{user} da equipe (#%{team_id})"
     },
     "ACCOUNT": {
-      "EDIT": "%{agentName} atualizou a configuração de conta (#%{id})"
+      "EDIT": "%{agentName} Atualizou a configuração de conta (#%{id})"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
index c1b1d53da26af..129b55bc2d90e 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Carregando agentes",
     "UPDATE": {
       "CHANGE_STATUS": "Alterar status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Adiar até a próxima resposta.",
+      "SNOOZE_UNTIL": "Adiar",
       "UPDATE_SUCCESFUL": "Status da conversa atualizado com sucesso.",
       "UPDATE_FAILED": "Falha ao atualizar conversas. Por favor, tente novamente."
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index eeccad2ce07f4..3c6fe33f4291f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Atributos Personalizados",
       "CONTACT_LABELS": "Etiquetas de contato",
-      "PREVIOUS_CONVERSATIONS": "Conversas anteriores"
+      "PREVIOUS_CONVERSATIONS": "Conversas anteriores",
+      "NO_RECORDS_FOUND": "Nenhum atributo encontrado"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Exportar contatos",
       "MESSAGE": "Tem certeza de que deseja exportar todos os contatos?",
+      "FILTERED_MESSAGE": "Tem certeza de que deseja exportar todos os contatos filtrados?",
       "YES": "Sim, Exportar",
       "NO": "Não, Cancelar"
     }
@@ -296,8 +298,8 @@
     "BUTTON": "Criar atributo personalizado",
     "NOT_AVAILABLE": "Não há atributos personalizados para este contato.",
     "COPY_SUCCESSFUL": "Copiado para área de transferência com sucesso",
-    "SHOW_MORE": "Show all attributes",
-    "SHOW_LESS": "Show less attributes",
+    "SHOW_MORE": "Mostrar todos os atributos",
+    "SHOW_LESS": "Mostrar menos atributos",
     "ACTIONS": {
       "COPY": "Copiar atributo",
       "DELETE": "Excluir atributo",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index ee3c492f81429..b01043431b006 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -69,7 +69,7 @@
         "FRT": "FRT {status}",
         "NRT": "NRT {status}",
         "RT": "RT {status}",
-        "MISSED": "missed",
+        "MISSED": "perdidos(as)",
         "DUE": "devido"
       }
     },
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Criar atributo",
+    "NO_RECORDS_FOUND": "Nenhum atributo encontrado",
     "UPDATE": {
       "SUCCESS": "Atributo atualizado com sucesso",
       "ERROR": "Não foi possível atualizar o atributo. Por favor, tente mais tarde"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/datePicker.json b/app/javascript/dashboard/i18n/locale/pt_BR/datePicker.json
new file mode 100644
index 0000000000000..1dcba7c9fbdd4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Aplicar",
+    "CLEAR_BUTTON": "Limpar",
+    "DATE_RANGE_INPUT": {
+      "START": "Data de inicio",
+      "END": "Data final"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "Intervalo de data",
+      "LAST_7_DAYS": "Últimos 7 dias",
+      "LAST_30_DAYS": "Últimos 30 dias",
+      "LAST_3_MONTHS": "Últimos 3 meses",
+      "LAST_6_MONTHS": "Últimos 6 meses",
+      "LAST_YEAR": "Ano passado",
+      "CUSTOM_RANGE": "Intervalo de datas personalizado"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/general.json b/app/javascript/dashboard/i18n/locale/pt_BR/general.json
index 25bb4dfb736d2..172ec48d119df 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/general.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/general.json
@@ -1,5 +1,5 @@
 {
   "GENERAL": {
-    "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items"
+    "SHOWING_RESULTS": "Mostrando {firstIndex}—{lastIndex} de {totalCount} itens"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index cae728b344439..fda625c219168 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Geral",
       "REPORTS": "Relatórios",
       "CONVERSATION": "Conversas",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Alterar Responsável",
       "CHANGE_PRIORITY": "Alterar Prioridade",
       "CHANGE_TEAM": "Alterar a Equipe",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 029226416cdbc..cd49825d7f6ba 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Adicionar agentes à caixa de entrada criada."
       },
       {
-        "title": "Voila!",
+        "title": "Então!",
         "route": "settings_inbox_finish",
         "body": "Está tudo pronto para começar!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Selecione uma página da lista",
         "INBOX_NAME": "Nome da Caixa de Entrada",
         "ADD_NAME": "Adicione um nome para sua caixa de entrada",
-        "PICK_NAME": "Escolha Um Nome Para Sua Caixa de Entrada",
+        "PICK_NAME": "Escolha um nome para sua caixa de entrada",
         "PICK_A_VALUE": "Escolha um valor"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL do webhook",
-          "PLACEHOLDER": "Digite a URL do Webhook",
+          "PLACEHOLDER": "Insira o URL do seu webhook",
           "ERROR": "Por favor, insira uma URL válida"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "Este campo é obrigatório"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Número de telefone",
+          "LABEL": "Número de Telefone",
           "PLACEHOLDER": "Por favor, insira o número de telefone do qual a mensagem será enviada.",
           "ERROR": "Por favor, forneça um número de telefone válido que comece com o símbolo \"+\" e não contenha espaços."
         },
@@ -160,7 +160,7 @@
         "TITLE": "Canal SMS",
         "DESC": "Comece a apoiar seus clientes via SMS.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Provedor de API",
           "TWILIO": "Twilio",
           "BANDWIDTH": "Bandwidth"
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Chave API",
-            "PLACEHOLDER": "Por favor, digite a sua chave da Bandwith API",
+            "PLACEHOLDER": "Insira sua chave API Bandwidth",
             "ERROR": "Este campo é obrigatório"
           },
           "API_SECRET": {
             "LABEL": "Chave secreta API",
-            "PLACEHOLDER": "Por favor, insira a sua chave da API Bandwith",
+            "PLACEHOLDER": "Insira sua API Secret do Bandwidth",
             "ERROR": "Este campo é obrigatório"
           },
           "APPLICATION_ID": {
@@ -212,7 +212,7 @@
         "TITLE": "Canal do WhatsApp",
         "DESC": "Comece a apoiar seus clientes via WhatsApp.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Provedor de API",
           "TWILIO": "Twilio",
           "WHATSAPP_CLOUD": "Cloud do WhatsApp",
           "360_DIALOG": "360Dialog"
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Token de verificação do Webhook",
-          "PLACEHOLDER": "Digite um token de verificação que você deseja configurar para webhooks do Facebook.",
+          "PLACEHOLDER": "Insira um token de verificação que você deseja configurar para webhooks do Facebook.",
           "ERROR": "Por favor, insira um valor válido."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL do Webhook",
-          "SUBTITLE": "Configure a URL onde deseja receber chamadas em eventos.",
+          "SUBTITLE": "Configure a URL onde você deseja receber retornos de chamada em eventos.",
           "PLACEHOLDER": "URL do Webhook"
         },
         "SUBMIT_BUTTON": "Criar canal de API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Canal de e-mail",
-        "DESC": "Integre sua caixa de email.",
+        "DESC": "Integre sua caixa de entrada de e-mail.",
         "CHANNEL_NAME": {
           "LABEL": "Nome do Canal",
           "PLACEHOLDER": "Por favor, insira um nome de canal",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agentes",
         "DESC": "Aqui você pode adicionar agentes para gerenciar sua caixa de entrada recém-criada. Somente esses agentes selecionados terão acesso à sua caixa de entrada. Os agentes que não fazem parte desta caixa de entrada não poderão ver ou responder a mensagens nessa caixa de entrada quando fizerem login. <br> <b> PS: </b> Como administrador, se você precisar acessar todas as caixas de entrada, adicione-se como agente a todas as caixas de entrada criadas.",
-        "VALIDATION_ERROR": "Adicione ao menos um agente a sua nova caixa de entrada",
+        "VALIDATION_ERROR": "Adicione pelo menos um agente à sua nova caixa de entrada",
         "PICK_AGENTS": "Escolha agentes para a caixa de entrada"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Nome do remetente",
-        "SUB_TEXT": "Selecione o nome a ser exibido para o seu cliente quando ele receber e-mails de seus agentes.",
+        "SUB_TEXT": "Selecione o nome mostrado ao seu cliente quando ele recebe e-mails dos seus agentes.",
         "FOR_EG": "Por ex:",
         "FRIENDLY": {
           "TITLE": "Amigável",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Permitir mensagens após a resolução da conversa",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permite que os usuários finais enviem mensagens mesmo depois que a conversa for resolvida.",
       "WHATSAPP_SECTION_SUBHEADER": "Esta chave de API é usada para a integração com as APIs do WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Digite a chave atualizada a ser usada para a integração com as APIs do WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Insira a nova chave API a ser utilizada para integração com as APIs do WhatsApp.",
       "WHATSAPP_SECTION_TITLE": "Chave API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Atualizar Chave de API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Digite a nova chave de API aqui",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualizar",
-      "WHATSAPP_WEBHOOK_TITLE": "Token de verificação do Webhook",
+      "WHATSAPP_WEBHOOK_TITLE": "Token de verificação Webhook",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Este token é usado para verificar a autenticidade do webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Para habilitar o SMTP, por favor configure o IMAP.",
       "UPDATE": "Atualizar configurações do IMAP",
       "TOGGLE_AVAILABILITY": "Habilitar a configuração IMAP para esta caixa de entrada",
-      "TOGGLE_HELP": "Habilitar o IMAP ajudará o usuário a receber e-mail",
+      "TOGGLE_HELP": "Ativar o IMAP ajudará o usuário a receber e-mails",
       "EDIT": {
         "SUCCESS_MESSAGE": "Configurações IMAP atualizadas com sucesso",
         "ERROR_MESSAGE": "Não é possível atualizar as configurações IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index b1735489cfa66..528835c723036 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -140,7 +140,7 @@
     ],
     "BUSINESS_HOURS": "Horários de funcionamento",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "Limpar filtros",
       "EMPTY_LIST": "Nenhum resultado encontrado"
     }
   },
@@ -511,20 +511,20 @@
     "SATURDAY": "Sábado"
   },
   "SLA_REPORTS": {
-    "HEADER": "SLA Reports",
-    "NO_RECORDS": "SLA applied conversations are not available.",
-    "LOADING": "Loading SLA data...",
-    "DOWNLOAD_SLA_REPORTS": "Download SLA reports",
-    "DOWNLOAD_FAILED": "Failed to download SLA Reports",
+    "HEADER": "Relatórios SLA",
+    "NO_RECORDS": "Conversas com SLA aplicadas não estão disponíveis.",
+    "LOADING": "Carregando dados de SLA...",
+    "DOWNLOAD_SLA_REPORTS": "Baixar relatórios de SLA",
+    "DOWNLOAD_FAILED": "Falha ao baixar os relatórios de SLA",
     "DROPDOWN": {
       "ADD_FIlTER": "Adicionar filtro",
-      "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_ALL": "Limpar tudo",
+      "CLEAR_FILTER": "Limpar filtros",
       "EMPTY_LIST": "Nenhum resultado encontrado",
-      "NO_FILTER": "No filters available",
-      "SEARCH": "Search filter",
+      "NO_FILTER": "Não há filtros disponíveis",
+      "SEARCH": "Filtro de pesquisa",
       "INPUT_PLACEHOLDER": {
-        "SLA": "SLA name",
+        "SLA": "Nome do SLA",
         "AGENTS": "Nome do Agente",
         "INBOXES": "Nome da Caixa de Entrada",
         "LABELS": "Nome do marcador",
@@ -538,25 +538,25 @@
     },
     "METRICS": {
       "HIT_RATE": {
-        "LABEL": "Hit Rate",
-        "TOOLTIP": "Percentage of SLAs created were completed successfully"
+        "LABEL": "Taxa de acerto",
+        "TOOLTIP": "Porcentagem de SLAs criados foram concluídos com êxito"
       },
       "NO_OF_MISSES": {
-        "LABEL": "Number of Misses",
-        "TOOLTIP": "Total SLA misses in a certain period"
+        "LABEL": "Número de Erros",
+        "TOOLTIP": "Total de SLA perdidos em um determinado período"
       },
       "NO_OF_CONVERSATIONS": {
-        "LABEL": "Number of Conversations",
-        "TOOLTIP": "Total number of conversations with SLA"
+        "LABEL": "Nº de Conversas",
+        "TOOLTIP": "Número total de conversas com SLA"
       }
     },
     "TABLE": {
       "HEADER": {
-        "POLICY": "Policy",
+        "POLICY": "Política",
         "CONVERSATION": "Conversas",
         "AGENT": "Agente"
       },
-      "VIEW_DETAILS": "View Details"
+      "VIEW_DETAILS": "Ver detalhes"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 9d87f04f8f364..dc4bc3845fac7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "A sua senha foi alterada com sucesso",
     "AFTER_EMAIL_CHANGED": "Seu perfil foi atualizado com sucesso. Faça login novamente, pois suas credenciais de login foram alteradas",
     "FORM": {
+      "PICTURE": "Foto do perfil",
       "AVATAR": "Imagem de Perfil",
       "ERROR": "Por favor, corrija os erros",
       "REMOVE_IMAGE": "Excluir",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token de acesso",
-        "NOTE": "Esse token pode ser usado se você estiver criando uma integração baseada em API"
+        "NOTE": "Esse token pode ser usado se você estiver criando uma integração baseada em API",
+        "COPY": "Copiar"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Notificações de Áudio",
         "NOTE": "Habilitar notificações de áudio no painel para novas mensagens e conversas.",
+        "ALERT_TYPES": {
+          "NONE": "Nenhuma",
+          "MINE": "Atribuído",
+          "ALL": "Todos"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Tipo de Alerta:",
+          "TITLE": "Eventos de alerta para conversas:",
           "NONE": "Nenhuma",
           "ASSIGNED": "Conversas atribuídas",
           "ALL_CONVERSATIONS": "Todas as conversas"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Enviar notificações por e-mail quando uma conversa perder a próxima resposta SLA",
         "SLA_MISSED_RESOLUTION": "Enviar notificações por e-mail quando uma conversa perder resolução de resolução SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Preferências de notificação",
+        "TYPE_TITLE": "Tipo de notificação",
+        "EMAIL": "e-mail",
+        "PUSH": "Notificação ",
+        "TYPES": {
+          "CONVERSATION_CREATED": "Uma nova conversa foi criada",
+          "CONVERSATION_ASSIGNED": "Uma conversa foi atribuída a você",
+          "CONVERSATION_MENTION": "Você foi mencionado em uma conversa",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Uma nova mensagem foi criada e atribuída",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Uma nova mensagem foi criada em uma conversa participante",
+          "SLA_MISSED_FIRST_RESPONSE": "Uma conversa perde o SLA de primeira resposta",
+          "SLA_MISSED_NEXT_RESPONSE": "Uma conversa perde o SLA da próxima resposta",
+          "SLA_MISSED_RESOLUTION": "Uma conversa perde o SLA de resolução"
+        },
+        "BROWSER_PERMISSION": "Ative notificações push em seu navegador para poder recebê-las"
+      },
       "API": {
         "UPDATE_SUCCESS": "Suas preferências de notificação foram atualizadas com sucesso",
         "UPDATE_ERROR": "Ocorreu um erro ao atualizar as preferências, por favor, tente novamente"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Ir para a barra lateral de Relatórios",
       "MOVE_TO_NEXT_TAB": "Mover para a próxima aba da lista de conversas",
       "GO_TO_SETTINGS": "Ir para Configurações",
-      "SWITCH_CONVERSATION_STATUS": "Mudar para o próximo status da conversa",
       "SWITCH_TO_PRIVATE_NOTE": "Mudar para Nota Privada",
       "SWITCH_TO_REPLY": "Mudar para resposta",
       "TOGGLE_SNOOZE_DROPDOWN": "Ativar/desativar soneca"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/sla.json b/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
index 53fb9973271ea..5098ed72c41ec 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
@@ -1,18 +1,30 @@
 {
   "SLA": {
     "HEADER": "SLA",
-    "ADD_ACTION": "",
-    "ADD_ACTION_LONG": "Create a new SLA Policy",
+    "ADD_ACTION": "Adicionar SLA",
+    "ADD_ACTION_LONG": "Criar uma nova Política de SLA",
     "DESCRIPTION": "Contratos de Nível de Serviço são contratos que definem expectativas claras entre sua equipe e os clientes. Estabelecem normas para tempos de resposta e de resolução, criando um quadro de responsabilização e garantindo uma experiência coerente e de qualidade.",
     "LEARN_MORE": "Saiba mais sobre SLA",
     "LOADING": "Buscando SLAs",
+    "PAYWALL": {
+      "TITLE": "Atualize para criar SLAs",
+      "AVAILABLE_ON": "O recurso SLA está disponível apenas nos planos Business e Enterprise.",
+      "UPGRADE_PROMPT": "Atualize seu plano para obter acesso a recursos avançados como gerenciamento de equipe, automações, atributos personalizados e muito mais.",
+      "UPGRADE_NOW": "Atualizar agora",
+      "CANCEL_ANYTIME": "Você pode alterar ou cancelar seu plano a qualquer momento"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "O recurso SLA está disponível apenas nos planos pagos.",
+      "UPGRADE_PROMPT": "Atualize para um plano pago para acessar recursos avançados como registros de auditoria, capacidade do agente e muito mais.",
+      "ASK_ADMIN": "Entre em contato com seu administrador para fazer a atualização."
+    },
     "LIST": {
-      "404": ".",
+      "404": "Não há SLAs disponíveis nesta conta.",
       "EMPTY": {
         "TITLE_1": "Enterprise P0",
-        "DESC_1": "Issues raised by enterprise customers, that require immediate attention.",
+        "DESC_1": "Questões levantadas por clientes empresariais que requerem atenção imediata.",
         "TITLE_2": "Enterprise P1",
-        "DESC_2": "Issues raised by enterprise customers, that needs to be acknowledged quickly."
+        "DESC_2": "Questões levantadas por clientes empresariais que precisam ser reconhecidas rapidamente."
       },
       "BUSINESS_HOURS_ON": "Horários de funcionamento",
       "BUSINESS_HOURS_OFF": "Horário comercial desligado",
@@ -21,17 +33,17 @@
         "NRT": "Próximo limite de tempo de resposta",
         "RT": "Limite de tempo de resolução",
         "SHORT_HAND": {
-          "FRT": "",
-          "NRT": "",
-          "RT": ""
+          "FRT": "FRT",
+          "NRT": "NRT",
+          "RT": "RT"
         }
       }
     },
     "FORM": {
       "NAME": {
-        "LABEL": "",
-        "PLACEHOLDER": "",
-        "REQUIRED_ERROR": "",
+        "LABEL": "Nome da SLA",
+        "PLACEHOLDER": "Nome da SLA",
+        "REQUIRED_ERROR": "Nome da SLA é obrigatória",
         "MINIMUM_LENGTH_ERROR": "Tamanho mínimo 2 é necessário",
         "VALID_ERROR": "Somente Letras, Números, Hífen e Sublinhado são permitidos"
       },
@@ -44,19 +56,19 @@
         "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "",
+        "LABEL": "Próximo tempo de resposta",
         "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
         "LABEL": "Tempo de resolução",
-        "PLACEHOLDER": ""
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Horário de funcionamento",
         "PLACEHOLDER": ""
       },
       "THRESHOLD_TIME": {
-        "INVALID_FORMAT_ERROR": ""
+        "INVALID_FORMAT_ERROR": "O limite deve ser um número e maior que zero"
       },
       "EDIT": "Alterar",
       "CREATE": "Criar",
@@ -64,10 +76,10 @@
       "CANCEL": "Cancelar"
     },
     "ADD": {
-      "TITLE": "",
-      "DESC": "Friendly promises for great service!",
+      "TITLE": "Adicionar SLA",
+      "DESC": "Promessas amigáveis ​​para um ótimo serviço!",
       "API": {
-        "SUCCESS_MESSAGE": "",
+        "SUCCESS_MESSAGE": "SLA adicionada com sucesso",
         "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
       }
     },
@@ -85,12 +97,12 @@
       }
     },
     "EVENTS": {
-      "TITLE": "SLA Misses",
+      "TITLE": "Faltas de SLA",
       "FRT": "Primeira resposta",
-      "NRT": "Next response time",
-      "RT": "Resolution time",
-      "SHOW_MORE": "{count} more",
-      "HIDE": "Hide {count} rows"
+      "NRT": "Próximo tempo de resposta",
+      "RT": "Tempo de resolução",
+      "SHOW_MORE": "{count} mais",
+      "HIDE": "Ocultar {count} linhas"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ro/bulkActions.json b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
index 9bb3137d2e806..7f6e2cc5acf4c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Se încarcă agenții",
     "UPDATE": {
       "CHANGE_STATUS": "Schimbați statusul",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Amânați până la următorul răspuns.",
+      "SNOOZE_UNTIL": "Amânați",
       "UPDATE_SUCCESFUL": "Statusul conversației a fost actualizat.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index d879a8673c93b..8272b283385cd 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Editează atribut personalizat",
       "CONTACT_LABELS": "Etichete de contact",
-      "PREVIOUS_CONVERSATIONS": "Conversații anterioare"
+      "PREVIOUS_CONVERSATIONS": "Conversații anterioare",
+      "NO_RECORDS_FOUND": "Nu s-au găsit atribute"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Exportă contacte",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index 3109ce2708bbb..e362cfbfcd7ba 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Creare atribut",
+    "NO_RECORDS_FOUND": "Nu s-au găsit atribute",
     "UPDATE": {
       "SUCCESS": "Atribut actualizat cu succes",
       "ERROR": "Imposibil de actualizat atributul. Vă rugăm să încercați din nou mai târziu"
diff --git a/app/javascript/dashboard/i18n/locale/ro/datePicker.json b/app/javascript/dashboard/i18n/locale/ro/datePicker.json
new file mode 100644
index 0000000000000..ab745096fc8d6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Aplică",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Ultimele 7 zile",
+      "LAST_30_DAYS": "Ultimele 30 zile",
+      "LAST_3_MONTHS": "Ultimele 3 luni",
+      "LAST_6_MONTHS": "Ultimele 6 luni",
+      "LAST_YEAR": "Anul trecut",
+      "CUSTOM_RANGE": "Interval de date particularizat"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index a27b9d23d68d1..49692a0117dcc 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Rapoarte",
       "CONVERSATION": "Conversație",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Modificarea cesionarului",
       "CHANGE_PRIORITY": "Modificarea priorității",
       "CHANGE_TEAM": "Schimbarea echipei",
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 4a952af5d1436..c60fe9aa8f599 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Adaugă agenți la inbox-ul creat."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "finalizare_setari_inbox",
         "body": "Toate setarile sunt facute!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Selectaţi o pagină din listă",
         "INBOX_NAME": "Nume Inbox",
         "ADD_NAME": "Adaugă un nume pentru inbox-ul tău",
-        "PICK_NAME": "Alege un nume pentru Inbox-ul tău",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Alege o valoare"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL Webhook",
-          "PLACEHOLDER": "Introduceți adresa URL Webhook",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Te rog introdu un URL valid"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Cheie API",
-            "PLACEHOLDER": "Vă rugăm să introduceți cheia API Bandwith",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Acest câmp este obligatoriu"
           },
           "API_SECRET": {
             "LABEL": "API secret",
-            "PLACEHOLDER": "Vă rugăm să introduceți Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Acest câmp este obligatoriu"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verifica token-ul",
-          "PLACEHOLDER": "Introduceți un simbol verifica pe care doriți să configurați pentru webhooks Facebook.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Vă rugăm să introduceți o valoare validă."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL Webhook",
-          "SUBTITLE": "Configurați adresa URL în cazul în care doriți să primiți apeluri inverse pentru evenimente.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL Webhook"
         },
         "SUBMIT_BUTTON": "Creare canal API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Canal de e-mail",
-        "DESC": "Integrați-vă inboxul de e-mail.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Nume canal",
           "PLACEHOLDER": "Te rugăm să introduci un conținut",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenți",
         "DESC": "Aici puteți adăuga agenți care să gestioneze inboxul nou creat. Numai acești agenți selectați vor avea acces la căsuța poștală. Agenții care nu fac parte din această căsuță poștală nu vor putea vedea sau răspunde la mesajele din această căsuță atunci când se autentifică. <br> <b>PS:</b> În calitate de administrator, dacă aveţi nevoie de acces la toate mesajele, ar trebui să vă adăugați ca agent la toate cutiile de mesaje pe care le creați.",
-        "VALIDATION_ERROR": "Adăugați cel puțin un agent în noul Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Alegerea agenților pentru inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Amical",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Permiteți rezolvarea mesajelor după ce conversația a fost rezolvată",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permiteți utilizatorilor finali să trimită mesaje chiar și după rezolvarea conversației.",
       "WHATSAPP_SECTION_SUBHEADER": "Această cheie API este utilizată pentru integrarea cu API-urile WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Introduceți cheia actualizată pentru a fi utilizată pentru integrarea cu API-urile WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Cheie API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Actualizați cheia API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Introduceți noua cheie API aici",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizare",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verifica token-ul",
+      "WHATSAPP_WEBHOOK_TITLE": "Token de verificare Webhook",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Acest simbol este utilizat pentru a verifica autenticitatea punctului final webhook.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Actualizarea setărilor formularului pre-chat"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Pentru a activa SMTP, vă rugăm să configurați IMAP.",
       "UPDATE": "Actualizarea setărilor IMAP",
       "TOGGLE_AVAILABILITY": "Activarea configurației IMAP pentru acest inbox",
-      "TOGGLE_HELP": "Activarea IMAP va ajuta utilizatorul să primească e-mailuri",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Setările IMAP actualizate cu succes",
         "ERROR_MESSAGE": "Imposibil de actualizat setările IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 5f02dae7cefe0..4f1cd9af28630 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Parola ta a fost schimbată cu succes",
     "AFTER_EMAIL_CHANGED": "Profilul tău a fost actualizat cu succes, te rugăm să te autentifici din nou pentru că datele tale de autentificare au fost modificate",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Imagine de profil",
       "ERROR": "Vă rugăm să remediați erorile din formular",
       "REMOVE_IMAGE": "Elimină",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token acces",
-        "NOTE": "Acest token poate fi utilizat dacă construiți o integrare bazată pe API"
+        "NOTE": "Acest token poate fi utilizat dacă construiți o integrare bazată pe API",
+        "COPY": "Copiază"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Notificări audio",
         "NOTE": "Activați notificările audio în tabloul de bord pentru mesaje și conversații noi.",
+        "ALERT_TYPES": {
+          "NONE": "Nimic",
+          "MINE": "Assigned",
+          "ALL": "Toate"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Evenimente de alertă:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Nimic",
           "ASSIGNED": "Conversații atribuite",
           "ALL_CONVERSATIONS": "Toate conversațiile"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-mail",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Preferințele de notificare sunt actualizate cu succes",
         "UPDATE_ERROR": "A apărut o eroare la actualizarea preferințelor, încercați din nou"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Accesați bara laterală Rapoarte",
       "MOVE_TO_NEXT_TAB": "Deplasarea la fila următoare din lista de conversații",
       "GO_TO_SETTINGS": "Accesați Pagina Setări",
-      "SWITCH_CONVERSATION_STATUS": "Comutarea la următoarea stare a conversației",
       "SWITCH_TO_PRIVATE_NOTE": "Comutarea la Notă privată",
       "SWITCH_TO_REPLY": "Comutarea la Răspuns",
       "TOGGLE_SNOOZE_DROPDOWN": "Comutați snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ro/sla.json b/app/javascript/dashboard/i18n/locale/ro/sla.json
index 4af19276e72d9..65b6ed86ccf27 100644
--- a/app/javascript/dashboard/i18n/locale/ro/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ro/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ru/bulkActions.json b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
index 81ffc333df80e..8c64c6cb6eb76 100644
--- a/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Загрузка агентов",
     "UPDATE": {
       "CHANGE_STATUS": "Изменить статус",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Отложить до следующего ответа.",
+      "SNOOZE_UNTIL": "Отложено",
       "UPDATE_SUCCESFUL": "Статус беседы успешно обновлен.",
       "UPDATE_FAILED": "Не удалось обновить диалоги, попробуйте еще раз."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index 699ee7b092ee1..62a3e2c29f71a 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Пользовательские атрибуты",
       "CONTACT_LABELS": "Ярлыки контактов",
-      "PREVIOUS_CONVERSATIONS": "Предыдущие диалоги"
+      "PREVIOUS_CONVERSATIONS": "Предыдущие диалоги",
+      "NO_RECORDS_FOUND": "Атрибуты не найдены"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Экспорт контактов",
       "MESSAGE": "Вы уверены, что хотите экспортировать все контакты?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Да, экспортировать",
       "NO": "Нет, отменить"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 3b0e7365f93da..b714a54ffe18e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Создать атрибут",
+    "NO_RECORDS_FOUND": "Атрибуты не найдены",
     "UPDATE": {
       "SUCCESS": "Атрибут успешно обновлен",
       "ERROR": "Не удается обновить атрибут. Повторите попытку позже"
diff --git a/app/javascript/dashboard/i18n/locale/ru/datePicker.json b/app/javascript/dashboard/i18n/locale/ru/datePicker.json
new file mode 100644
index 0000000000000..0b9e802d3a2fb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Применить",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Последние 7 дней",
+      "LAST_30_DAYS": "Последние 30 дней",
+      "LAST_3_MONTHS": "Последние 3 месяца",
+      "LAST_6_MONTHS": "Последние 6 месяцев",
+      "LAST_YEAR": "За прошлый год",
+      "CUSTOM_RANGE": "Настраиваемый диапазон даты"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 5b4bbca0028a6..c6691e23f21c0 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Главное",
       "REPORTS": "Отчёты",
       "CONVERSATION": "Диалоги",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Изменить Назначенного",
       "CHANGE_PRIORITY": "Изменить приоритет",
       "CHANGE_TEAM": "Изменить команду",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 4c181fd1aea75..887bf51f5bf9b 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Добавить агента в созданный источник."
       },
       {
-        "title": "Ура!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Все готово!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Выберите страницу из списка",
         "INBOX_NAME": "Имя источника",
         "ADD_NAME": "Введите имя источника",
-        "PICK_NAME": "Выберите имя для источника",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Выберите значение"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL вебхука",
-          "PLACEHOLDER": "Введите URL-адрес вебхука",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Пожалуйста, введите правильный URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Ключ API",
-            "PLACEHOLDER": "Пожалуйста, введите ваш Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Это поле обязательно"
           },
           "API_SECRET": {
             "LABEL": "Секретный ключ API",
-            "PLACEHOLDER": "Пожалуйста, введите ваш секретный ключ аккаунта Bandwidth",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Это поле обязательно"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Вебхук верифицировать токен",
-          "PLACEHOLDER": "Введите контрольный токен, который вы хотите настроить для вебхуков Facebook.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Пожалуйста, введите правильное значение."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL вебхука",
-          "SUBTITLE": "Добавьте URL, на который вы бы хотели получать callback-события.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "URL вебхука"
         },
         "SUBMIT_BUTTON": "Создайте источник API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email источник",
-        "DESC": "Интегрируйте ваш почтовый ящик.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "имя источника",
           "PLACEHOLDER": "Пожалуйста введите имя источника",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Операторы",
         "DESC": "Здесь вы можете добавить операторов для управления только что созданным источником. Только эти операторы будут иметь доступ к вашему источнику. Операторы, которые не являются частью этого источника, не смогут видеть диалоги или отвечать на них. <br> <b>PS:</b> Если вам как администратору нужен доступ ко всем источникам, то вы должны добавить себя как операторы во все каналы, которые вы создаете.",
-        "VALIDATION_ERROR": "Добавьте хотя бы одного агента в новый канал",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Выберите агентов для канала"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Имя отправителя",
-        "SUB_TEXT": "Выберите имя, отображаемое клиенту, когда он получает письма от ваших агентов.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "Например:",
         "FRIENDLY": {
           "TITLE": "Дружелюбный",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Разрешить отправлять сообщения после завершения разговора",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Разрешить пользователям отправлять сообщения даже после того, как разговор будет завершен.",
       "WHATSAPP_SECTION_SUBHEADER": "Этот ключ API используется для интеграции с API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Введите обновленный ключ для интеграции с WhatsApp API.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Ключ API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Обновить ключ API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Введите сюда новый ключ API",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновить",
-      "WHATSAPP_WEBHOOK_TITLE": "Вебхук верифицировать токен",
+      "WHATSAPP_WEBHOOK_TITLE": "Токен авторизации Webhook",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Этот токен используется для проверки подлинности конечной точки веб-хука.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Обновить настройки формы для чата"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Для включения SMTP, настройте IMAP.",
       "UPDATE": "Обновить настройки IMAP",
       "TOGGLE_AVAILABILITY": "Включить конфигурацию IMAP для этого ящика",
-      "TOGGLE_HELP": "Включение IMAP поможет пользователю получить электронную почту",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Настройки IMAP успешно обновлены",
         "ERROR_MESSAGE": "Невозможно обновить настройки IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index 9cb6b58c507f8..04f751a10b27b 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -40,7 +40,7 @@
         "DESC": "( Всего )"
       },
       "BOT_HANDOFF_COUNT": {
-        "NAME": "Handoff Count",
+        "NAME": "Количество передач",
         "DESC": "( Всего )"
       },
       "REPLY_TIME": {
@@ -140,7 +140,7 @@
     ],
     "BUSINESS_HOURS": "Время работы",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "Очистить фильтр",
       "EMPTY_LIST": "Результаты не найдены"
     }
   },
@@ -519,7 +519,7 @@
     "DROPDOWN": {
       "ADD_FIlTER": "Добавить фильтр",
       "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "Очистить фильтр",
       "EMPTY_LIST": "Результаты не найдены",
       "NO_FILTER": "No filters available",
       "SEARCH": "Search filter",
@@ -530,7 +530,7 @@
         "LABELS": "Название категории",
         "TEAMS": "Название команды"
       },
-      "SLA": "SLA Policy",
+      "SLA": "Политика SLA",
       "INBOXES": "Электронная почта",
       "AGENTS": "Оператор",
       "LABELS": "Метка",
@@ -547,16 +547,16 @@
       },
       "NO_OF_CONVERSATIONS": {
         "LABEL": "Number of Conversations",
-        "TOOLTIP": "Total number of conversations with SLA"
+        "TOOLTIP": "Общее количество разговоров с SLA"
       }
     },
     "TABLE": {
       "HEADER": {
-        "POLICY": "Policy",
+        "POLICY": "Политика",
         "CONVERSATION": "Диалоги",
         "AGENT": "Оператор"
       },
-      "VIEW_DETAILS": "View Details"
+      "VIEW_DETAILS": "Просмотреть подробности"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 735cc4731fcc8..5748315b60019 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Ваш пароль успешно изменен",
     "AFTER_EMAIL_CHANGED": "Ваш профиль был успешно обновлен, пожалуйста, войдите снова, так как ваши учетные данные были изменены",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Изображение",
       "ERROR": "Пожалуйста, исправьте ошибки",
       "REMOVE_IMAGE": "Удалить",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Токен доступа",
-        "NOTE": "Этот токен может быть использован, если вы настраиваете интеграцию на основе API"
+        "NOTE": "Этот токен может быть использован, если вы настраиваете интеграцию на основе API",
+        "COPY": "Копировать"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Звуковые уведомления",
         "NOTE": "Включить звуковые уведомления в панели управления для новых сообщений и разговоров.",
+        "ALERT_TYPES": {
+          "NONE": "Ничего",
+          "MINE": "Assigned",
+          "ALL": "Все"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Уведомлять о:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Нет",
           "ASSIGNED": "Назначенные беседы",
           "ALL_CONVERSATIONS": "Диалоги"
@@ -84,9 +91,26 @@
         "CONVERSATION_MENTION": "Отправлять email уведомление, когда вас упоминают в диалоге",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Отправлять email уведомления при создании нового сообщения в назначенном диалоге",
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Отправлять уведомления по электронной почте, когда в разговоре создается новое сообщение",
-        "SLA_MISSED_FIRST_RESPONSE": "Send email notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "Отправить уведомление по электронной почте, если разговор не соответствует SLA первого ответа",
+        "SLA_MISSED_NEXT_RESPONSE": "Отправить уведомление по электронной почте, если разговор не успел получить следующий ответ SLA",
+        "SLA_MISSED_RESOLUTION": "Отправить уведомление по электронной почте, если разговор не соответствует SLA"
+      },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
       },
       "API": {
         "UPDATE_SUCCESS": "Настройки уведомлений сохранены",
@@ -102,9 +126,9 @@
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Отправлять push-уведомления при создании нового сообщения в участвующем разговоре",
         "HAS_ENABLED_PUSH": "Вы включили push уведомления для этого браузера.",
         "REQUEST_PUSH": "Включить push-уведомления",
-        "SLA_MISSED_FIRST_RESPONSE": "Send push notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send push notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send push notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "Отправить push-уведомление, если разговор не соответствует SLA первого ответа",
+        "SLA_MISSED_NEXT_RESPONSE": "Отправить push-уведомление, если разговор не успел получить следующий ответ SLA",
+        "SLA_MISSED_RESOLUTION": "Отправить push-уведомление, если разговор не соответствует уровню разрешения SLA"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Изображение профиля"
@@ -205,7 +229,7 @@
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Сейчас просматривается:",
     "SWITCH": "Переключить",
-    "INBOX_VIEW": "Inbox View",
+    "INBOX_VIEW": "Просмотр входящих сообщений",
     "CONVERSATIONS": "Диалоги",
     "INBOX": "Электронная почта",
     "ALL_CONVERSATIONS": "Диалоги",
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Перейти к боковой панели отчетов",
       "MOVE_TO_NEXT_TAB": "Переместить на следующую вкладку в списке диалогов",
       "GO_TO_SETTINGS": "Перейти к настройкам",
-      "SWITCH_CONVERSATION_STATUS": "Переключиться на статус следующего диалога",
       "SWITCH_TO_PRIVATE_NOTE": "Переключиться на заметку",
       "SWITCH_TO_REPLY": "Переключиться на ответ",
       "TOGGLE_SNOOZE_DROPDOWN": "Вкл/выкл повтор"
diff --git a/app/javascript/dashboard/i18n/locale/ru/sla.json b/app/javascript/dashboard/i18n/locale/ru/sla.json
index 2a6e18b5689dc..fa04d6ce40755 100644
--- a/app/javascript/dashboard/i18n/locale/ru/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ru/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Получение SLA",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "В этой учетной записи нет доступных SLA.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/sh/bulkActions.json b/app/javascript/dashboard/i18n/locale/sh/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/sh/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sh/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/sh/contact.json b/app/javascript/dashboard/i18n/locale/sh/contact.json
index baac962bb3bd8..992f9e1f48a3f 100644
--- a/app/javascript/dashboard/i18n/locale/sh/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sh/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sh/conversation.json b/app/javascript/dashboard/i18n/locale/sh/conversation.json
index f1b7d1fb92c10..cc3e4569bc729 100644
--- a/app/javascript/dashboard/i18n/locale/sh/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sh/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/sh/datePicker.json b/app/javascript/dashboard/i18n/locale/sh/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sh/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
index 1b138fe95bfa6..674f0ef961e82 100644
--- a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/sh/settings.json b/app/javascript/dashboard/i18n/locale/sh/settings.json
index bfc1a79df27cf..4dca590e96dc1 100644
--- a/app/javascript/dashboard/i18n/locale/sh/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/sh/sla.json b/app/javascript/dashboard/i18n/locale/sh/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/sh/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sh/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/sk/bulkActions.json b/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
index 0379c0eb9e765..a5041dce4464c 100644
--- a/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index 0c993a4acf8e9..105a2faccdd60 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Vlastné atribúty",
       "CONTACT_LABELS": "Označenia kontaktov",
-      "PREVIOUS_CONVERSATIONS": "Prechádzajúce konverzácie"
+      "PREVIOUS_CONVERSATIONS": "Prechádzajúce konverzácie",
+      "NO_RECORDS_FOUND": "Žiadne atribúty neboli nájdené"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index 0dcf49450669e..b2fae8f0d21f2 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Vytvoriť atribút",
+    "NO_RECORDS_FOUND": "Žiadne atribúty neboli nájdené",
     "UPDATE": {
       "SUCCESS": "Atribút úspešne nahraný",
       "ERROR": "Nie je možné aktualizovať atribút. Skúste to prosím neskôr"
diff --git a/app/javascript/dashboard/i18n/locale/sk/datePicker.json b/app/javascript/dashboard/i18n/locale/sk/datePicker.json
new file mode 100644
index 0000000000000..82b17722ed47f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Použiť",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Posledných 7 dní",
+      "LAST_30_DAYS": "Posledných 30 dní",
+      "LAST_3_MONTHS": "Posledné 3 mesiace",
+      "LAST_6_MONTHS": "Posledných 6 mesiacov",
+      "LAST_YEAR": "Posledný rok",
+      "CUSTOM_RANGE": "Vlastný rozsah dátumov"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index 6197fc35e8427..ed241f423e63b 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Všeobecné",
       "REPORTS": "Reporty",
       "CONVERSATION": "Konverzácia",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Zmeniť prideleného agenta",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Zmeniť tím",
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index 6dc024aa1750e..549d28eade092 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Meno schránky",
         "ADD_NAME": "Pridať meno pre vašu schránku",
-        "PICK_NAME": "Vyberte si meno pre svoju schránku",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Vybrať hodnotu"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Zadajte svoju Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Prosím zadajte platnú URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API kľúč",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Toto pole je povinné"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Toto pole je povinné"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Nakonfigurujte adresu URL, na ktorú chcete prijímať spätné volania (callback) pri udalostiach.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Vytvoriť API kanál",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Emailový kanál",
-        "DESC": "Integrácia e-mailovej schránky.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Názov kanálu",
           "PLACEHOLDER": "Zadajte názov kanála",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenti",
         "DESC": "Tu môžete pridať agentov na správu novovytvorenej schránky. Len títo vybraní agenti budú mať prístup k vašej schránke. Agenti, ktorí nie sú súčasťou tejto schránky, nebudú môcť po prihlásení vidieť správy v tejto schránke ani na ne reagovať. <br> <b>PS:</b> Ak ako správca potrebujete prístup ku všetkým schránkam, mali by ste sa pridať ako agent ku všetkým vytvoreným schránkam.",
-        "VALIDATION_ERROR": "Pridajte aspoň jedného agenta do novej schránky",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Vyberte agentov pre schránku"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API kľúč",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Aktualizovať IMAP nastavenia",
       "TOGGLE_AVAILABILITY": "Povolenie konfigurácie IMAP pre túto schránku",
-      "TOGGLE_HELP": "Povolenie protokolu IMAP pomôže používateľovi prijímať e-maily",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Úspešná aktualizácia nastavení IMAP",
         "ERROR_MESSAGE": "Nebolo možné aktualizovať nastavenia IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index e6bb1975da424..151996596ce1f 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Prosím, opravte chyby vo formulári",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Prístupový token",
-        "NOTE": "Tento token môžete použiť, ak vytvárate integráciu založenú na rozhraní API"
+        "NOTE": "Tento token môžete použiť, ak vytvárate integráciu založenú na rozhraní API",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Zvukové oznámenia",
         "NOTE": "Povoliť zvukové upozornenia na paneli s novými správami a konverzáciami.",
+        "ALERT_TYPES": {
+          "NONE": "Žiadne",
+          "MINE": "Assigned",
+          "ALL": "Všetko"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Žiadne",
           "ASSIGNED": "Pridelené konverzácie",
           "ALL_CONVERSATIONS": "Všetky konverzácie"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-mail",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Vaše nastavenia oznámení sa úspešne aktualizovali",
         "UPDATE_ERROR": "Pri aktualizácii nastavení došlo k chybe, skúste to prosím znova"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Presun na ďalšiu kartu v zozname konverzácií",
       "GO_TO_SETTINGS": "Prejsť na nastavenia",
-      "SWITCH_CONVERSATION_STATUS": "Prepnúť na ďalší stav konverzácie",
       "SWITCH_TO_PRIVATE_NOTE": "Prepnúť na súkromnú poznámku",
       "SWITCH_TO_REPLY": "Prepnúť na odpoveď",
       "TOGGLE_SNOOZE_DROPDOWN": "Prepínanie módu \"snooze\""
diff --git a/app/javascript/dashboard/i18n/locale/sk/sla.json b/app/javascript/dashboard/i18n/locale/sk/sla.json
index 1b420eb978322..f2cec82cbda6b 100644
--- a/app/javascript/dashboard/i18n/locale/sk/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sk/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/sl/bulkActions.json b/app/javascript/dashboard/i18n/locale/sl/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/sl/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sl/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/sl/contact.json b/app/javascript/dashboard/i18n/locale/sl/contact.json
index 24483ca1ad7ef..4db7fce93e026 100644
--- a/app/javascript/dashboard/i18n/locale/sl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sl/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sl/conversation.json b/app/javascript/dashboard/i18n/locale/sl/conversation.json
index d6ea8f83d75c1..742a3657e8560 100644
--- a/app/javascript/dashboard/i18n/locale/sl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sl/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/sl/datePicker.json b/app/javascript/dashboard/i18n/locale/sl/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sl/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
index 8d1662f91f0e6..a168e82f02bb3 100644
--- a/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/sl/settings.json b/app/javascript/dashboard/i18n/locale/sl/settings.json
index bfc1a79df27cf..4dca590e96dc1 100644
--- a/app/javascript/dashboard/i18n/locale/sl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/sl/sla.json b/app/javascript/dashboard/i18n/locale/sl/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/sl/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sl/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/sq/bulkActions.json b/app/javascript/dashboard/i18n/locale/sq/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/sq/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sq/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/sq/contact.json b/app/javascript/dashboard/i18n/locale/sq/contact.json
index 24483ca1ad7ef..4db7fce93e026 100644
--- a/app/javascript/dashboard/i18n/locale/sq/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sq/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sq/conversation.json b/app/javascript/dashboard/i18n/locale/sq/conversation.json
index d6ea8f83d75c1..742a3657e8560 100644
--- a/app/javascript/dashboard/i18n/locale/sq/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sq/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/sq/datePicker.json b/app/javascript/dashboard/i18n/locale/sq/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sq/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
index 8d1662f91f0e6..a168e82f02bb3 100644
--- a/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/sq/settings.json b/app/javascript/dashboard/i18n/locale/sq/settings.json
index bfc1a79df27cf..4dca590e96dc1 100644
--- a/app/javascript/dashboard/i18n/locale/sq/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/sq/sla.json b/app/javascript/dashboard/i18n/locale/sq/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/sq/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sq/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/sr/bulkActions.json b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
index 2e4e996fed993..d294574fef0e5 100644
--- a/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Učitavanje agenata",
     "UPDATE": {
       "CHANGE_STATUS": "Promeni status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Odloži do sledećeg odgovora.",
+      "SNOOZE_UNTIL": "Odloži",
       "UPDATE_SUCCESFUL": "Status razgovora je uspešno promenjen.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/sr/contact.json b/app/javascript/dashboard/i18n/locale/sr/contact.json
index d4a5c8fadc10f..53d0d60d6ee6f 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Prilagođeni atributi",
       "CONTACT_LABELS": "Oznake kontakta",
-      "PREVIOUS_CONVERSATIONS": "Prethodni razgovor"
+      "PREVIOUS_CONVERSATIONS": "Prethodni razgovor",
+      "NO_RECORDS_FOUND": "Nijedan atribut nije pronađen"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sr/conversation.json b/app/javascript/dashboard/i18n/locale/sr/conversation.json
index c8414e82aaabf..6902ac4fce78a 100644
--- a/app/javascript/dashboard/i18n/locale/sr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Napravi atribut",
+    "NO_RECORDS_FOUND": "Nijedan atribut nije pronađen",
     "UPDATE": {
       "SUCCESS": "Atribut je uspešno izmenjen",
       "ERROR": "Nije bilo moguće izmeniti atribut. Molim vas pokušajte ponovo"
diff --git a/app/javascript/dashboard/i18n/locale/sr/datePicker.json b/app/javascript/dashboard/i18n/locale/sr/datePicker.json
new file mode 100644
index 0000000000000..b41fe952a2550
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Primeni",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Poslednjih 7 dana",
+      "LAST_30_DAYS": "Poslednjih 30 dana",
+      "LAST_3_MONTHS": "Poslednja 3 meseca",
+      "LAST_6_MONTHS": "Poslednjih 6 meseci",
+      "LAST_YEAR": "Poslednja godina",
+      "CUSTOM_RANGE": "Prilagođen opseg vremena"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index 36f59dbc06a02..ecbf3e360b2e3 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Opšta",
       "REPORTS": "Izveštaji",
       "CONVERSATION": "Razgovor",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Promeni dodeljenog",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Promeni tim",
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index cdef30a0b88ba..b03568abd8588 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Dodajte agente napravljenom prijamnom sandučetu."
       },
       {
-        "title": "Izvolite!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Sve je spremno za početak!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Izaberite stranicu iz spiska",
         "INBOX_NAME": "Naziv prijemnog sandučeta",
         "ADD_NAME": "Dodajte naziv vašem prijemnom sandučetu",
-        "PICK_NAME": "Izaberite naziv vašeg prijemnog sandučeta",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Izaberite vrednost"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Adresa veb zakačke",
-          "PLACEHOLDER": "Unesite adresu veb zakačke",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Molim vas unesite ispravnu adresu"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API ključ",
-            "PLACEHOLDER": "Molim vas unesite Bandwidth API ključ",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Ovo polje je obavezno"
           },
           "API_SECRET": {
             "LABEL": "API tajna",
-            "PLACEHOLDER": "Molim vas unesite Bandwidth API tajnu",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Ovo polje je obavezno"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Token potvrde veb zakačke",
-          "PLACEHOLDER": "Unesite token potvrde koji želite da podesite za fejsbuk veb zakačke.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Molim vas unesite ispravnu vrednost."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Adresa veb zakačke",
-          "SUBTITLE": "Podesite adresu gde želite da primate povratne pozive za događaje.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Adresa veb zakačke"
         },
         "SUBMIT_BUTTON": "Napravite API kanal",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Kanal e-pošte",
-        "DESC": "Integrišite prijemno sanduče vaše e-pošte.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Naziv kanala",
           "PLACEHOLDER": "Molim vas unesite naziv kanala",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenti",
         "DESC": "Ovde možete da dodate agente da upravljaju vašim novokreiranim poštaniskim sandučetom. Samo ovi agenti će imati pristup vašem poštanskom sandučetu. Agenti koji nisu deo ovog poštanskog sandučeta neće moći da vide ili odgovaraju na poruke u ovom poštanskom sandučetu kada se prijave. <br> <b>PS:</b> Kao administrator, ako vam je potreban pristup svim poštanskim sandučićima, trebalo bi da dodate sebe kao agenta u sve poštanske sandučiće koje napravite.",
-        "VALIDATION_ERROR": "Dodajte najmanje jednog agenta novom poštanskom sandučetu",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Izaberite agente za prijemno sanduče"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Dozvoli poruke nakon rešavanja razgovora",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Dozvolite krajnjim korisnicima da šalju poruke čak i kada je razgovor rešen.",
       "WHATSAPP_SECTION_SUBHEADER": "Ovaj API ključ se koristi za integraciju sa WhatsApp API-jima.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API ključ",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Primeni",
-      "WHATSAPP_WEBHOOK_TITLE": "Token potvrde veb zakačke",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Da bi ste omogućili SMTP, molim vas podesite IMAP.",
       "UPDATE": "Izmenite IMAP podešavanja",
       "TOGGLE_AVAILABILITY": "Omogući IMAP podešavanja za ovo prijemno sanduče",
-      "TOGGLE_HELP": "Omogućavanje IMAP-a će pomoći korisniku da prima e-poruke",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP podešavanja su uspešno izmenjena",
         "ERROR_MESSAGE": "Nije bilo moguče izmeniti IMAP podešavanja"
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 1736e8357fdee..5a66f107a0121 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Vaša lozinka je uspešno promenjena",
     "AFTER_EMAIL_CHANGED": "Vaš profil je uspešno izmenjen, molim vas prijavite se ponovo jer su vaši kredencijali za prijavu izmenjeni",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Slika profila",
       "ERROR": "Molim vas ispravite greške formulara",
       "REMOVE_IMAGE": "Ukloni",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token za pristup",
-        "NOTE": "Ovaj token se može koristiti ako izgrađujete integraciju zasnovanu na API-ju"
+        "NOTE": "Ovaj token se može koristiti ako izgrađujete integraciju zasnovanu na API-ju",
+        "COPY": "Kopiraj"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Zvučna obaveštenja",
         "NOTE": "Omogućavanje zvučnih obaveštenja u radnoj tabli za nove poruke i razgovore.",
+        "ALERT_TYPES": {
+          "NONE": "Niko",
+          "MINE": "Assigned",
+          "ALL": "Sve"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Niko",
           "ASSIGNED": "Dodeljeni razgovori",
           "ALL_CONVERSATIONS": "Svi razgovori"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-pošta",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Vaša podešavanja obaveštenja su uspešno izmenjena",
         "UPDATE_ERROR": "Pojavila se greška pri izmeni podešavanja, molim vas pokušajte ponovo"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Idi na bočnu traku izveštaja",
       "MOVE_TO_NEXT_TAB": "idi na sledeću karticu u spisku razgovora",
       "GO_TO_SETTINGS": "Idi na podešavanja",
-      "SWITCH_CONVERSATION_STATUS": "Prebaci se na sledeći status razgovora",
       "SWITCH_TO_PRIVATE_NOTE": "Prebaci se na privatnu belešku",
       "SWITCH_TO_REPLY": "Prebaci se na odgovor",
       "TOGGLE_SNOOZE_DROPDOWN": "Uključite padajućim menijom odlaganja"
diff --git a/app/javascript/dashboard/i18n/locale/sr/sla.json b/app/javascript/dashboard/i18n/locale/sr/sla.json
index 5ce68acc49ce3..980835961bf63 100644
--- a/app/javascript/dashboard/i18n/locale/sr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sr/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/sv/bulkActions.json b/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
index d57c71404fae2..220c2de0b5ffa 100644
--- a/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Laddar agenter",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooza",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index 1a77c0dde1fde..d57c6655fe343 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Egna egenskaper",
       "CONTACT_LABELS": "Etiketter för kontakt",
-      "PREVIOUS_CONVERSATIONS": "Tidigare konversationer"
+      "PREVIOUS_CONVERSATIONS": "Tidigare konversationer",
+      "NO_RECORDS_FOUND": "Inga attribut hittades"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 7acd19d49a6bd..3a40f68bde2fe 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "Inga attribut hittades",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/sv/datePicker.json b/app/javascript/dashboard/i18n/locale/sv/datePicker.json
new file mode 100644
index 0000000000000..ff981d4a6b8a2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Senaste 7 dagarna",
+      "LAST_30_DAYS": "Senaste 30 dagarna",
+      "LAST_3_MONTHS": "De senaste 3 månaderna",
+      "LAST_6_MONTHS": "De senaste 6 månaderna",
+      "LAST_YEAR": "Senaste året",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index 00fea1a42e3ba..325d7b36a6c6e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Rapporter",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 0c3cd16ddae00..68ed3a292226f 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Lägg till agenter till den skapade inkorgen."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Ni är redo att köra!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Välj en sida från listan",
         "INBOX_NAME": "Inkorgsnamn",
         "ADD_NAME": "Lägg till ett namn för din inkorg",
-        "PICK_NAME": "Välj ett namn på din inkorg",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Välj ett värde"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Ange en giltig URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Detta fält är obligatoriskt"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Detta fält är obligatoriskt"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Ange ett giltigt värde."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Konfigurera URL:en där du vill få callbacks på händelser.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Skapa API-kanal",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "E-postkanal",
-        "DESC": "Integrera din e-postinkorg.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Kanalnamn",
           "PLACEHOLDER": "Ange ett kanalnamn",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agenter",
         "DESC": "Här kan du lägga till agenter för att hantera din nyskapade inkorg. Endast dessa utvalda agenter har tillgång till din inkorg. Agenter som inte är en del av denna inkorg kommer inte att kunna se eller svara på meddelanden i denna inkorg när de loggar in. <br> <b>PS:</b> Som administratör om du behöver åtkomst till alla inkorgar, du bör lägga till dig själv som agent till alla inkorgar som du skapar.",
-        "VALIDATION_ERROR": "Lägg till minst en agent till din nya inkorg",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Välj agenter för inkorgen"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Uppdatera",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 20bcd4b2fb498..5d3f3d614b3ad 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Din profil har uppdaterats. Vänligen logga in på nytt eftersom dina inloggningsuppgifter har ändrats",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profilbild",
       "ERROR": "Vänligen åtgärda formulärfel",
       "REMOVE_IMAGE": "Radera",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Åtkomsttoken",
-        "NOTE": "Denna token kan användas om du bygger en API-baserad integration"
+        "NOTE": "Denna token kan användas om du bygger en API-baserad integration",
+        "COPY": "Kopiera"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "Inget",
+          "MINE": "Assigned",
+          "ALL": "Alla"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Inget",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-post",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Dina aviseringsinställningar har uppdaterats",
         "UPDATE_ERROR": "Ett fel uppstod vid uppdateringen av inställningarna, vänligen försök igen"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/sv/sla.json b/app/javascript/dashboard/i18n/locale/sv/sla.json
index a1c2adc81e0e8..3a2a2023f10f2 100644
--- a/app/javascript/dashboard/i18n/locale/sv/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sv/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ta/bulkActions.json b/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index ecc4c0a4f34a5..9d7c17e1313bf 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "முந்தைய உரையாடல்கள்"
+      "PREVIOUS_CONVERSATIONS": "முந்தைய உரையாடல்கள்",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index 064402877bea7..364439a143206 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ta/datePicker.json b/app/javascript/dashboard/i18n/locale/ta/datePicker.json
new file mode 100644
index 0000000000000..60badc82d49ab
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "கடந்த 7 நாட்கள்",
+      "LAST_30_DAYS": "கடந்த 30 நாட்கள்",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 19f3a8e083d5d..6e452195a5b33 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "அறிக்கைகள்",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 1993cd7d5914b..bf924fe58a51e 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "உருவாக்கப்பட்ட இன்பாக்ஸில் ஏஜென்ட்களைச் சேர்க்கவும்."
       },
       {
-        "title": "அடடே மகிழ்ச்சி!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "நீங்கள் மேற்கொண்டு பயன்படுத்தலாம்!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "பட்டியலிலிருந்து ஒரு பக்கத்தைத் தேர்ந்தெடுக்கவும்",
         "INBOX_NAME": "இன்பாக்ஸ் பெயர்",
         "ADD_NAME": "உங்கள் இன்பாக்ஸுக்கு ஒரு பெயரைச் சேர்க்கவும்",
-        "PICK_NAME": "உங்கள் இன்பாக்ஸின் பெயரைத் தேர்ந்தெடுக்கவும்",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "மதிப்பைத் தேர்ந்தெடுங்கள்"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "வெப்ஹூக் URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "சரியான URL ஐ பதிவிடவும்"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "இந்த புலம் தேவை"
         },
         "PHONE_NUMBER": {
-          "LABEL": "தொலைபேசி எண்",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "செய்தி அனுப்பப்படும் தொலைபேசி எண்ணை உள்ளிடவும்.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "இந்த புலம் தேவை"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "இந்த புலம் தேவை"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "வெப்ஹூக் URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "வெப்ஹூக் URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "சேனலின் பெயர்",
           "PLACEHOLDER": "சேனலின் பெயரை உள்ளிடவும்",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "ஏஜென்ட்கள்",
         "DESC": "புதிதாக உருவாக்கப்பட்ட இன்பாக்ஸை நிர்வகிக்க ஏஜெண்டுகளை இங்கே சேர்க்கலாம். தேர்ந்தெடுக்கப்பட்ட ஏஜெண்டுகளுக்கு மட்டுமே உங்கள் இன்பாக்ஸிற்கான அணுகல் இருக்கும். இந்த இன்பாக்ஸின் பகுதியாக இல்லாத ஏஜெண்டுகள் உள்நுழையும்போது இந்த இன்பாக்ஸில் உள்ள செய்திகளைக் காணவோ அல்லது பதிலளிக்கவோ முடியாது. <br> <b> கவனத்திற்கு: </b> ஒரு நிர்வாகியாக, உங்களுக்கு எல்லா இன்பாக்ஸுக்கும் அணுகல் தேவைப்பட்டால், நீங்கள் உருவாக்கும் அனைத்து இன்பாக்ஸுக்கும் உங்களை ஏஜெண்டாக சேர்க்க வேண்டும்.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "புதுப்பிப்பு",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index f0d0a2b33ebe1..a76dd9dc11cbd 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "உங்கள் சுயவிவரம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது, உங்கள் உள்நுழைவு சான்றுகள் மாற்றப்பட்டதால் மீண்டும் உள்நுழையவும்",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "சுயவிவர படம்",
       "ERROR": "படிவ பிழைகளை சரிசெய்யவும்",
       "REMOVE_IMAGE": "நீக்கு",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "அணுகுவதற்கான டோக்கன்",
-        "NOTE": "நீங்கள் API அடிப்படையிலான ஒருங்கிணைப்பை உருவாக்கினால் இந்த டோக்கனைப் பயன்படுத்தலாம்"
+        "NOTE": "நீங்கள் API அடிப்படையிலான ஒருங்கிணைப்பை உருவாக்கினால் இந்த டோக்கனைப் பயன்படுத்தலாம்",
+        "COPY": "நகல்"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "எல்லாம்"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "இமெயில்",
+        "PUSH": "தானியங்கியாய் அறிவிப்பை தள்ள",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "உங்களின் அறிவிப்பு விருப்பத்தேர்வுகள் வெற்றிகரமாக புதுப்பிக்கப்பட்டன",
         "UPDATE_ERROR": "விருப்பங்களை புதுப்பிக்கும்போது பிழை ஏற்பட்டுள்ளது, தயவுசெய்து மீண்டும் முயற்சிக்கவும்"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ta/sla.json b/app/javascript/dashboard/i18n/locale/ta/sla.json
index ef91b7dc5a367..ac5c9177ead74 100644
--- a/app/javascript/dashboard/i18n/locale/ta/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ta/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/th/bulkActions.json b/app/javascript/dashboard/i18n/locale/th/bulkActions.json
index adaf31282ae98..8aff7ecc850bb 100644
--- a/app/javascript/dashboard/i18n/locale/th/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/th/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index 8fc75bd018d4c..9459caf1db3c5 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง",
       "CONTACT_LABELS": "ป้ายกำกับผู้ติดต่อ",
-      "PREVIOUS_CONVERSATIONS": "การสนทนาก่อนหน้า"
+      "PREVIOUS_CONVERSATIONS": "การสนทนาก่อนหน้า",
+      "NO_RECORDS_FOUND": "ไม่พบข้อมูล"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index b8d0c53df25be..c3293bafa2dd1 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "สร้างแอตทริบิวต์",
+    "NO_RECORDS_FOUND": "ไม่พบข้อมูล",
     "UPDATE": {
       "SUCCESS": "อัปเดตแอตทริบิวต์สำเร็จแล้ว",
       "ERROR": "ไม่สามารถอัปเดตแอตทริบิวต์ได้ โปรดลองใหม่อีกครั้ง"
diff --git a/app/javascript/dashboard/i18n/locale/th/datePicker.json b/app/javascript/dashboard/i18n/locale/th/datePicker.json
new file mode 100644
index 0000000000000..3f3031233ef61
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "ใช้งาน",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "7 วันที่ผ่านมา",
+      "LAST_30_DAYS": "30 วันที่ผ่านมา",
+      "LAST_3_MONTHS": "3 เดือนที่ผ่านมา",
+      "LAST_6_MONTHS": "6 เดือนที่ผ่านมา",
+      "LAST_YEAR": "ปีที่ผ่านมา",
+      "CUSTOM_RANGE": "กำหนดช่วงระยะเวลา"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 1aacf4b5591a5..c503e8c767990 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "ทั่วไป",
       "REPORTS": "รายงาน",
       "CONVERSATION": "การสนทนา",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "เปลี่ยนผู้รับมอบหมาย",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "เปลี่ยนทีม",
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index f605463f4e233..fea6b9c18b9a1 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "เพิ่มพนักงานเพื่อสร้างกล่องข้อความ"
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "คุณพร้อมเเล้ว"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "เลือกหน้าจากรายชื่อ",
         "INBOX_NAME": "ชื่อกล่องข้อความ",
         "ADD_NAME": "เพิ่มชื่อให้กล่องข้อความของคุณ",
-        "PICK_NAME": "เลือกชื่อให้กล่องข้อความของคุณ",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "เลือกค่า"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "ลิ้ง Webhook",
-          "PLACEHOLDER": "กรอก Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "กรุณากรอกลิ้งที่ถูกต้อง"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "โปรดกรอก Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "โปรดกรอก Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "โปรดกรอกค่าที่ถูกต้อง"
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "ลิ้ง Webhook",
-          "SUBTITLE": "ตั้งค่าลิ้งที่ต้องการรับอีเวนท์",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "ลิ้ง Webhook"
         },
         "SUBMIT_BUTTON": "สร้างช่อง API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "ช่องอีเมล์",
-        "DESC": "ใช้งานกล่องข้อความอีเมล์",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "ชื่อช่อง",
           "PLACEHOLDER": "กรุณากรอกชื่อช่อง",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "พนักงาน",
         "DESC": "คุณสามารถเพิ่มพนักงานเพื่อจัดการกล่องข้อความที่สร้างใหม่ พนักงานที่ได้รับสิทธิ์เท่านั้นที่สามารถเข้าถึงกล่องข้อความนี้ได้ พนักงานที่ไม่มีสิทธิ์จะไม่สามารถเห็นหรือใช้กล่องสนทนานี้ได้ <br><b>หมายเหตุ:</b>ในฐานะของผู้ดูแล คุณจะสามารถเพิ่มตัวเองในกล่องข้อความทุกกล่องที่คุณสร้าง",
-        "VALIDATION_ERROR": "ต้องเพิ่มพนักงานอย่างน้อยหนึ่งคนสำหรับกล่องข้อความใหม่",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "เลือกพนักงานสำหรับกล่องข้อความนี้"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "อนุญาตให้รับข้อความหลังจากจบการสนทนาแล้ว",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "อนุญาตให้ลูกค้าส่งข้อความหลังจากจบการสนทนาแล้ว",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "อัพเดท",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "โปรดตั้งค่า IMAP หากคุณต้องการเปิดใช้ SMTP",
       "UPDATE": "อัปเดตการตั้งค่า IMAP",
       "TOGGLE_AVAILABILITY": "เปิดใช้งานการตั้งค่า IMAP สำหรับกล่องข้อความนี้",
-      "TOGGLE_HELP": "การเปิดใช้งาน IMAP จะช่วยให้ลูกค้าได้รับอีเมล",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "อัปเดตการตั้งค่า IMAP สำเร็จแล้ว",
         "ERROR_MESSAGE": "ไม่สามารถอัปเดตการตั้งค่า IMAP ได้"
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index a6a6a4c0b9925..5b0155803a15d 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "เปลี่ยนรหัสผ่านของคุณเรียบร้อยแล้ว",
     "AFTER_EMAIL_CHANGED": "ข้อมูลส่วนตัวของคุณได้รับการอัปเดตแล้ว โปรดเข้าสู่ระบบใหม่อีกครั้งเนื่องจากมีการเปลี่ยนแปลงข้อมูลสำหรับยืนยันตัวตน",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "รูปโปรไฟล์",
       "ERROR": "กรุณาเเก้ไขข้อผิดพลาดในเเบบฟอร์ม",
       "REMOVE_IMAGE": "ลบรูปภาพ",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "คุณสามารถใช้ token นี้เชื่อมต่อกับ API ได้"
+        "NOTE": "คุณสามารถใช้ token นี้เชื่อมต่อกับ API ได้",
+        "COPY": "คัดลอก"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "เสียงแจ้งเตือน",
         "NOTE": "เปิดใช้เสียงแจ้งเตือนในแดชบอร์ดเมื่อมีข้อความหรือบทสนทนาใหม่",
+        "ALERT_TYPES": {
+          "NONE": "ไม่มี",
+          "MINE": "Assigned",
+          "ALL": "ทั้งหมด"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "ไม่มี",
           "ASSIGNED": "การสนทนาที่ได้รับมอบหมาย",
           "ALL_CONVERSATIONS": "การสนทนาทั้งหมด"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "อีเมล์",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "ปรับแต่งการแจ้งเตือนสำเร็จแล้ว",
         "UPDATE_ERROR": "เกิดข้อผิดพลาดขณะอัปเดต โปรดลองใหม่อีกครั้ง"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "ไปที่แถบรายงาน",
       "MOVE_TO_NEXT_TAB": "ไปแท็บการสนทนาถัดไป",
       "GO_TO_SETTINGS": "ไปที่ตั้งค่า",
-      "SWITCH_CONVERSATION_STATUS": "ไปยังสถานะการสนทนาถัดไป",
       "SWITCH_TO_PRIVATE_NOTE": "สลับเป็นโน้ตส่วนตัว",
       "SWITCH_TO_REPLY": "สลับเป็นการตอบกลับ",
       "TOGGLE_SNOOZE_DROPDOWN": "เปิดหรือปิดเมนูพักการสนทนา"
diff --git a/app/javascript/dashboard/i18n/locale/th/sla.json b/app/javascript/dashboard/i18n/locale/th/sla.json
index 3faca41c15202..625393926b407 100644
--- a/app/javascript/dashboard/i18n/locale/th/sla.json
+++ b/app/javascript/dashboard/i18n/locale/th/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/tr/bulkActions.json b/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
index bb1829aeb6f6c..92d0462e2aff8 100644
--- a/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Temsilciler Yükleniyor",
     "UPDATE": {
       "CHANGE_STATUS": "Durumu değiştir",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Sonraki yanıt alınana kadar erteleyin.",
+      "SNOOZE_UNTIL": "Sustur",
       "UPDATE_SUCCESFUL": "Konuşma durumu başarıyla güncellendi.",
       "UPDATE_FAILED": "Görüşmeler güncellenirken bir hata oluştu. Lütfen tekrar deneyin."
     },
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 05d4fb0715e7a..48d622128e8ff 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Özel Nitelikler",
       "CONTACT_LABELS": "Kişi Etiketleri",
-      "PREVIOUS_CONVERSATIONS": "Önceki Sohbetler"
+      "PREVIOUS_CONVERSATIONS": "Önceki Sohbetler",
+      "NO_RECORDS_FOUND": "Nitelik bulunamadı"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Kişileri Dışa Aktar",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 8530a20114bf1..a5dc43b465019 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Nitelik Oluştur",
+    "NO_RECORDS_FOUND": "Nitelik bulunamadı",
     "UPDATE": {
       "SUCCESS": "Öznitelik başarıyla güncellendi",
       "ERROR": "Öznitelik güncellenemedi. Lütfen daha sonra tekrar deneyiniz"
diff --git a/app/javascript/dashboard/i18n/locale/tr/datePicker.json b/app/javascript/dashboard/i18n/locale/tr/datePicker.json
new file mode 100644
index 0000000000000..38ed6c885a779
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Uygula",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "Son 7 gün",
+      "LAST_30_DAYS": "Son 30 gün",
+      "LAST_3_MONTHS": "Son 3 ay",
+      "LAST_6_MONTHS": "Son 6 ay",
+      "LAST_YEAR": "Geçen yıl",
+      "CUSTOM_RANGE": "Özel tarih aralığı"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index 79b3b909e8d2d..325f15e5661b6 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Genel",
       "REPORTS": "Raporlar",
       "CONVERSATION": "Konuşma",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Atananı Değiştir",
       "CHANGE_PRIORITY": "Önceliği Değiştir",
       "CHANGE_TEAM": "Takım Değiştir",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 30713a4ec145f..4e2860237ca26 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Temsilcileri oluşturulan gelen kutusuna ekleyin."
       },
       {
-        "title": "Burada!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Hepiniz gitmeye hazırsınız!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Listeden bir sayfa seçin",
         "INBOX_NAME": "Gelen Kutusu Adı",
         "ADD_NAME": "Gelen kutunuza bir isim ekleyin",
-        "PICK_NAME": "Gelen Kutunuza Bir İsim Seçin",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Bir değer seçin"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Web Kanca URL'si",
-          "PLACEHOLDER": "Webhook URL'nizi girin",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Lütfen geçerli bir adres girin"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Anahtarı",
-            "PLACEHOLDER": "Lütfen Bandwith API Anahtarınızı girin",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Bu alan gereklidir"
           },
           "API_SECRET": {
             "LABEL": "API Sırrı",
-            "PLACEHOLDER": "Lütfen Bandwith API Sırrınızı girin",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Bu alan gereklidir"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Onay Anahtarı",
-          "PLACEHOLDER": "Facebook webhook'ları için yapılandırmak istediğiniz onay anahtarını girin.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Lütfen geçerli bir değer girin."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL'si",
-          "SUBTITLE": "İlgili etkinliklerle ilgili geri aramaları almak istediğiniz URL'yi yapılandırın.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL'si"
         },
         "SUBMIT_BUTTON": "API Kanalı Oluştur",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "E-posta Kanalı",
-        "DESC": "E-posta gelen kutunuzu entegre edin.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Kanal Adı",
           "PLACEHOLDER": "Lütfen bir kanal adı girin",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Kullanıcılar",
         "DESC": "Yeni oluşturulan gelen kutunuzu yönetmek için burada aracılar ekleyebilirsiniz. Yalnızca bu seçilen temsilciler gelen kutunuza erişebilir. Bu gelen kutusunun parçası olmayan temsilciler, oturum açtıklarında bu gelen kutusundaki mesajları göremeyecek veya yanıtlayamayacak. <br> <b> Not: </b> Bir yönetici olarak, tüm gelen kutularına erişmeniz gerekiyorsa, kendinizi oluşturduğunuz tüm gelen kutularına aracı olarak eklemelisiniz.",
-        "VALIDATION_ERROR": "Yeni Gelen Kutunuza en az bir temsilci ekleyin",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Gelen kutusu için aracı seçin"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Gönderen Adı",
-        "SUB_TEXT": "Müşteriniz e-posta aldığında ajanlarınızdan gelen e-postalarda gösterilen adı seçin.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "Örneğin:",
         "FRIENDLY": {
           "TITLE": "Dostça",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Çözülen konuşmadan sonra mesajlara izin ver",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Konuşma çözüldükten sonra bile son kullanıcılara mesaj göndermelerine izin ver.",
       "WHATSAPP_SECTION_SUBHEADER": "Bu API Anahtarı, WhatsApp API'larıyla entegrasyon için kullanılır.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "WhatsApp API'larıyla entegrasyon için kullanılacak güncellenmiş anahtarı girin.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Anahtarı",
       "WHATSAPP_SECTION_UPDATE_TITLE": "API Anahtarını Güncelle",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Yeni API Anahtarını buraya girin",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Güncelleme",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Onay Belirteci",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Onay Anahtarı",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Bu belirteç, webhook uç noktasının gerçekliğini doğrulamak için kullanılır.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Sohbet Öncesi Form Ayarlarını Güncelleme"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "SMTP'yi etkinleştirmek için lütfen IMAP'ı yapılandırın.",
       "UPDATE": "IMAP ayarlarını güncelle",
       "TOGGLE_AVAILABILITY": "Bu gelen kutusu için IMAP yapılandırmasını etkinleştir",
-      "TOGGLE_HELP": "IMAP'ı etkinleştirmek, kullanıcının e-posta almasına yardımcı olacaktır",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP ayarları başarıyla güncellendi",
         "ERROR_MESSAGE": "IMAP ayarları güncellenemedi"
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 62780e9203000..a84de60a0abe4 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Şifreniz başarıyla değiştirildi",
     "AFTER_EMAIL_CHANGED": "Profiliniz başarıyla güncellendi, lütfen giriş bilgileriniz değiştiği için tekrar giriş yapın",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profil Resmi",
       "ERROR": "Lütfen form hatalarını düzeltin",
       "REMOVE_IMAGE": "Kaldır",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Erişim Jetonu",
-        "NOTE": "Bu simge, API tabanlı bir entegrasyon oluşturuyorsanız kullanılabilir"
+        "NOTE": "Bu simge, API tabanlı bir entegrasyon oluşturuyorsanız kullanılabilir",
+        "COPY": "Kopyala"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Sesli Bildirimler",
         "NOTE": "Yeni mesajlar ve konuşmalar için panelde sesli bildirimleri etkinleştirin.",
+        "ALERT_TYPES": {
+          "NONE": "Hiç",
+          "MINE": "Assigned",
+          "ALL": "Hepsi"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Uyarı olayları:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Hiçbiri",
           "ASSIGNED": "Atanmış Konuşmalar",
           "ALL_CONVERSATIONS": "Tüm Konuşmalar"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "E-Posta",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Bildirim tercihleriniz başarıyla güncellendi",
         "UPDATE_ERROR": "Tercihler güncellenirken bir hata oluştu, lütfen tekrar deneyin"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Raporlar kenar çubuğuna git",
       "MOVE_TO_NEXT_TAB": "Konuşma listesinde bir sonraki sekmeye git",
       "GO_TO_SETTINGS": "Ayarlar'a git",
-      "SWITCH_CONVERSATION_STATUS": "Sonraki konuşma durumuna geç",
       "SWITCH_TO_PRIVATE_NOTE": "Özel Not'a geç",
       "SWITCH_TO_REPLY": "Yanıt'a geç",
       "TOGGLE_SNOOZE_DROPDOWN": "Snooze açılır menüsünü aç/kapat"
diff --git a/app/javascript/dashboard/i18n/locale/tr/sla.json b/app/javascript/dashboard/i18n/locale/tr/sla.json
index 6dbc60b7cb5d0..7f6448c9014ef 100644
--- a/app/javascript/dashboard/i18n/locale/tr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/tr/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json b/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
index 98b3eb8267f90..38a7d7516879c 100644
--- a/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
@@ -2,16 +2,16 @@
   "FILTER": {
     "TITLE": "Фільтрувати діалоги",
     "SUBTITLE": "Add your filters below and hit 'Apply filters' to cut through the chat clutter.",
-    "EDIT_CUSTOM_FILTER": "Edit Folder",
-    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your folder.",
-    "ADD_NEW_FILTER": "Add filter",
-    "FILTER_DELETE_ERROR": "Oops, looks like we can't save nothing! Please add at least one filter to save it.",
+    "EDIT_CUSTOM_FILTER": "Редагувати папку",
+    "CUSTOM_VIEWS_SUBTITLE": "Додайте або видаліть фільтри та оновіть папку.",
+    "ADD_NEW_FILTER": "Додати фільтр",
+    "FILTER_DELETE_ERROR": "Ой, здається ми нічого не можемо зберегти! Будь ласка, додайте принаймні один фільтр, щоб зберегти його.",
     "SUBMIT_BUTTON_LABEL": "Застосувати фільтри",
-    "UPDATE_BUTTON_LABEL": "Update folder",
+    "UPDATE_BUTTON_LABEL": "Оновити папку",
     "CANCEL_BUTTON_LABEL": "Скасувати",
-    "CLEAR_BUTTON_LABEL": "Clear filters",
-    "FOLDER_LABEL": "Folder Name",
-    "FOLDER_QUERY_LABEL": "Folder Query",
+    "CLEAR_BUTTON_LABEL": "Очистити фільтри",
+    "FOLDER_LABEL": "Ім'я папки",
+    "FOLDER_QUERY_LABEL": "Запит папки",
     "EMPTY_VALUE_ERROR": "Необхідно вказати значення.",
     "TOOLTIP_LABEL": "Фільтрувати діалоги",
     "QUERY_DROPDOWN_LABELS": {
@@ -36,15 +36,15 @@
     },
     "ATTRIBUTES": {
       "STATUS": "Статус",
-      "ASSIGNEE_NAME": "Assignee name",
+      "ASSIGNEE_NAME": "Ім'я виконавця",
       "INBOX_NAME": "Назва Джерела",
       "TEAM_NAME": "Назва команди",
-      "CONVERSATION_IDENTIFIER": "Conversation identifier",
-      "CAMPAIGN_NAME": "Campaign name",
+      "CONVERSATION_IDENTIFIER": "Номер діалогу",
+      "CAMPAIGN_NAME": "Назва Кампанії",
       "LABELS": "Мітки",
-      "BROWSER_LANGUAGE": "Browser language",
+      "BROWSER_LANGUAGE": "Мова браузера",
       "PRIORITY": "Пріоритет",
-      "COUNTRY_NAME": "Country name",
+      "COUNTRY_NAME": "Назва країни",
       "REFERER_LINK": "Посилання",
       "CUSTOM_ATTRIBUTE_LIST": "Список",
       "CUSTOM_ATTRIBUTE_TEXT": "Текст",
@@ -55,15 +55,15 @@
       "LAST_ACTIVITY": "Остання активність"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard filters",
-      "ADDITIONAL_FILTERS": "Additional filters",
-      "CUSTOM_ATTRIBUTES": "Custom attributes"
+      "STANDARD_FILTERS": "Стандартні фільтри",
+      "ADDITIONAL_FILTERS": "Додаткові фільтри",
+      "CUSTOM_ATTRIBUTES": "Спеціальні атрибути"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
         "TITLE": "Зберегти цей фільтр?",
         "LABEL": "Назвіть цей фільтр",
-        "PLACEHOLDER": "Name your filter to refer it later.",
+        "PLACEHOLDER": "Назвіть ваш фільтр, щоб пізніше його описати.",
         "ERROR_MESSAGE": "Назва обов'язкова.",
         "SAVE_BUTTON": "Зберегти фільтр",
         "CANCEL_BUTTON": "Скасувати",
@@ -77,7 +77,7 @@
         }
       },
       "EDIT": {
-        "EDIT_BUTTON": "Edit folder"
+        "EDIT_BUTTON": "Редагувати папку"
       },
       "DELETE": {
         "DELETE_BUTTON": "Видалити фільтр",
@@ -85,7 +85,7 @@
           "CONFIRM": {
             "TITLE": "Підтвердіть видалення",
             "MESSAGE": "Ви впевнені, що хочете видалити фільтр ",
-            "YES": "Yes, delete",
+            "YES": "Так, видалити",
             "NO": "Ні, зберегти це"
           }
         },
diff --git a/app/javascript/dashboard/i18n/locale/uk/agentBots.json b/app/javascript/dashboard/i18n/locale/uk/agentBots.json
index b0afb87d6d821..419672b491eeb 100644
--- a/app/javascript/dashboard/i18n/locale/uk/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/uk/agentBots.json
@@ -1,73 +1,73 @@
 {
   "AGENT_BOTS": {
     "HEADER": "Боти",
-    "LOADING_EDITOR": "Loading editor...",
-    "HEADER_BTN_TXT": "Add bot configuration",
+    "LOADING_EDITOR": "Завантаження редактора...",
+    "HEADER_BTN_TXT": "Додати конфігурацію бота",
     "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try.</p> <p> You can manage your bots from this page or create new ones using the 'Add bot configuraton' button.</p> <p> Open the <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">Agent bots handbook</a> in another tab for a helping hand.</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Bot name",
-        "PLACEHOLDER": "Name your bot.",
+        "LABEL": "Ім'я бота",
+        "PLACEHOLDER": "Дайте ім'я вашому боту.",
         "ERROR": "Ім'я бота обов'язкове."
       },
       "DESCRIPTION": {
-        "LABEL": "Bot description",
+        "LABEL": "Опис бота",
         "PLACEHOLDER": "Що робить цей бот?"
       },
       "BOT_CONFIG": {
         "ERROR": "Будь ласка, введіть вище CSML конфігурацію бота.",
-        "API_ERROR": "Your CSML configuration is invalid. Please fix it and try again."
+        "API_ERROR": "Ваша конфігурація CSML недійсна, будь ласка, виправте її та повторіть спробу."
       },
       "SUBMIT": "Перевірити і зберегти"
     },
     "BOT_CONFIGURATION": {
       "TITLE": "Виберіть агента - бота",
-      "DESC": "Assign an Agent Bot to your inbox. They can handle initial conversations and transfer them to a live agent when necessary.",
+      "DESC": "Призначте Agent Bot для вашої папки \"Вхідні\". Вони можуть обробляти початкові розмови та передавати їх живому агенту, за необхідності.",
       "SUBMIT": "Оновити",
-      "DISCONNECT": "Disconnect bot",
+      "DISCONNECT": "Від'єднати бота",
       "SUCCESS_MESSAGE": "Успішно оновлено бота агента.",
       "DISCONNECTED_SUCCESS_MESSAGE": "Бот агента успішно відключений.",
-      "ERROR_MESSAGE": "Could not update the agent bot. Please try again.",
-      "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot. Please try again.",
-      "SELECT_PLACEHOLDER": "Select bot"
+      "ERROR_MESSAGE": "Не вдалося оновити бота агента. Будь ласка, спробуйте ще раз.",
+      "DISCONNECTED_ERROR_MESSAGE": "Не вдалося відключити бота. Будь ласка, спробуйте ще раз.",
+      "SELECT_PLACEHOLDER": "Виберіть бота"
     },
     "ADD": {
       "TITLE": "Налаштувати нового бота",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "API": {
         "SUCCESS_MESSAGE": "Бота успішно додано.",
-        "ERROR_MESSAGE": "Could not add bot. Please try again later."
+        "ERROR_MESSAGE": "Не вдалося додати бота. Будь ласка, спробуйте ще раз пізніше."
       }
     },
     "LIST": {
-      "404": "No bots found. You can create a bot by clicking the 'Configure new bot' button ↗",
-      "LOADING": "Fetching bots...",
-      "TYPE": "Bot type"
+      "404": "Ботів не знайдено. Ви можете створити бота, натиснувши кнопку 'Налаштувати нового бота' ↗️",
+      "LOADING": "Отримання ботів...",
+      "TYPE": "Тип бота"
     },
     "DELETE": {
       "BUTTON_TEXT": "Видалити",
-      "TITLE": "Delete bot",
+      "TITLE": "Видалити бота",
       "SUBMIT": "Видалити",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "DESCRIPTION": "Ви впевнені, що хочете видалити цього бота? Ця дія є незворотньою.",
       "API": {
         "SUCCESS_MESSAGE": "Бот успішно видалений.",
-        "ERROR_MESSAGE": "Could not delete bot. Please try again."
+        "ERROR_MESSAGE": "Не вдалося видалити бота. Будь ласка, спробуйте ще раз."
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Редагувати",
-      "LOADING": "Fetching bots...",
-      "TITLE": "Edit bot",
+      "LOADING": "Отримання ботів...",
+      "TITLE": "Редагувати бота",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "API": {
         "SUCCESS_MESSAGE": "Бот успішно оновлений.",
-        "ERROR_MESSAGE": "Could not update bot. Please try again."
+        "ERROR_MESSAGE": "Не вдалося оновити бота. Будь ласка, спробуйте ще раз."
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook bot",
-      "CSML": "CSML bot"
+      "WEBHOOK": "Webhook Бот",
+      "CSML": "CSML Бот"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
index 55d19e9941d3b..cd8dcf1a3f1a7 100644
--- a/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
@@ -41,15 +41,15 @@
           "IN_VALID": "Невірний ключ"
         },
         "REGEX_PATTERN": {
-          "LABEL": "Regex Pattern",
-          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+          "LABEL": "Шаблон регулярного виразу",
+          "PLACEHOLDER": "Будь ласка, введіть користувацький атрибут regex pattern. (Необов'язково)"
         },
         "REGEX_CUE": {
           "LABEL": "Regex Cue",
-          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+          "PLACEHOLDER": "Будь ласка, введіть підказку для регулярного виразу (необов'язково)"
         },
         "ENABLE_REGEX": {
-          "LABEL": "Enable regex validation"
+          "LABEL": "Увімкнути перевірку регулярного виразу"
         }
       },
       "API": {
@@ -106,15 +106,15 @@
         "NOT_FOUND": "Немає налаштованих власних атрибутів"
       },
       "REGEX_PATTERN": {
-        "LABEL": "Regex Pattern",
-        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        "LABEL": "Шаблон регулярного виразу",
+        "PLACEHOLDER": "Будь ласка, введіть користувацький атрибут regex pattern. (Необов'язково)"
       },
       "REGEX_CUE": {
         "LABEL": "Regex Cue",
-        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        "PLACEHOLDER": "Введіть підказку для регулярного виразу (необов'язково)"
       },
       "ENABLE_REGEX": {
-        "LABEL": "Enable regex validation"
+        "LABEL": "Увімкнути перевірку регулярного виразу"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/auditLogs.json b/app/javascript/dashboard/i18n/locale/uk/auditLogs.json
index bd686ec01d6eb..ed1b42803169e 100644
--- a/app/javascript/dashboard/i18n/locale/uk/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/uk/auditLogs.json
@@ -19,53 +19,53 @@
       "SUCCESS_MESSAGE": "Логи успішно отримано",
       "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
     },
-    "DEFAULT_USER": "System",
+    "DEFAULT_USER": "Система",
     "AUTOMATION_RULE": {
-      "ADD": "%{agentName} created a new automation rule (#%{id})",
-      "EDIT": "%{agentName} updated an automation rule (#%{id})",
-      "DELETE": "%{agentName} deleted an automation rule (#%{id})"
+      "ADD": "%{agentName} створив нове правило автоматизації (#%{id})",
+      "EDIT": "%{agentName} оновив правило автоматизації (#%{id})",
+      "DELETE": "%{agentName} видалив правило автоматизації (#%{id})"
     },
     "ACCOUNT_USER": {
-      "ADD": "%{agentName} invited %{invitee} to the account as an %{role}",
+      "ADD": "%{agentName} запросив %{invitee} на акаунт як %{role}",
       "EDIT": {
-        "SELF": "%{agentName} changed their %{attributes} to %{values}",
-        "OTHER": "%{agentName} changed %{attributes} of %{user} to %{values}"
+        "SELF": "%{agentName} змінив свій %{attributes} на %{values}",
+        "OTHER": "%{agentName} змінив %{attributes} %{user} на %{values}"
       }
     },
     "INBOX": {
-      "ADD": "%{agentName} created a new inbox (#%{id})",
-      "EDIT": "%{agentName} updated an inbox (#%{id})",
-      "DELETE": "%{agentName} deleted an inbox (#%{id})"
+      "ADD": "%{agentName} створив нову папку вхідних (#%{id})",
+      "EDIT": "%{agentName} оновив папку \"Вхідні\" (#%{id})",
+      "DELETE": "%{agentName} видалив папку \"Вхідні\" (#%{id})"
     },
     "WEBHOOK": {
-      "ADD": "%{agentName} created a new webhook (#%{id})",
-      "EDIT": "%{agentName} updated a webhook (#%{id})",
-      "DELETE": "%{agentName} deleted a webhook (#%{id})"
+      "ADD": "%{agentName} створив новий webhook (#%{id})",
+      "EDIT": "%{agentName} оновив webhook (#%{id})",
+      "DELETE": "%{agentName} видалив webhook (#%{id})"
     },
     "USER_ACTION": {
-      "SIGN_IN": "%{agentName} signed in",
-      "SIGN_OUT": "%{agentName} signed out"
+      "SIGN_IN": "Увійшов %{agentName}",
+      "SIGN_OUT": "Вийшов %{agentName}"
     },
     "TEAM": {
-      "ADD": "%{agentName} created a new team (#%{id})",
-      "EDIT": "%{agentName} updated a team (#%{id})",
-      "DELETE": "%{agentName} deleted a team (#%{id})"
+      "ADD": "%{agentName} створив нову команду (#%{id})",
+      "EDIT": "%{agentName} оновив команду (#%{id})",
+      "DELETE": "%{agentName} видалив команду (#%{id})"
     },
     "MACRO": {
-      "ADD": "%{agentName} created a new macro (#%{id})",
-      "EDIT": "%{agentName} updated a macro (#%{id})",
-      "DELETE": "%{agentName} deleted a macro (#%{id})"
+      "ADD": "%{agentName} створив новий макрос (#%{id})",
+      "EDIT": "%{agentName} оновив макрос (#%{id})",
+      "DELETE": "%{agentName} видалив макрос (#%{id})"
     },
     "INBOX_MEMBER": {
-      "ADD": "%{agentName} added %{user} to the inbox(#%{inbox_id})",
-      "REMOVE": "%{agentName} removed %{user} from the inbox(#%{inbox_id})"
+      "ADD": "%{agentName} додав %{user} до папки \"Вхідні\" (#%{inbox_id})",
+      "REMOVE": "%{agentName} видалив %{user} з папки \"Вхідні\" (#%{inbox_id})"
     },
     "TEAM_MEMBER": {
-      "ADD": "%{agentName} added %{user} to the team(#%{team_id})",
-      "REMOVE": "%{agentName} removed %{user} from the team(#%{team_id})"
+      "ADD": "%{agentName} додав %{user} до команди (#%{team_id})",
+      "REMOVE": "%{agentName} видалив %{user} з команди (#%{team_id})"
     },
     "ACCOUNT": {
-      "EDIT": "%{agentName} updated the account configuration (#%{id})"
+      "EDIT": "%{agentName} оновив налаштування облікового запису (#%{id})"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/bulkActions.json b/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
index 106adcd8014d1..ffe8e444d69d2 100644
--- a/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
@@ -10,23 +10,23 @@
     "ASSIGN_AGENT_TOOLTIP": "Призначити агента",
     "ASSIGN_TEAM_TOOLTIP": "Призначити команду",
     "ASSIGN_SUCCESFUL": "Розмови успішно призначені.",
-    "ASSIGN_FAILED": "Failed to assign conversations. Please try again.",
+    "ASSIGN_FAILED": "Не вдалося призначити розмови, будь ласка, спробуйте ще раз.",
     "RESOLVE_SUCCESFUL": "Розмови успішно закриті.",
-    "RESOLVE_FAILED": "Failed to resolve conversations. Please try again.",
+    "RESOLVE_FAILED": "Не вдалося закрити розмови, будь ласка, спробуйте ще раз.",
     "ALL_CONVERSATIONS_SELECTED_ALERT": "Розмови, які відображаються на цій сторінці, обрані.",
     "AGENT_LIST_LOADING": "Завантаження агентів",
     "UPDATE": {
       "CHANGE_STATUS": "Змінити статус",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Відкласти до наступної відповіді.",
+      "SNOOZE_UNTIL": "Відкласти",
       "UPDATE_SUCCESFUL": "Статус розмови успішно оновлено.",
-      "UPDATE_FAILED": "Failed to update conversations. Please try again."
+      "UPDATE_FAILED": "Не вдалося оновити розмови, будь ласка, спробуйте ще раз."
     },
     "LABELS": {
-      "ASSIGN_LABELS": "Assign labels",
+      "ASSIGN_LABELS": "Призначити мітки",
       "NO_LABELS_FOUND": "Міток не знайдено для",
       "ASSIGN_SELECTED_LABELS": "Призначити вибрані мітки",
       "ASSIGN_SUCCESFUL": "Мітки додано успішно.",
-      "ASSIGN_FAILED": "Failed to assign labels. Please try again."
+      "ASSIGN_FAILED": "Не вдалося призначити мітки, будь ласка, спробуйте ще раз."
     },
     "TEAMS": {
       "TEAM_SELECT_LABEL": "Виберіть команду",
@@ -34,7 +34,7 @@
       "NO_TEAMS_AVAILABLE": "Цей акаунт ще не доданий до жодної команди.",
       "ASSIGN_SELECTED_TEAMS": "Призначити обрану команду.",
       "ASSIGN_SUCCESFUL": "Команди успішно призначені.",
-      "ASSIGN_FAILED": "Failed to assign team. Please try again."
+      "ASSIGN_FAILED": "Не вдалося призначити команду, будь ласка, спробуйте ще раз."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 9986c4722dbc0..5bdf28d8a4858 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Свої атрибути",
       "CONTACT_LABELS": "Мітки контакту",
-      "PREVIOUS_CONVERSATIONS": "Попередні бесіди"
+      "PREVIOUS_CONVERSATIONS": "Попередні бесіди",
+      "NO_RECORDS_FOUND": "Атрибути не знайдено"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Експорт контактів",
       "MESSAGE": "Ви впевнені, що хочете експортувати всі контакти?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Так, експортувати",
       "NO": "Ні, скасувати"
     }
@@ -296,8 +298,8 @@
     "BUTTON": "Додати користувацький атрибут",
     "NOT_AVAILABLE": "Немає ніяких користувацьких атрибутів для цього контакту.",
     "COPY_SUCCESSFUL": "Скопійовано до буферу обміну",
-    "SHOW_MORE": "Show all attributes",
-    "SHOW_LESS": "Show less attributes",
+    "SHOW_MORE": "Показати всі атрибути",
+    "SHOW_LESS": "Показати менше атрибутів",
     "ACTIONS": {
       "COPY": "Копіювати атрибут",
       "DELETE": "Видалити атрибут",
diff --git a/app/javascript/dashboard/i18n/locale/uk/contactFilters.json b/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
index 052e45fc836ba..7ed279fc441da 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
@@ -2,18 +2,18 @@
   "CONTACTS_FILTER": {
     "TITLE": "Фільтр Контактів",
     "SUBTITLE": "Додайте фільтри нижче та натисніть «Відправити», для фільтрації контактів.",
-    "EDIT_CUSTOM_SEGMENT": "Edit Segment",
-    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your segment.",
+    "EDIT_CUSTOM_SEGMENT": "Редагувати сегмент",
+    "CUSTOM_VIEWS_SUBTITLE": "Додайте або видаліть фільтри та оновіть ваш сегмент.",
     "ADD_NEW_FILTER": "Додати фільтр",
     "CLEAR_ALL_FILTERS": "Очистити всі фільтри",
     "FILTER_DELETE_ERROR": "Ви повинні мати хоча б один фільтр для збереження",
     "SUBMIT_BUTTON_LABEL": "Додати",
-    "UPDATE_BUTTON_LABEL": "Update Segment",
+    "UPDATE_BUTTON_LABEL": "Оновити сегмент",
     "CANCEL_BUTTON_LABEL": "Скасувати",
     "CLEAR_BUTTON_LABEL": "Скинути фільтри",
     "EMPTY_VALUE_ERROR": "Необхідно вказати значення",
-    "SEGMENT_LABEL": "Segment Name",
-    "SEGMENT_QUERY_LABEL": "Segment Query",
+    "SEGMENT_LABEL": "Назва сегмента",
+    "SEGMENT_QUERY_LABEL": "Запит сегмента",
     "TOOLTIP_LABEL": "Фільтрувати контакти",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "ТА",
@@ -45,7 +45,7 @@
       "CREATED_AT": "Створений в",
       "LAST_ACTIVITY": "Остання активність",
       "REFERER_LINK": "Реферальне посилання",
-      "BLOCKED": "Blocked"
+      "BLOCKED": "Заблоковано"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "Стандартні фільтри",
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index ab7063620a3ea..1df537bd9effb 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -69,8 +69,8 @@
         "FRT": "FRT {status}",
         "NRT": "NRT {status}",
         "RT": "RT {status}",
-        "MISSED": "missed",
-        "DUE": "due"
+        "MISSED": "пропущено",
+        "DUE": "до"
       }
     },
     "RESOLVE_DROPDOWN": {
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Створити атрибут",
+    "NO_RECORDS_FOUND": "Атрибути не знайдено",
     "UPDATE": {
       "SUCCESS": "Атрибут успішно оновлено",
       "ERROR": "Не вдалося оновити атрибут. Будь ласка, спробуйте ще раз пізніше"
diff --git a/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json b/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
index 29aba3883df3c..e3a4fce63c411 100644
--- a/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
@@ -3,7 +3,7 @@
     "TITLE": "Оцініть ваш діалог",
     "PLACEHOLDER": "Розкажіть нам більше...",
     "RATINGS": {
-      "POOR": "😞 Poor",
+      "POOR": "😞 Погано",
       "FAIR": "😑 Слабо",
       "AVERAGE": "😐 Посередньо",
       "GOOD": "😀 Добре",
diff --git a/app/javascript/dashboard/i18n/locale/uk/datePicker.json b/app/javascript/dashboard/i18n/locale/uk/datePicker.json
new file mode 100644
index 0000000000000..8cd0f07ee9483
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Підтвердити",
+    "CLEAR_BUTTON": "Очистити",
+    "DATE_RANGE_INPUT": {
+      "START": "Дата початку",
+      "END": "Дата закінчення"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "ПЕРІОД",
+      "LAST_7_DAYS": "Останні 7 днів",
+      "LAST_30_DAYS": "Останні 30 днів",
+      "LAST_3_MONTHS": "Останні 3 місяці",
+      "LAST_6_MONTHS": "Останні 6 місяців",
+      "LAST_YEAR": "Минулий рік",
+      "CUSTOM_RANGE": "Довільний діапазон дат"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/general.json b/app/javascript/dashboard/i18n/locale/uk/general.json
index 25bb4dfb736d2..b4b781f99d862 100644
--- a/app/javascript/dashboard/i18n/locale/uk/general.json
+++ b/app/javascript/dashboard/i18n/locale/uk/general.json
@@ -1,5 +1,5 @@
 {
   "GENERAL": {
-    "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items"
+    "SHOWING_RESULTS": "Показані {firstIndex}-{lastIndex} з елементів {totalCount}"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index cb9bc09888e5d..52fa06b9dac4e 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -88,9 +88,9 @@
       "assigned_conversation_new_message": "Нове повідомлення",
       "participating_conversation_new_message": "Нове повідомлення",
       "conversation_mention": "Відмітка",
-      "sla_missed_first_response": "SLA Missed",
-      "sla_missed_next_response": "SLA Missed",
-      "sla_missed_resolution": "SLA Missed"
+      "sla_missed_first_response": "SLA пропущено",
+      "sla_missed_next_response": "SLA пропущено",
+      "sla_missed_resolution": "SLA пропущено"
     }
   },
   "NETWORK": {
@@ -107,6 +107,7 @@
       "GENERAL": "Загальні",
       "REPORTS": "Звіти",
       "CONVERSATION": "Діалог",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Змінити виконавця",
       "CHANGE_PRIORITY": "Змінити пріоритет",
       "CHANGE_TEAM": "Змінити команду",
diff --git a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
index 94ead9f26e82f..cc0dfa911534b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
@@ -18,10 +18,10 @@
         "ARCHIVED": "Архівовані статті"
       },
       "LOCALE_SELECT": {
-        "TITLE": "Select locale",
-        "PLACEHOLDER": "Select locale",
-        "NO_RESULT": "No locale found",
-        "SEARCH_PLACEHOLDER": "Search locale"
+        "TITLE": "Виберіть мову",
+        "PLACEHOLDER": "Виберіть мову",
+        "NO_RESULT": "Міток не знайдено",
+        "SEARCH_PLACEHOLDER": "Виберіть мову"
       }
     },
     "EDIT_HEADER": {
@@ -82,15 +82,15 @@
       }
     },
     "ARTICLE_SEARCH_RESULT": {
-      "UNCATEGORIZED": "Uncategorized",
-      "SEARCH_RESULTS": "Search results for %{query}",
-      "EMPTY_TEXT": "Search for articles to insert into replies.",
+      "UNCATEGORIZED": "Без категорії",
+      "SEARCH_RESULTS": "Результати пошуку для %{query}",
+      "EMPTY_TEXT": "Пошук статей для вставки у відповіді.",
       "SEARCH_LOADER": "Шукаємо...",
-      "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"
+      "INSERT_ARTICLE": "Вставка",
+      "NO_RESULT": "Статей не знайдено",
+      "COPY_LINK": "Скопіювати посилання на статтю в буфер обміну",
+      "OPEN_LINK": "Відкрити статтю в новій вкладці",
+      "PREVIEW_LINK": "Перегляд статті"
     },
     "PORTAL": {
       "HEADER": "Портали",
@@ -231,9 +231,9 @@
           "LABEL": "Логотип",
           "UPLOAD_BUTTON": "Завантажити логотип",
           "HELP_TEXT": "Цей логотип буде показано у заголовку порталу.",
-          "IMAGE_UPLOAD_SUCCESS": "Logo uploaded successfully",
-          "IMAGE_UPLOAD_ERROR": "Logo deleted successfully",
-          "IMAGE_DELETE_ERROR": "Error while deleting logo"
+          "IMAGE_UPLOAD_SUCCESS": "Логотип успішно завантажено",
+          "IMAGE_UPLOAD_ERROR": "Логотип успішно видалено",
+          "IMAGE_DELETE_ERROR": "Помилка при видаленні логотипу"
         },
         "NAME": {
           "LABEL": "Ім'я",
@@ -302,7 +302,7 @@
       "CHANGE_DEFAULT_LOCALE": {
         "API": {
           "SUCCESS_MESSAGE": "Локаль за замовчуванням успішно оновлено",
-          "ERROR_MESSAGE": "Не вдалося локаль за замовчуванням. Спробуйте ще раз."
+          "ERROR_MESSAGE": "Не вдалося оновити локаль за замовчуванням. Спробуйте ще раз."
         }
       },
       "DELETE_LOCALE": {
@@ -319,13 +319,13 @@
       "HEADERS": {
         "TITLE": "Назва",
         "CATEGORY": "Категорія",
-        "READ_COUNT": "Views",
+        "READ_COUNT": "Перегляди",
         "STATUS": "Статус",
         "LAST_EDITED": "Останній раз відредагований"
       },
       "COLUMNS": {
         "BY": "від",
-        "AUTHOR_NOT_AVAILABLE": "Author is not available"
+        "AUTHOR_NOT_AVAILABLE": "Автор недоступний"
       }
     },
     "EDIT_ARTICLE": {
@@ -379,7 +379,7 @@
         "NAME": {
           "LABEL": "Ім'я",
           "PLACEHOLDER": "Назва категорії",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "Назва категорії буде використовуватися в публічному інтерфейсі порталу для категоризації статей.",
           "ERROR": "Назва обов'язкова"
         },
         "SLUG": {
@@ -410,7 +410,7 @@
         "NAME": {
           "LABEL": "Ім'я",
           "PLACEHOLDER": "Назва категорії",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "Назва категорії буде використовуватися в публічному інтерфейсі порталу для категоризації статей.",
           "ERROR": "Назва обов'язкова"
         },
         "SLUG": {
@@ -441,43 +441,43 @@
       }
     },
     "ARTICLE_SEARCH": {
-      "TITLE": "Search articles",
-      "PLACEHOLDER": "Search articles",
-      "NO_RESULT": "No articles found",
+      "TITLE": "Пошук статей",
+      "PLACEHOLDER": "Пошук статей",
+      "NO_RESULT": "Статей не знайдено",
       "SEARCHING": "Шукаємо...",
       "SEARCH_BUTTON": "Пошук",
       "INSERT_ARTICLE": "Insert link",
-      "IFRAME_ERROR": "URL is empty or invalid. Unable to display content.",
-      "OPEN_ARTICLE_SEARCH": "Insert article from Help Center",
-      "SUCCESS_ARTICLE_INSERTED": "Article inserted successfully",
-      "PREVIEW_LINK": "Preview article",
+      "IFRAME_ERROR": "URL-адреса є пустою або недійсною. Неможливо показати вміст.",
+      "OPEN_ARTICLE_SEARCH": "Вставити статтю з довідкового центру",
+      "SUCCESS_ARTICLE_INSERTED": "Стаття успішно додана",
+      "PREVIEW_LINK": "Перегляд статті",
       "CANCEL": "Закрити",
       "BACK": "Назад",
-      "BACK_RESULTS": "Back to results"
+      "BACK_RESULTS": "Назад до результатів"
     },
     "UPGRADE_PAGE": {
       "TITLE": "Довідковий центр",
-      "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
-      "SELF_HOSTED_DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Please contact your administrator to enable this feature.",
+      "DESCRIPTION": "Створіть зручні портали самообслуговування. Допоможіть вашим користувачам отримати доступ до статей та отримайте підтримку 24/7. Оновіть підписку, щоб увімкнути цю функцію.",
+      "SELF_HOSTED_DESCRIPTION": "Створіть зручні портали самообслуговування. Допоможіть вашим користувачам отримати доступ до статей та отримати підтримку 24/7. Будь ласка, зверніться до адміністратора, щоб увімкнути цю функцію.",
       "BUTTON": {
         "LEARN_MORE": "Детальніше",
-        "UPGRADE": "Upgrade"
+        "UPGRADE": "Оновити"
       },
       "FEATURES": {
         "PORTALS": {
-          "TITLE": "Multiple portals",
-          "DESCRIPTION": "Create multiple help center portals for different products using the same account."
+          "TITLE": "Кілька порталів",
+          "DESCRIPTION": "Створення кількох порталів довідки для різних продуктів за допомогою одного облікового запису."
         },
         "LOCALES": {
-          "TITLE": "Full support for locales",
-          "DESCRIPTION": "Localize the portal in your language. We support all locales and allow translations for every article."
+          "TITLE": "Повна підтримка локалей мовою",
+          "DESCRIPTION": "Локалізуйте портал вашою мовою. Ми підтримуємо всі мови та дозволяємо переклади для кожної статті."
         },
         "SEO": {
-          "TITLE": "SEO-friendly design",
-          "DESCRIPTION": "Customize your meta tags to improve your visibility on search engines with our SEO-friendly pages."
+          "TITLE": "SEO дружній дизайн",
+          "DESCRIPTION": "Налаштуйте теги мета, щоб покращити свою видимість на пошукових системах за допомогою наших сторінок, які є зручними для пошуку."
         },
         "API": {
-          "TITLE": "Full API support",
+          "TITLE": "Повна підтримка API",
           "DESCRIPTION": "Use the portal as a headless CMS with third party front-end frameworks using our APIs."
         }
       }
diff --git a/app/javascript/dashboard/i18n/locale/uk/inbox.json b/app/javascript/dashboard/i18n/locale/uk/inbox.json
index 2a4d6f98256bd..c9f850f342712 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inbox.json
@@ -7,7 +7,7 @@
       "404": "Немає активних сповіщень у цій групі.",
       "NO_NOTIFICATIONS": "Немає сповіщень",
       "NOTE": "Сповіщення від усіх підписок на вхідні повідомлення",
-      "NO_MESSAGES_AVAILABLE": "Oops! Not able to fetch messages",
+      "NO_MESSAGES_AVAILABLE": "Ой! Не вдалося отримати повідомлення",
       "SNOOZED_UNTIL": "Відкладено до",
       "SNOOZED_UNTIL_TOMORROW": "Відкладено до завтра",
       "SNOOZED_UNTIL_NEXT_WEEK": "Відкладено до наступного тижня"
@@ -22,10 +22,10 @@
       "CONVERSATION_CREATION": "Діалог створено",
       "CONVERSATION_ASSIGNMENT": "Розмова була призначена для вас",
       "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Нове повідомлення в призначеній розмові",
-      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Нове повідомлення в розмові, яке ви берете участь в",
-      "SLA_MISSED_FIRST_RESPONSE": "SLA target first response missed for conversation",
-      "SLA_MISSED_NEXT_RESPONSE": "SLA target next response missed for conversation",
-      "SLA_MISSED_RESOLUTION": "SLA target resolution missed for conversation"
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Нове повідомлення в розмові, в якій ви берете участь",
+      "SLA_MISSED_FIRST_RESPONSE": "Перша відповідь на SLA пропущена для розмови",
+      "SLA_MISSED_NEXT_RESPONSE": "Запропонована відповідь SLA відсутня для розмови",
+      "SLA_MISSED_RESOLUTION": "Цільова роздільна здатність SLA відсутня для розмови"
     },
     "MENU_ITEM": {
       "MARK_AS_READ": "Позначити як прочитане",
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 7abd5214b992e..59eefdc6f5d02 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Додати агентів до створеного \"Джерела\"."
       },
       {
-        "title": "Вуаля!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Все готово!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Виберіть сторінку зі списку",
         "INBOX_NAME": "Назва Джерела",
         "ADD_NAME": "Додайте назву Джерела",
-        "PICK_NAME": "Виберіть ім'я Джерела",
+        "PICK_NAME": "Виберіть ім'я для вхідних",
         "PICK_A_VALUE": "Виберіть значення"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL вебхука",
-          "PLACEHOLDER": "Введіть URL вашого вебхука",
+          "PLACEHOLDER": "Будь ласка, введіть URL вашого вебхука",
           "ERROR": "Будь ласка, введіть правильний URL"
         },
         "CHANNEL_DOMAIN": {
@@ -75,7 +75,7 @@
         },
         "CHANNEL_WELCOME_TAGLINE": {
           "LABEL": "Талін привітання",
-          "PLACEHOLDER": "Ми робимо це простим — запитуємо що-небудь чи поділіться своїми відгуками."
+          "PLACEHOLDER": "Ми робимо простим зв'язок з нами. Запитайте нас що-небудь або поділіться своїми відгуками."
         },
         "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Вітання каналу",
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Токен перевірки вебхуків",
-          "PLACEHOLDER": "Введіть ключ підтвердження, який ви хочете налаштувати на Facebook webhook'и.",
+          "PLACEHOLDER": "Введіть ключ підтвердження, який ви хочете налаштувати на Facebook webhooks.",
           "ERROR": "Будь ласка введіть правильне значення."
         },
         "API_KEY": {
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email канал",
-        "DESC": "Інтегруйте поштову скриньку.",
+        "DESC": "Інтегруйте вашу поштову скриньку.",
         "CHANNEL_NAME": {
           "LABEL": "Назва каналу",
           "PLACEHOLDER": "Будь ласка, введіть назву каналу",
@@ -287,7 +287,7 @@
         },
         "EMAIL": {
           "LABEL": "Email",
-          "SUBTITLE": "Пишіть куди клієнти відправляють вам квитки підтримки",
+          "SUBTITLE": "Вкажіть адресу електронної пошти, на яку клієнти надсилають запити про підтримку.",
           "PLACEHOLDER": "Email"
         },
         "SUBMIT_BUTTON": "Створити Канал E-mail",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Агенти",
         "DESC": "Тут Ви можете додавати агентів для керування нещодавно створеним джерелом. Тільки ці обрані агенти матимуть доступ до Вашої папки \"Вхідні\". Агенти, які не входять до цього джерела, не зможуть побачити або відповісти на повідомлення у цій папці \"Вхідні\", під час входу. <br> <b>PS:</b> Як адміністратор, якщо вам потрібен доступ до всіх джерел, ви повинні додати себе як агент до всіх \"Вхідні\", що створюєте.",
-        "VALIDATION_ERROR": "Додайте як мінімум одного агента до вашого нового Джерела",
+        "VALIDATION_ERROR": "Додайте принаймні один агент до вашої нової папки Вхідні",
         "PICK_AGENTS": "Вибрати агентів для джерела"
       },
       "DETAILS": {
@@ -406,20 +406,20 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Ім'я відправника",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
-        "FOR_EG": "For eg:",
+        "SUB_TEXT": "Виберіть ім'я, що відображається вашому клієнту, коли він отримує повідомлення від ваших агентів.",
+        "FOR_EG": "Наприклад:",
         "FRIENDLY": {
           "TITLE": "Дружній",
           "FROM": "від",
-          "SUBTITLE": "Add the name of the agent who sent the reply in the sender name to make it friendly."
+          "SUBTITLE": "Додайте ім'я агента, який надіслав відповідь в ім'я відправника, щоб зробити його привітним."
         },
         "PROFESSIONAL": {
           "TITLE": "Професійний",
-          "SUBTITLE": "Use only the configured business name as the sender name in the email header."
+          "SUBTITLE": "Використовувати лише налаштовану бізнес-назву як ім'я відправника в заголовку електронної пошти."
         },
         "BUSINESS_NAME": {
-          "BUTTON_TEXT": "+ Configure your business name",
-          "PLACEHOLDER": "Enter your business name",
+          "BUTTON_TEXT": "+ Налаштуйте ваше корпоративне ім'я",
+          "PLACEHOLDER": "Введіть ваше корпоративне ім'я",
           "SAVE_BUTTON_TEXT": "Зберегти"
         }
       },
@@ -486,9 +486,9 @@
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Увімкнути або вимкнути ящик збору повідомлень в новій розмові",
       "AUTO_ASSIGNMENT": "Увімкнути автопризначення",
       "ENABLE_CSAT": "Увімкнути CSAT",
-      "SENDER_NAME_SECTION": "Enable Agent Name in Email",
+      "SENDER_NAME_SECTION": "Увімкнути ім'я співробітника в електронній пошті",
       "ENABLE_CSAT_SUB_TEXT": "Увімкнути/Вимкнути опитування CSAT(Задоволення клієнтів) після вирішення розмови",
-      "SENDER_NAME_SECTION_TEXT": "Enable/Disable showing Agent's name in email, if disabled it will show business name",
+      "SENDER_NAME_SECTION_TEXT": "Увімкнути/Вимкнути показ імені співробітника в електронній пошті, якщо це вимкнено, то буде відображатися бізнес-ім'я",
       "ENABLE_CONTINUITY_VIA_EMAIL": "Увімкнути безперервність розмови через електронну пошту",
       "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Розмови продовжуватимуться через електронну пошту, якщо доступна контактна адреса.",
       "LOCK_TO_SINGLE_CONVERSATION": "Заблокувати бесіду",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Дозволити повідомлення після закінчення розмови",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Дозволити кінцевим користувачам надсилати повідомлення навіть після закриття розмови.",
       "WHATSAPP_SECTION_SUBHEADER": "Цей ключ API використовується для інтеграції з API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Цей ключ API використовується для інтеграції з API WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Введіть новий ключ API, який буде використовуватися для інтеграції з API WhatsApp.",
       "WHATSAPP_SECTION_TITLE": "API ключ",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Оновити ключ API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Введіть тут новий ключ API",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Оновити",
-      "WHATSAPP_WEBHOOK_TITLE": "Токен перевірки вебхуків",
+      "WHATSAPP_WEBHOOK_TITLE": "Токен вебхука",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Цей токен використовується для перевірки аутентифікації кінцевої точки вебхука.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Оновити параметри форми чату"
     },
@@ -569,7 +569,7 @@
       "UPDATE": "Оновити налаштування робочих годин",
       "TOGGLE_AVAILABILITY": "Увімкнути робочі години для цього каналу",
       "UNAVAILABLE_MESSAGE_LABEL": "Повідомлення для відвідувачів у неробочі години",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Включення покаже робочі години на віджеті в чаті, навіть якщо всі агенти перебувають в автономному режимі. У неробочі години відвідувачі можуть бути попереджені повідомленням і формою попереднього чату.",
       "DAY": {
         "ENABLE": "Увімкнути доступність для цього дня",
         "UNAVAILABLE": "Неприсутній",
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrationApps.json b/app/javascript/dashboard/i18n/locale/uk/integrationApps.json
index 3c8fd2f7aba86..02af58c9db7c9 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrationApps.json
@@ -56,7 +56,7 @@
       "BUTTON_TEXT": "Від'єднатись"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow - це платформа природного розуміння мови, що дозволяє легко розробляти та інтегрувати розмовний інтерфейс користувача у ваш мобільний додаток, веб-додаток, пристрій, бот, інтерактивна система голосової відповіді тощо. <br /> <br /> Dialogflow інтеграція з %{installationName} дозволяє вам налаштувати бота Dialogflow потоку вашими папками \"Вхідні\", що дозволяє боту обробляти запити спочатку, і передавати їх агенту по необхідності. Dialogflow може бути використаний для кваліфікації лідів, зменшення навантаження агентів, надаючи часті запитання та ін. <br /> <br /> Щоб додати Dialogflow, потрібно створити обліковий запис служби в консолі проекту Google і надати доступ до облікових даних. Будь-ласка, зверніться до документації Dialogflow для отримання додаткової інформації."
+      "DIALOGFLOW": "Dialogflow - це платформа природного розуміння мови, що дозволяє легко розробляти та інтегрувати розмовний інтерфейс користувача у ваш мобільний додаток, веб-додаток, пристрій, бот, інтерактивна система голосової відповіді, тощо. <br /> <br /> Dialogflow інтеграція з %{installationName} дозволяє вам налаштувати бота Dialogflow потоку вашими папками \"Вхідні\", що дозволяє боту обробляти запити спочатку, і передавати їх агенту по необхідності. Dialogflow може бути використаний для кваліфікації лідів, зменшення навантаження агентів, надаючи часті запитання та ін. <br /> <br /> Щоб додати Dialogflow, потрібно створити обліковий запис служби в консолі проекту Google і надати доступ до облікових даних. Будь ласка, зверніться до документації Dialogflow для отримання додаткової інформації."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index e0e2bd944eaf5..d824e9b5ed5e6 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -75,25 +75,25 @@
     "SLACK": {
       "DELETE": "Видалити",
       "DELETE_CONFIRMATION": {
-        "TITLE": "Delete the integration",
-        "MESSAGE": "Are you sure you want to delete the integration? Doing so will result in the loss of access to conversations on your Slack workspace."
+        "TITLE": "Видалити інтеграцію",
+        "MESSAGE": "Ви впевнені, що бажаєте видалити інтеграцію? Виконання цього призведе до втрати доступу до розмов на робочому місці Slack."
       },
       "HELP_TEXT": {
         "TITLE": "Використання Slack інтеграцію",
         "BODY": "<br/><p>Chatwoot тепер синхронізує всі вхідні розмови на <b><i>customer-conversations</i></b> каналу всередині вашого slack workplace.</p><p>Відповідь на тему розмови в <b><i>customer-conversations</i></b> slack канал створить відповідь покупцю через chatwoot.</p><p>Розпочніть відповіді з <b><i>нотатки:</i></b> для створення приватних нотаток замість відповідей.</p><p>Якщо автор на slack має профіль агента в chatwoot під тим самим повідомленням, відповіді будуть надані відповідно.</p><p>, коли користувач не має пов'язаного агента, відповідь буде виконана з профілю бота.</p>",
-        "SELECTED": "selected"
+        "SELECTED": "вибрано"
       },
       "SELECT_CHANNEL": {
-        "OPTION_LABEL": "Select a channel",
+        "OPTION_LABEL": "Обрати канал",
         "UPDATE": "Оновити",
-        "BUTTON_TEXT": "Connect channel",
-        "DESCRIPTION": "Your Slack workspace is now linked with Chatwoot. However, the integration is currently inactive. To activate the integration and connect a channel to Chatwoot, please click the button below.\n\n**Note:** If you are attempting to connect a private channel, add the Chatwoot app to the Slack channel before proceeding with this step.",
-        "ATTENTION_REQUIRED": "Attention required",
-        "EXPIRED": "Your Slack integration has expired. To continue receiving messages on Slack, please delete the integration and connect your workspace again."
-      },
-      "UPDATE_ERROR": "There was an error updating the integration, please try again",
-      "UPDATE_SUCCESS": "The channel is connected successfully",
-      "FAILED_TO_FETCH_CHANNELS": "There was an error fetching the channels from Slack, please try again"
+        "BUTTON_TEXT": "Підключити канал",
+        "DESCRIPTION": "Ваш робочий простір Slack повністю пов'язаний з Chatwoot. Але інтеграція в даний час неактивна. Щоб активувати інтеграцію та підключити канал до Chatwoot, натисніть кнопку нижче.\n\n**Примітка:** Якщо ви намагаєтеся підключити приватний канал, додайте Chatwoot додаток до каналу Slack, перш ніж продовжити цей крок.",
+        "ATTENTION_REQUIRED": "Потрібно звернути увагу",
+        "EXPIRED": "Ваша інтеграція зі Slack закінчилася. Щоб продовжити отримувати повідомлення в Slack, будь ласка, видаліть інтеграцію і знову підключіть робочу область."
+      },
+      "UPDATE_ERROR": "Помилка при оновленні інтеграції, будь ласка, спробуйте ще раз",
+      "UPDATE_SUCCESS": "Канал успішно підключено",
+      "FAILED_TO_FETCH_CHANNELS": "Помилка при підключенні каналів з Slack, будь ласка, спробуйте ще раз"
     },
     "DYTE": {
       "CLICK_HERE_TO_JOIN": "Натисніть тут, щоб приєднатися",
@@ -104,38 +104,38 @@
     },
     "OPEN_AI": {
       "AI_ASSIST": "ШІ асистент",
-      "WITH_AI": " %{option} with AI ",
+      "WITH_AI": " %{option} з ШІ ",
       "OPTIONS": {
-        "REPLY_SUGGESTION": "Reply Suggestion",
-        "SUMMARIZE": "Summarize",
-        "REPHRASE": "Improve Writing",
-        "FIX_SPELLING_GRAMMAR": "Fix Spelling and Grammar",
-        "SHORTEN": "Shorten",
-        "EXPAND": "Expand",
-        "MAKE_FRIENDLY": "Change message tone to friendly",
-        "MAKE_FORMAL": "Use formal tone",
-        "SIMPLIFY": "Simplify"
+        "REPLY_SUGGESTION": "Пропозиція для відповіді",
+        "SUMMARIZE": "Підсумувати",
+        "REPHRASE": "Покращити написання",
+        "FIX_SPELLING_GRAMMAR": "Виправити правопис і граматику",
+        "SHORTEN": "Скоротити",
+        "EXPAND": "Розширити",
+        "MAKE_FRIENDLY": "Змінити сигнал повідомлення на дружній",
+        "MAKE_FORMAL": "Використовувати формальний сигнал",
+        "SIMPLIFY": "Спростити"
       },
       "ASSISTANCE_MODAL": {
-        "DRAFT_TITLE": "Draft content",
-        "GENERATED_TITLE": "Generated content",
-        "AI_WRITING": "AI is writing",
+        "DRAFT_TITLE": "Вміст чернетки",
+        "GENERATED_TITLE": "Згенерований вміст",
+        "AI_WRITING": "ШІ пише",
         "BUTTONS": {
-          "APPLY": "Use this suggestion",
+          "APPLY": "Використати цю пропозицію",
           "CANCEL": "Скасувати"
         }
       },
       "CTA_MODAL": {
-        "TITLE": "Integrate with OpenAI",
-        "DESC": "Bring advanced AI features to your dashboard with OpenAI's GPT models. To begin, enter the API key from your OpenAI account.",
-        "KEY_PLACEHOLDER": "Enter your OpenAI API key",
+        "TITLE": "Інтегрувати з OpenAI",
+        "DESC": "Додайте розширені функції AI в панель керування за допомогою моделей GPT OpenAI. Для початку введіть ключ API з вашого облікового запису OpenAI.",
+        "KEY_PLACEHOLDER": "Введіть ваш ключ OpenAI API",
         "BUTTONS": {
           "NEED_HELP": "Потрібна допомога?",
           "DISMISS": "Відхилити",
-          "FINISH": "Finish Setup"
+          "FINISH": "Завершити налаштування"
         },
-        "DISMISS_MESSAGE": "You can setup OpenAI integration later Whenever you want.",
-        "SUCCESS_MESSAGE": "OpenAI integration setup successfully"
+        "DISMISS_MESSAGE": "Ви можете налаштувати інтеграцію OpenAI пізніше, коли забажаєте.",
+        "SUCCESS_MESSAGE": "Інтеграція з OpenAI успішно налаштована"
       },
       "TITLE": "Покращити з ШІ",
       "SUMMARY_TITLE": "Резюме ШІ",
@@ -167,8 +167,8 @@
     "DASHBOARD_APPS": {
       "TITLE": "Додатки для головного екрану",
       "HEADER_BTN_TXT": "Додати нову інформаційну панель",
-      "SIDEBAR_TXT": "<p><b>Панель управління</b></p><p>Додатки дозволяють організаціям вставляти в панель керування Chatwoot інформацію, щоб надати контекст агентам підтримки клієнтів. Ця функція дозволяє створювати додаток незалежно і вставляти його в панелі управління відомості про користувача, свої замовлення або їхня попередня історія платежів.</p><p>Коли ви вставляєте свій застосунок за допомогою панелі керування в Чат-вуті, ваша програма отримає контекст розмови і зв'яжеться як віконна подія. Налаштуйте слухача для заходу повідомлення на вашій сторінці, щоб отримати контекст.</p><p>Щоб додати нову панель керування, натисніть кнопку 'Додати нову програму'.</p>",
-      "DESCRIPTION": "Додатки дозволяють організаціям вбудовувати інформаційну панель керування і надавати контекст для агентів підтримки клієнтів. Ця функція дозволяє створювати додаток незалежно і додавати інформацію, що надавали про користувача, свої замовлення або історію платежів.",
+      "SIDEBAR_TXT": "<p><b>Панель управління</b></p><p>Додатки дозволяють організаціям вставляти в панель керування Chatwoot інформацію, щоб надати контекст агентам підтримки клієнтів. Ця функція дозволяє створювати додаток незалежно і вставляти його в панелі управління відомості про користувача, їхні замовлення або історію попередніх платежів.</p><p>Коли ви вставляєте свій застосунок за допомогою панелі керування в Chatwoot, ваша програма отримає контекст розмови і зв'яжеться як віконна подія. Налаштуйте слухача для заходу повідомлення на вашій сторінці, щоб отримати контекст.</p><p>Щоб додати нову панель керування, натисніть кнопку 'Додати нову програму'.</p>",
+      "DESCRIPTION": "Додатки дозволяють організаціям вбудовувати інформаційну панель керування і надавати контекст для агентів підтримки клієнтів. Ця функція дозволяє створювати додаток незалежно і додавати інформацію, що надавали про користувача, його замовлення або історію платежів.",
       "LIST": {
         "404": "Поки що немає налаштованих додатків в цьому акаунті",
         "LOADING": "Отримання додатків панелі керування...",
diff --git a/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
index e9385f4bc6c2f..6b752b92e3012 100644
--- a/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
@@ -40,16 +40,16 @@
     },
     "SUGGESTIONS": {
       "TOOLTIP": {
-        "SINGLE_SUGGESTION": "Add label to conversation",
-        "MULTIPLE_SUGGESTION": "Select this label",
-        "DESELECT": "Deselect label",
-        "DISMISS": "Dismiss suggestion"
+        "SINGLE_SUGGESTION": "Додати мітку до розмови",
+        "MULTIPLE_SUGGESTION": "Вибрати цю мітку",
+        "DESELECT": "Скасувати вибір мітки",
+        "DISMISS": "Відхилити пропозицію"
       },
       "POWERED_BY": "Chatwoot AI",
       "DISMISS": "Відхилити",
-      "ADD_SELECTED_LABELS": "Add selected labels",
-      "ADD_SELECTED_LABEL": "Add selected label",
-      "ADD_ALL_LABELS": "Add all labels"
+      "ADD_SELECTED_LABELS": "Додати вибрані мітки",
+      "ADD_SELECTED_LABEL": "Додати вибрану мітку",
+      "ADD_ALL_LABELS": "Додати всі мітки"
     },
     "ADD": {
       "TITLE": "Додати мітку",
diff --git a/app/javascript/dashboard/i18n/locale/uk/macros.json b/app/javascript/dashboard/i18n/locale/uk/macros.json
index 84458f212d52d..14e34c2881650 100644
--- a/app/javascript/dashboard/i18n/locale/uk/macros.json
+++ b/app/javascript/dashboard/i18n/locale/uk/macros.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Додати новий макрос",
     "HEADER_BTN_TXT_SAVE": "Зберегти макрос",
     "LOADING": "Завантаження макросів",
-    "SIDEBAR_TXT": "<p><b>Макроси</b><p>Це набір збережених дій, що допомагають агентам служби обслуговування клієнтів легко виконувати завдання. Агенти можуть визначити набір дій, таких як позначення розмови якоюь міткою, відправленням розмови на пошту, оновлення користувацького атрибуту тощо. Коли агенти створюють макрос, дії виконуватимуться послідовно, в порядку, якому вони визначені. Макрос поліпшує продуктивність та підвищує ефективність в діях. </p><p>Макрос може бути корисним двома способами. </p><p><b>Повторювати дії агента:</b> Якщо агент виконує набір дій кілька разів, вони можуть зберегти їх як макрос і виконати всі дії разом використовуючи один клік.</p><p><b>Для учасників команди:</b> кожен агент повинен виконувати багато різних перевірок/дій під час кожної розмови. Додавання нового члена служби підтримки буде легким, якщо спеціалізовані макроси доступні на аккаунті. Замість того, щоб описувати кожен крок детально, менеджер / командний лідер може вказувати на макроси, використані в різних сценаріях.</p>",
+    "SIDEBAR_TXT": "<p><b>Макроси</b><p>Це набір збережених дій, що допомагають агентам служби обслуговування клієнтів легко виконувати завдання. Агенти можуть визначити набір дій, таких як позначення розмови якоюсь міткою, відправленням розмови на пошту, оновлення користувацького атрибуту тощо. Коли агенти створюють макрос, дії виконуватимуться послідовно, в порядку, якому вони визначені. Макрос поліпшує продуктивність та підвищує ефективність в діях. </p><p>Макрос може бути корисним двома способами. </p><p><b>Повторювати дії агента:</b> Якщо агент виконує набір дій кілька разів, вони можуть зберегти їх як макрос і виконати всі дії разом використовуючи один клік.</p><p><b>Для учасників команди:</b> кожен агент повинен виконувати багато різних перевірок/дій під час кожної розмови. Додавання нового члена служби підтримки буде легким, якщо спеціалізовані макроси доступні на аккаунті. Замість того, щоб описувати кожен крок детально, менеджер / командний лідер може вказувати на макроси, використані в різних сценаріях.</p>",
     "ERROR": "Щось пішло не так. Будь ласка, оновіть сторінку",
     "ORDER_INFO": "Макроси запускається у порядку додавання ваших дій. Ви можете переставити їх шляхом перетягування.",
     "ADD": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/report.json b/app/javascript/dashboard/i18n/locale/uk/report.json
index e7ea99af7ecbc..5501e8bb27bd4 100644
--- a/app/javascript/dashboard/i18n/locale/uk/report.json
+++ b/app/javascript/dashboard/i18n/locale/uk/report.json
@@ -4,8 +4,8 @@
     "LOADING_CHART": "Завантаження даних діаграми...",
     "NO_ENOUGH_DATA": "Ми не отримали достатньо даних для генерації звіту. Будь ласка, спробуйте ще раз пізніше.",
     "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.",
+    "DATA_FETCHING_FAILED": "Не вдалося отримати дані. Будь ласка, повторіть спробу пізніше.",
+    "SUMMARY_FETCHING_FAILED": "Не вдалося отримати дані. Будь ласка, повторіть спробу пізніше.",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Бесіди",
@@ -44,8 +44,8 @@
         "DESC": "(Загалом)"
       },
       "REPLY_TIME": {
-        "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
+        "NAME": "Час очікування клієнта",
+        "TOOLTIP_TEXT": "Час очікування становить %{metricValue} (на основі відповідей %{conversationCount})"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -140,7 +140,7 @@
     ],
     "BUSINESS_HOURS": "Робочий час",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "Очистити фільтр",
       "EMPTY_LIST": "Результатів не знайдено"
     }
   },
@@ -416,7 +416,7 @@
     "HEADER": "Звіти CSAT",
     "NO_RECORDS": "Немає доступних відповідей для опитувань CSAT.",
     "DOWNLOAD": "Завантажити CSAT звіти",
-    "DOWNLOAD_FAILED": "Failed to download CSAT Reports",
+    "DOWNLOAD_FAILED": "Не вдалося завантажити звіти CSAT",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Виберіть Агентів"
@@ -446,23 +446,23 @@
     }
   },
   "BOT_REPORTS": {
-    "HEADER": "Bot Reports",
+    "HEADER": "Звіти з ботів",
     "METRIC": {
       "TOTAL_CONVERSATIONS": {
-        "LABEL": "No. of Conversations",
-        "TOOLTIP": "Total number of conversations handled by the bot"
+        "LABEL": "Кількість розмов",
+        "TOOLTIP": "Загальна кількість розмов, оброблених ботом"
       },
       "TOTAL_RESPONSES": {
-        "LABEL": "Total Responses",
-        "TOOLTIP": "Total number of responses sent by the bot"
+        "LABEL": "Всього відповідей",
+        "TOOLTIP": "Загальна кількість відповідей, надісланих ботом"
       },
       "RESOLUTION_RATE": {
-        "LABEL": "Resolution Rate",
-        "TOOLTIP": "Total number of conversations resolved by the bot / Total number of conversations handled by the bot * 100"
+        "LABEL": "Час вирішення",
+        "TOOLTIP": "Загальна кількість розмов, вирішених ботом / Всього кількості розмов, які обробляє бот * 100"
       },
       "HANDOFF_RATE": {
         "LABEL": "Handoff Rate",
-        "TOOLTIP": "Total number of conversations handed off to agents / Total number of conversations handled by the bot * 100"
+        "TOOLTIP": "Загальна кількість розмов, переданих агентам / Загальна кількість розмов, яку обробляє бот * 100"
       }
     }
   },
@@ -511,26 +511,26 @@
     "SATURDAY": "Субота"
   },
   "SLA_REPORTS": {
-    "HEADER": "SLA Reports",
-    "NO_RECORDS": "SLA applied conversations are not available.",
-    "LOADING": "Loading SLA data...",
-    "DOWNLOAD_SLA_REPORTS": "Download SLA reports",
-    "DOWNLOAD_FAILED": "Failed to download SLA Reports",
+    "HEADER": "Звіти SLA",
+    "NO_RECORDS": "SLA розмови недоступні.",
+    "LOADING": "Завантаження SLA даних...",
+    "DOWNLOAD_SLA_REPORTS": "Завантажити CSAT звіти",
+    "DOWNLOAD_FAILED": "Не вдалося завантажити SLA звіти",
     "DROPDOWN": {
-      "ADD_FIlTER": "Add filter",
-      "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "ADD_FIlTER": "Додати фільтр",
+      "CLEAR_ALL": "Очистити все",
+      "CLEAR_FILTER": "Очистити фільтр",
       "EMPTY_LIST": "Результатів не знайдено",
-      "NO_FILTER": "No filters available",
-      "SEARCH": "Search filter",
+      "NO_FILTER": "Немає доступних фільтрів",
+      "SEARCH": "Фільтр пошуку",
       "INPUT_PLACEHOLDER": {
-        "SLA": "SLA name",
+        "SLA": "SLA назва",
         "AGENTS": "Ім'я агента",
         "INBOXES": "Назва Джерела",
         "LABELS": "Назва мітки",
         "TEAMS": "Назва команди"
       },
-      "SLA": "SLA Policy",
+      "SLA": "Політика SLA",
       "INBOXES": "Вхідні",
       "AGENTS": "Агент",
       "LABELS": "Мітка",
@@ -538,25 +538,25 @@
     },
     "METRICS": {
       "HIT_RATE": {
-        "LABEL": "Hit Rate",
-        "TOOLTIP": "Percentage of SLAs created were completed successfully"
+        "LABEL": "Рейтинг попадань",
+        "TOOLTIP": "Відсоток створених SLA був успішно завершений"
       },
       "NO_OF_MISSES": {
-        "LABEL": "Number of Misses",
-        "TOOLTIP": "Total SLA misses in a certain period"
+        "LABEL": "Кількість промахів",
+        "TOOLTIP": "Усього промахів SLA за певний період"
       },
       "NO_OF_CONVERSATIONS": {
-        "LABEL": "Number of Conversations",
-        "TOOLTIP": "Total number of conversations with SLA"
+        "LABEL": "Кількість розмов",
+        "TOOLTIP": "Загальна кількість розмов з SLA"
       }
     },
     "TABLE": {
       "HEADER": {
-        "POLICY": "Policy",
+        "POLICY": "Політика",
         "CONVERSATION": "Діалог",
         "AGENT": "Агент"
       },
-      "VIEW_DETAILS": "View Details"
+      "VIEW_DETAILS": "Переглянути деталі"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/resetPassword.json b/app/javascript/dashboard/i18n/locale/uk/resetPassword.json
index 99c85bf33a165..ebbca33460b27 100644
--- a/app/javascript/dashboard/i18n/locale/uk/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/uk/resetPassword.json
@@ -1,8 +1,8 @@
 {
   "RESET_PASSWORD": {
     "TITLE": "Скинути пароль",
-    "DESCRIPTION": "Enter the email address you use to log in to Chatwoot to get the password reset instructions.",
-    "GO_BACK_TO_LOGIN": "If you want to go back to the login page,",
+    "DESCRIPTION": "Введіть адресу електронної пошти, яку ви використовуєте для входу в Chatwoot, щоб отримати інструкцію зі скидання пароля.",
+    "GO_BACK_TO_LOGIN": "Якщо ви хочете повернутися на сторінку авторизації,",
     "EMAIL": {
       "LABEL": "Email",
       "PLACEHOLDER": "Введіть адресу електронної пошти.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 631bcbede50bb..7113099d87dc7 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Ваш пароль було успішно змінено",
     "AFTER_EMAIL_CHANGED": "Ваш обліковий запис було успішно оновлено. Будь ласка, увійдіть знову, оскільки ваші дані були змінені",
     "FORM": {
+      "PICTURE": "Фото профілю",
       "AVATAR": "Зображення облікового запису",
       "ERROR": "Будь ласка, виправте помилки форми",
       "REMOVE_IMAGE": "Видалити",
@@ -36,12 +37,12 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Підпис особистого повідомлення",
-        "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
+        "NOTE": "Створити унікальний підпис повідомлення для кожного повідомлення, яке ви надсилаєте з будь-якої поштової скриньки. Ви також можете включити вбудоване зображення, яке підтримується у живому чаті, електронній пошті та API-поштових скриньках.",
         "BTN_TEXT": "Зберегти підпис повідомлення",
         "API_ERROR": "Не вдалося зберегти підпис! Повторіть спробу",
         "API_SUCCESS": "Підпис успішно збережено",
-        "IMAGE_UPLOAD_ERROR": "Couldn't upload image! Try again",
-        "IMAGE_UPLOAD_SUCCESS": "Image added successfully. Please click on save to save the signature",
+        "IMAGE_UPLOAD_ERROR": "Не вдалося завантажити зображення! Повторіть спробу",
+        "IMAGE_UPLOAD_SUCCESS": "Зображення успішно додано. Будь ласка, натисніть на кнопку Зберегти, щоб зберегти підпис",
         "IMAGE_UPLOAD_SIZE_ERROR": "Зображення має бути менше {size}Мб"
       },
       "MESSAGE_SIGNATURE": {
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Ключ доступу",
-        "NOTE": "Цей ключ можна використовувати, якщо ви створюєте API-інтеграцію"
+        "NOTE": "Цей ключ можна використовувати, якщо ви створюєте API-інтеграцію",
+        "COPY": "Копіювати"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Звукові сповіщення",
         "NOTE": "Увімкніть звукові сповіщення в інформаційній панелі для нових повідомлень і розмов.",
+        "ALERT_TYPES": {
+          "NONE": "Нiчого",
+          "MINE": "Призначено",
+          "ALL": "Всі"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Події оповіщення:",
+          "TITLE": "Сповіщення про події для розмов:",
           "NONE": "Нiчого",
           "ASSIGNED": "Призначені розмови",
           "ALL_CONVERSATIONS": "Всі розмови"
@@ -84,9 +91,26 @@
         "CONVERSATION_MENTION": "Надсилати сповіщення електронною поштою, коли вас згадують в розмові",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Надсилати сповіщення при створенні нового повідомлення у призначеній розмові",
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Надсилати поштові листи, коли нове повідомлення створюється в призначеній розмові",
-        "SLA_MISSED_FIRST_RESPONSE": "Send email notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "Надсилати сповіщення електронною поштою, коли в бесіді пропущено першу відповідь SLA",
+        "SLA_MISSED_NEXT_RESPONSE": "Надсилати сповіщення електронною поштою, коли в бесіді пропущено наступну відповідь SLA",
+        "SLA_MISSED_RESOLUTION": "Надсилати сповіщення електронною поштою, коли бесіда пропускає SLA розширення"
+      },
+      "NOTIFICATIONS": {
+        "TITLE": "Налаштування сповіщень",
+        "TYPE_TITLE": "Тип сповіщення",
+        "EMAIL": "Email",
+        "PUSH": "Push-сповіщення",
+        "TYPES": {
+          "CONVERSATION_CREATED": "Діалог створено",
+          "CONVERSATION_ASSIGNED": "Розмова призначена вам",
+          "CONVERSATION_MENTION": "Ви згадані в розмові",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Нове повідомлення створено в призначеній розмові",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Створено нове повідомлення в розмові з учасниками",
+          "SLA_MISSED_FIRST_RESPONSE": "Розмова пропускає першу відповідь SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "Розмова пропускає наступну відповідь SLA",
+          "SLA_MISSED_RESOLUTION": "Розмова пропускає SLA розширення"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
       },
       "API": {
         "UPDATE_SUCCESS": "Налаштування сповіщень для вашого акаунту оновлено успішно",
@@ -102,9 +126,9 @@
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Надсилати push-повідомлення, коли нове повідомлення створюється в призначеній розмові",
         "HAS_ENABLED_PUSH": "Ви увімкнули push для цього браузера.",
         "REQUEST_PUSH": "Увімкнути push-сповіщення",
-        "SLA_MISSED_FIRST_RESPONSE": "Send push notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send push notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send push notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "Надсилати push-повідомлення, коли в розмові пропущено першу відповідь SLA",
+        "SLA_MISSED_NEXT_RESPONSE": "Надсилати push-повідомлення, коли в розмові пропущено наступну відповідь SLA",
+        "SLA_MISSED_RESOLUTION": "Надсилати push-повідомлення, коли бесіда пропускає SLA розширення"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Зображення облікового запису"
@@ -166,9 +190,9 @@
     "TRIAL_MESSAGE": "днів пробного періоду залишилося.",
     "TRAIL_BUTTON": "Придбати зараз",
     "DELETED_USER": "Видалений користувач",
-    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
-    "RESEND_VERIFICATION_MAIL": "Resend verification email",
-    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
+    "EMAIL_VERIFICATION_PENDING": "Схоже, ви ще не підтвердили адресу електронної пошти. Будь ласка, перевірте вашу поштову скриньку для підтвердження.",
+    "RESEND_VERIFICATION_MAIL": "Повторно надіслати листа з підтвердженням",
+    "EMAIL_VERIFICATION_SENT": "Лист для підтвердження було надіслано. Будь ласка, перевірте вашу електронну пошту.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Обліковий запис призупинено",
       "MESSAGE": "Ваш обліковий запис призупинено. Будь ласка, зверніться до служби підтримки для отримання додаткової інформації."
@@ -205,7 +229,7 @@
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Зараз переглядається:",
     "SWITCH": "Перемкнути",
-    "INBOX_VIEW": "Inbox View",
+    "INBOX_VIEW": "Перегляд вхідних",
     "CONVERSATIONS": "Бесіди",
     "INBOX": "Вхідні",
     "ALL_CONVERSATIONS": "Всі розмови",
@@ -284,7 +308,7 @@
     },
     "CHAT_WITH_US": {
       "TITLE": "Потрібна допомога?",
-      "DESCRIPTION": "Чи стикаються ви з питаннями у рахунках? Ми тут, щоб допомогти.",
+      "DESCRIPTION": "Чи зіткнулися ви з питаннями у рахунках? Ми тут, щоб допомогти.",
       "BUTTON_TXT": "Почніть розмову з нами"
     },
     "NO_BILLING_USER": "Ваш платіжний обліковий запис налаштовується. Будь ласка, оновіть сторінку та повторіть спробу."
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Перейти до бічної панелі звітів",
       "MOVE_TO_NEXT_TAB": "Перейти до наступної вкладки в списку бесід",
       "GO_TO_SETTINGS": "Перейти до налаштувань",
-      "SWITCH_CONVERSATION_STATUS": "Перейти до статусу наступної розмови",
       "SWITCH_TO_PRIVATE_NOTE": "Перейти до приватних заміток",
       "SWITCH_TO_REPLY": "Перейти до відповіді",
       "TOGGLE_SNOOZE_DROPDOWN": "Перемкнути випадаючий список відкладення"
diff --git a/app/javascript/dashboard/i18n/locale/uk/sla.json b/app/javascript/dashboard/i18n/locale/uk/sla.json
index a00a672f26ff0..57850cd711af5 100644
--- a/app/javascript/dashboard/i18n/locale/uk/sla.json
+++ b/app/javascript/dashboard/i18n/locale/uk/sla.json
@@ -1,25 +1,37 @@
 {
   "SLA": {
     "HEADER": "SLA",
-    "ADD_ACTION": "Add SLA",
-    "ADD_ACTION_LONG": "Create a new SLA Policy",
-    "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
-    "LEARN_MORE": "Learn more about SLA",
-    "LOADING": "Fetching SLAs",
+    "ADD_ACTION": "Додати SLA",
+    "ADD_ACTION_LONG": "Створити нову SLA політику",
+    "DESCRIPTION": "Угода про рівень послуг (SLAs) - це контракти, що визначають чіткі очікування між вашою командою та клієнтами. Вони встановлюють стандарти часу реагування та резолюції, створюючи рамки підзвітності та забезпечують послідовний, якісний досвід.",
+    "LEARN_MORE": "Дізнатися більше про SLA",
+    "LOADING": "Отримання SLAs",
+    "PAYWALL": {
+      "TITLE": "Оновіть, щоб створити SLA",
+      "AVAILABLE_ON": "Функція SLA доступна тільки в планах Business та Enterprise.",
+      "UPGRADE_PROMPT": "Оновіть ваш план, щоб отримати доступ до додаткових функцій, таких як управління командою, автоматизація, користувацькі атрибути та багато іншого.",
+      "UPGRADE_NOW": "Оновити зараз",
+      "CANCEL_ANYTIME": "Ви можете змінити або скасувати план у будь-який час"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "Функція SLA доступна тільки в платних планах.",
+      "UPGRADE_PROMPT": "Оновіться до платного плану для доступу до додаткових функцій, таких як аудиторські журнали, здатність агентів, тощо.",
+      "ASK_ADMIN": "Будь ласка, зверніться до адміністратора для оновлення."
+    },
     "LIST": {
-      "404": "There are no SLAs available in this account.",
+      "404": "У цьому обліковому записі немає SLA.",
       "EMPTY": {
         "TITLE_1": "Enterprise P0",
-        "DESC_1": "Issues raised by enterprise customers, that require immediate attention.",
+        "DESC_1": "Питання, висунуті корпоративними клієнтами, які потребують негайної уваги.",
         "TITLE_2": "Enterprise P1",
-        "DESC_2": "Issues raised by enterprise customers, that needs to be acknowledged quickly."
+        "DESC_2": "Питання, отримані підприємницькими клієнтами, потрібно швидко визнати."
       },
-      "BUSINESS_HOURS_ON": "Business hours on",
-      "BUSINESS_HOURS_OFF": "Business hours off",
+      "BUSINESS_HOURS_ON": "Увімкнено робочий час",
+      "BUSINESS_HOURS_OFF": "Вимкнено робочий час",
       "RESPONSE_TYPES": {
-        "FRT": "First response time threshold",
-        "NRT": "Next response time threshold",
-        "RT": "Resolution time threshold",
+        "FRT": "Час першої відповіді",
+        "NRT": "Час наступної відповіді",
+        "RT": "Час вирішення",
         "SHORT_HAND": {
           "FRT": "FRT",
           "NRT": "NRT",
@@ -29,22 +41,22 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "SLA Name",
-        "PLACEHOLDER": "SLA Name",
-        "REQUIRED_ERROR": "SLA name is required",
+        "LABEL": "Назва SLA",
+        "PLACEHOLDER": "Назва SLA",
+        "REQUIRED_ERROR": "Необхідно вказати ім'я SLA",
         "MINIMUM_LENGTH_ERROR": "Необхідна мінімальна довжина 2",
         "VALID_ERROR": "Дозволено тільки букви, цифри, гіфен та підкреслення"
       },
       "DESCRIPTION": {
         "LABEL": "Опис",
-        "PLACEHOLDER": "SLA for premium customers"
+        "PLACEHOLDER": "SLA для преміум клієнтів"
       },
       "FIRST_RESPONSE_TIME": {
         "LABEL": "Час першої відповіді",
         "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time",
+        "LABEL": "Час наступної відповіді",
         "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
@@ -53,10 +65,10 @@
       },
       "BUSINESS_HOURS": {
         "LABEL": "Робочий час",
-        "PLACEHOLDER": "Only during business hours"
+        "PLACEHOLDER": "Тільки протягом робочих годин"
       },
       "THRESHOLD_TIME": {
-        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+        "INVALID_FORMAT_ERROR": "Граничне значення має бути числом та більше нуля"
       },
       "EDIT": "Редагувати",
       "CREATE": "Створити",
@@ -64,33 +76,33 @@
       "CANCEL": "Скасувати"
     },
     "ADD": {
-      "TITLE": "Add SLA",
+      "TITLE": "Додати SLA",
       "DESC": "Friendly promises for great service!",
       "API": {
-        "SUCCESS_MESSAGE": "SLA added successfully",
+        "SUCCESS_MESSAGE": "SLA успішно додано",
         "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
       }
     },
     "DELETE": {
-      "TITLE": "Delete SLA",
+      "TITLE": "Видалити SLA",
       "API": {
-        "SUCCESS_MESSAGE": "SLA deleted successfully",
+        "SUCCESS_MESSAGE": "SLA успішно видалено",
         "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
       },
       "CONFIRM": {
         "TITLE": "Підтвердження видалення",
-        "MESSAGE": "Are you sure you want to delete ",
+        "MESSAGE": "Ви впевнені, що бажаєте видалити ",
         "YES": "Так, видалити ",
         "NO": "Ні, залишити "
       }
     },
     "EVENTS": {
-      "TITLE": "SLA Misses",
+      "TITLE": "SLA пропущено",
       "FRT": "Час першої відповіді",
-      "NRT": "Next response time",
-      "RT": "Resolution time",
-      "SHOW_MORE": "{count} more",
-      "HIDE": "Hide {count} rows"
+      "NRT": "Час наступної відповіді",
+      "RT": "Час вирішення",
+      "SHOW_MORE": "{count} більше",
+      "HIDE": "Приховати рядки {count}"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
index 887eb49148b40..546260d0a5258 100644
--- a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
@@ -110,7 +110,7 @@
       "CREATE": "Створити команду",
       "NAME": {
         "LABEL": "Назва команди",
-        "PLACEHOLDER": "Приклад: продажі, Підтримка клієнтів"
+        "PLACEHOLDER": "Приклад: продажі, підтримка клієнтів"
       },
       "DESCRIPTION": {
         "LABEL": "Опис команди",
diff --git a/app/javascript/dashboard/i18n/locale/ur/bulkActions.json b/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
index 68a3bd1310f1d..e711c435869c4 100644
--- a/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
index a5167b44879fb..cd9dff79fa414 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "حسب ضرورت اوصاف",
       "CONTACT_LABELS": "کانٹیکٹ لیبلز",
-      "PREVIOUS_CONVERSATIONS": "پچھلی بات چیت"
+      "PREVIOUS_CONVERSATIONS": "پچھلی بات چیت",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ur/contactFilters.json b/app/javascript/dashboard/i18n/locale/ur/contactFilters.json
index 99c10112b8856..e0e67fd210389 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contactFilters.json
@@ -33,7 +33,7 @@
     "ATTRIBUTES": {
       "NAME": "نام",
       "EMAIL": "Email",
-      "PHONE_NUMBER": "Phone number",
+      "PHONE_NUMBER": "فون نمبر",
       "IDENTIFIER": "Identifier",
       "CITY": "شہر",
       "COUNTRY": "ملک",
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
index 090a997b2b0af..3431800d45058 100644
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ur/datePicker.json b/app/javascript/dashboard/i18n/locale/ur/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index eba8713ca379e..dcdc78c74bde3 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index 7bea027633f54..134aaa0a666cc 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "فون نمبر",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -194,7 +194,7 @@
             "ERROR": "This field is required"
           },
           "PHONE_NUMBER": {
-            "LABEL": "Phone number",
+            "LABEL": "فون نمبر",
             "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
             "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
           },
@@ -223,7 +223,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "فون نمبر",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "ایجنٹ",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index fe2790bfd56ba..d8cbf63c556e7 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "کوئی نہیں۔",
+          "MINE": "Assigned",
+          "ALL": "تمام"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "کوئی نہیں۔",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ur/sla.json b/app/javascript/dashboard/i18n/locale/ur/sla.json
index e3eb113138012..1aa56a04c8b56 100644
--- a/app/javascript/dashboard/i18n/locale/ur/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ur/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json b/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
index 6af8316e9e1df..fe7c8de4a7870 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
index baac962bb3bd8..992f9e1f48a3f 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
index f1b7d1fb92c10..cc3e4569bc729 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "Attribute updated successfully",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/datePicker.json b/app/javascript/dashboard/i18n/locale/ur_IN/datePicker.json
new file mode 100644
index 0000000000000..c7ef068803cba
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "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_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
index a252d776fa99e..10b72907b7f5c 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index ef4275a4c7ff8..0a6361587f740 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Add agents to the created inbox."
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "You are all set to go!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
-        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Pick a value"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Please enter a valid URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Phone Number",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "This field is required"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "This field is required"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Create API Channel",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Channel Name",
           "PLACEHOLDER": "Please enter a channel name",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Agents",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 11a6a914aea0c..fc8d9982778da 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Profile Image",
       "ERROR": "Please fix form errors",
       "REMOVE_IMAGE": "Remove",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "NOTE": "This token can be used if you are building an API based integration",
+        "COPY": "Copy"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "None",
+          "MINE": "Assigned",
+          "ALL": "All"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "None",
           "ASSIGNED": "Assigned Conversations",
           "ALL_CONVERSATIONS": "All Conversations"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/sla.json b/app/javascript/dashboard/i18n/locale/ur_IN/sla.json
index ce6e3d17e146e..f32f24b61a035 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/vi/bulkActions.json b/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
index d223d7bc40af2..e119116bb9567 100644
--- a/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Đang tải điện thoại viên",
     "UPDATE": {
       "CHANGE_STATUS": "Thay đổi trạng thái",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Báo lại cho đến khi có câu trả lời tiếp theo.",
+      "SNOOZE_UNTIL": "Báo lại",
       "UPDATE_SUCCESFUL": "Đã cập nhật trạng thái cuộc hội thoại thành công.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 5dc3aa1c550dd..b026f298046f6 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh",
       "CONTACT_LABELS": "Nhãn danh bạ",
-      "PREVIOUS_CONVERSATIONS": "Cuộc trò chuyện trước đó"
+      "PREVIOUS_CONVERSATIONS": "Cuộc trò chuyện trước đó",
+      "NO_RECORDS_FOUND": "Không có thuộc tính nào được tìm thấy"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index 090b7b262ea62..1465db5c8c013 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Tạo thuộc tính",
+    "NO_RECORDS_FOUND": "Không có thuộc tính nào được tìm thấy",
     "UPDATE": {
       "SUCCESS": "Thuộc tính cập nhật thành công",
       "ERROR": "Không thể cập nhật thuộc tính. Vui lòng thử lại sau"
diff --git a/app/javascript/dashboard/i18n/locale/vi/datePicker.json b/app/javascript/dashboard/i18n/locale/vi/datePicker.json
new file mode 100644
index 0000000000000..df325a8ea6744
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Áp dụng",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "7 ngày cuối",
+      "LAST_30_DAYS": "30 ngày cuối",
+      "LAST_3_MONTHS": "3 tháng vừa qua",
+      "LAST_6_MONTHS": "6 tháng vừa qua",
+      "LAST_YEAR": "Năm ngoái",
+      "CUSTOM_RANGE": "Phạm vi ngày tùy chỉnh"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index 295243811a971..37da63b42ae79 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "Chung",
       "REPORTS": "Báo cáo",
       "CONVERSATION": "Hội thoại",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Thay đổi người được phân công",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Thay đổi nhóm",
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 4fbfd90c8f21c..27ece386e27b9 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "Thêm đại lý vào hộp thư đến đã tạo."
       },
       {
-        "title": "Tới rồi!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "Bạn đã sẵn sàng để đi!"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "Chọn một trang từ danh sách",
         "INBOX_NAME": "Tên hộp thư đến",
         "ADD_NAME": "Thêm tên cho hộp thư đến của bạn",
-        "PICK_NAME": "Chọn tên Hộp thư đến của bạn",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "Chọn một giá trị"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Điền Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "Vui lòng nhập một URL hợp lệ"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "Trường này là bắt buộc"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Số Điện Thoại",
+          "LABEL": "Số điện thoại",
           "PLACEHOLDER": "Vui lòng nhập số điện thoại mà tin nhắn sẽ được gửi.",
           "ERROR": "Vui lòng cung cấp số điện thoại hợp lệ bắt đầu bằng dấu `+` và không chứa bất kỳ dấu cách nào."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "Khoá API",
-            "PLACEHOLDER": "Vui lòng nhập Khoá API Bandwidth",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "Trường này là bắt buộc"
           },
           "API_SECRET": {
             "LABEL": "Bí mật API",
-            "PLACEHOLDER": "Vui lòng nhập mật khẩu API Bandwidth",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "Trường này là bắt buộc"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Token xác thực Webhook",
-          "PLACEHOLDER": "Nhập mã xác thực mà bạn muốn định cấu hình cho webhook facebook.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Vui lòng điền giá trị hợp lệ."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "SUBTITLE": "Định cấu hình URL mà bạn muốn nhận các cuộc gọi lại trên các events.",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
         "SUBMIT_BUTTON": "Tạo kênh API",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Kênh Email",
-        "DESC": "Tích hợp hộp thư đến email của bạn.",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "Tên kênh",
           "PLACEHOLDER": "Vui lòng nhập tên kênh",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "Nhà Cung Cấp",
         "DESC": "Tại đây bạn có thể thêm các tác nhân để quản lý hộp thư đến mới tạo của mình. Chỉ những đại lý được chọn này mới có quyền truy cập vào hộp thư đến của bạn. Các nhân viên không thuộc hộp thư đến này sẽ không thể xem hoặc trả lời thư trong hộp thư đến này khi họ đăng nhập. <br> <b>PS:</b> Với tư cách là quản trị viên, nếu bạn cần quyền truy cập vào tất cả các hộp thư đến, bạn nên thêm mình làm đại lý cho tất cả các hộp thư đến mà bạn tạo.",
-        "VALIDATION_ERROR": "Thêm ít nhất một đại lý vào hộp thư đến mới của bạn",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "Chọn đại lý cho hộp thư đến"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Cho phép nhắn tin sau khi cuộc trò chuyện được giải quyết",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Cho phép người dùng cuối nhắn tin sau khi cuộc trò chuyện được giải quyết.",
       "WHATSAPP_SECTION_SUBHEADER": "Khóa API này được sử dụng để tích hợp với các API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "Khoá API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Cập nhật",
-      "WHATSAPP_WEBHOOK_TITLE": "Token xác thực Webhook",
+      "WHATSAPP_WEBHOOK_TITLE": "Mã xác minh Webhook",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "Để bật chế độ SMTP, xin hãy cấu hình IMAP.",
       "UPDATE": "Cập nhật chi tiết IMAP",
       "TOGGLE_AVAILABILITY": "Kích hoạt cấu hình IMAP cho hộp thư đến này",
-      "TOGGLE_HELP": "Kích hoạt IMAP sẽ giúp cho người dùng nhận được email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "Tuỳ chỉnh IMAP được cập nhật thành công",
         "ERROR_MESSAGE": "Không thể cập nhật tuỳ chỉnh IMAP"
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 49e9139a3d987..8e81c6e03ffac 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "Mật khẩu của bạn đã được thay đổi thành công",
     "AFTER_EMAIL_CHANGED": "Hồ sơ của bạn đã được cập nhật thành công, vui lòng đăng nhập lại khi thông tin đăng nhập của bạn được thay đổi",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "Hình ảnh hồ sơ cá nhân",
       "ERROR": "Vui lòng sửa lỗi biểu mẫu",
       "REMOVE_IMAGE": "Xoá",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token truy cập",
-        "NOTE": "Có thể sử dụng Token này nếu bạn đang xây dựng tích hợp dựa trên API"
+        "NOTE": "Có thể sử dụng Token này nếu bạn đang xây dựng tích hợp dựa trên API",
+        "COPY": "Sao Chép"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Âm thanh Thông báo",
         "NOTE": "Bật âm thanh thông báo trong trang tổng quan cho các tin nhắn và cuộc trò chuyện mới.",
+        "ALERT_TYPES": {
+          "NONE": "Không có",
+          "MINE": "Assigned",
+          "ALL": "Tất cả"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Sự kiện cảnh báo:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "Không có",
           "ASSIGNED": "Cuộc trò chuyện được phân công",
           "ALL_CONVERSATIONS": "Tất cả cuộc trò chuyện"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "Tùy chọn thông báo của bạn đã được cập nhật thành công",
         "UPDATE_ERROR": "Đã xảy ra lỗi khi cập nhật tùy chọn, vui lòng thử lại"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Đi đến thanh bên Báo cáo",
       "MOVE_TO_NEXT_TAB": "Di chuyển đến tab tiếp theo trong danh sách cuộc trò chuyện",
       "GO_TO_SETTINGS": "Đi đến Cài đặt",
-      "SWITCH_CONVERSATION_STATUS": "Chuyển sang trạng thái cuộc trò chuyện tiếp theo",
       "SWITCH_TO_PRIVATE_NOTE": "Chuyển sang Ghi chú Riêng tư",
       "SWITCH_TO_REPLY": "Chuyển sang phản hồi",
       "TOGGLE_SNOOZE_DROPDOWN": "Chuyển đổi thả xuống tạm dừng"
diff --git a/app/javascript/dashboard/i18n/locale/vi/sla.json b/app/javascript/dashboard/i18n/locale/vi/sla.json
index 9f4f2af3e0348..d465a7c563438 100644
--- a/app/javascript/dashboard/i18n/locale/vi/sla.json
+++ b/app/javascript/dashboard/i18n/locale/vi/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json b/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
index 1f2bd1b380b93..d6ef31100977d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "正在加载客服代表",
     "UPDATE": {
       "CHANGE_STATUS": "更改状态",
-      "SNOOZE_UNTIL_NEXT_REPLY": "推迟至下一个回复.",
+      "SNOOZE_UNTIL": "推迟",
       "UPDATE_SUCCESFUL": "对话状态更新成功。",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index f3f60a85da276..11586e6b31aae 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "自定义属性",
       "CONTACT_LABELS": "联系人标签",
-      "PREVIOUS_CONVERSATIONS": "上一次对话"
+      "PREVIOUS_CONVERSATIONS": "上一次对话",
+      "NO_RECORDS_FOUND": "未找到属性"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "导出联系人",
       "MESSAGE": "您确定要导出所有联系人吗？",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "是的，导出",
       "NO": "否，取消"
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 55d976dccdda4..2b6e7bf1e4b3d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "创建属性",
+    "NO_RECORDS_FOUND": "未找到属性",
     "UPDATE": {
       "SUCCESS": "已成功更新属性",
       "ERROR": "无法更新属性，请稍后再试。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/datePicker.json b/app/javascript/dashboard/i18n/locale/zh_CN/datePicker.json
new file mode 100644
index 0000000000000..c3ff6956824ee
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "Apply",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "最近7天",
+      "LAST_30_DAYS": "最近30天",
+      "LAST_3_MONTHS": "Last 3 months",
+      "LAST_6_MONTHS": "Last 6 months",
+      "LAST_YEAR": "Last year",
+      "CUSTOM_RANGE": "Custom date range"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index ccf2d4ab7076f..0127763e945da 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "一般",
       "REPORTS": "报告",
       "CONVERSATION": "会话",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "更改分配",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "更改团队",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 95f4f4b729a2d..e6913a20f6a4e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "将客服添加到创建的收件箱。"
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "你已设定状态为离开"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "从列表中选择一个页面",
         "INBOX_NAME": "收件箱名称",
         "ADD_NAME": "为收件箱添加名称",
-        "PICK_NAME": "选择收件箱名称",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "选择一个数值"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook 网址",
-          "PLACEHOLDER": "输入您的 Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "请输入一个有效的 URL"
         },
         "CHANNEL_DOMAIN": {
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API 密钥",
-            "PLACEHOLDER": "请输入您的Bandwidth API密钥",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "此字段是必填项"
           },
           "API_SECRET": {
             "LABEL": "API秘钥",
-            "PLACEHOLDER": "请输入您的 Bandwidth API 秘钥",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "此字段是必填项"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook 验证令牌",
-          "PLACEHOLDER": "请输入您要配置为Facebook Webhook的验证令牌",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "请输入一个有效的值"
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook 网址",
-          "SUBTITLE": "配置您希望接收事件回调的URL",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook 网址"
         },
         "SUBMIT_BUTTON": "创建 API 频道",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "电子邮件频道",
-        "DESC": "集成您的电子邮件收件箱",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "频道类型",
           "PLACEHOLDER": "请输入频道名称",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "客服代理们",
         "DESC": "在这里您可以添加代理来管理您新创建的收件箱。只有这些选定的代理才能访问您的收件箱。 不属于此收件箱的代理人在登录时将无法看到或回复此收件箱中的消息。 <br> <b>PS：</b> 作为管理员，如果您需要访问所有收件箱， 您应该将自己添加到您创建的所有收件箱中。",
-        "VALIDATION_ERROR": "添加至少一个代理到您的新收件箱",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "为收件箱选择代理"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "发件人姓名",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "友好的",
@@ -508,7 +508,7 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API 密钥",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "要启用 SMTP，请配置 IMAP。",
       "UPDATE": "更新 IMAP 设置",
       "TOGGLE_AVAILABILITY": "为此收件箱启用 IMAP 配置",
-      "TOGGLE_HELP": "启用 IMAP 将帮助用户接收电子邮件",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP 设置更新成功",
         "ERROR_MESSAGE": "无法更新 IMAP 设置"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 925cee0907f07..b79271b59c0ef 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "您的密码已成功更改。",
     "AFTER_EMAIL_CHANGED": "您的个人资料已成功更新，请在您的登录凭据更改后重新登录",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "头像",
       "ERROR": "请修正表单错误",
       "REMOVE_IMAGE": "删除",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "访问令牌",
-        "NOTE": "如果您正在构建基于 API 的集成，这个令牌可以被使用"
+        "NOTE": "如果您正在构建基于 API 的集成，这个令牌可以被使用",
+        "COPY": "复制"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "语音通知",
         "NOTE": "在仪表盘中为新消息和对话启用音频通知。",
+        "ALERT_TYPES": {
+          "NONE": "啥都没有",
+          "MINE": "Assigned",
+          "ALL": "所有的"
+        },
         "ALERT_TYPE": {
-          "TITLE": "提醒事件：",
+          "TITLE": "Alert events for conversations:",
           "NONE": "啥都没有",
           "ASSIGNED": "分配会话",
           "ALL_CONVERSATIONS": "所有会话"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "您的通知设置已成功更新",
         "UPDATE_ERROR": "更新配置时出错，请再试一次"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
index 91a54967743a2..361241aaf5c24 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json b/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
index 3ca619af48ece..6bf3024f78934 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
@@ -1,52 +1,52 @@
 {
   "AGENT_BOTS": {
     "HEADER": "機器人",
-    "LOADING_EDITOR": "Loading editor...",
-    "HEADER_BTN_TXT": "Add bot configuration",
+    "LOADING_EDITOR": "正在載入編輯器...",
+    "HEADER_BTN_TXT": "新增機器人設定",
     "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try.</p> <p> You can manage your bots from this page or create new ones using the 'Add bot configuraton' button.</p> <p> Open the <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">Agent bots handbook</a> in another tab for a helping hand.</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Bot name",
-        "PLACEHOLDER": "Name your bot.",
+        "LABEL": "機器人名稱",
+        "PLACEHOLDER": "命名你的機器人",
         "ERROR": "機器人名稱為必填."
       },
       "DESCRIPTION": {
-        "LABEL": "Bot description",
+        "LABEL": "機器人描述",
         "PLACEHOLDER": "這個機器人的作用是什麼"
       },
       "BOT_CONFIG": {
-        "ERROR": "Please enter your CSML bot configuration above.",
-        "API_ERROR": "Your CSML configuration is invalid. Please fix it and try again."
+        "ERROR": "請在上方輸入你的CSML機器人設定",
+        "API_ERROR": "你的CSML設定是無效的. 請修正後再試."
       },
-      "SUBMIT": "Validate and save"
+      "SUBMIT": "驗證並儲存"
     },
     "BOT_CONFIGURATION": {
       "TITLE": "選擇一個客服機器人",
       "DESC": "Assign an Agent Bot to your inbox. They can handle initial conversations and transfer them to a live agent when necessary.",
       "SUBMIT": "更新",
-      "DISCONNECT": "Disconnect bot",
+      "DISCONNECT": "取消機器人連結",
       "SUCCESS_MESSAGE": "成功更新客服機器人.",
       "DISCONNECTED_SUCCESS_MESSAGE": "成功解除客服機器人連結.",
       "ERROR_MESSAGE": "Could not update the agent bot. Please try again.",
       "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot. Please try again.",
-      "SELECT_PLACEHOLDER": "Select bot"
+      "SELECT_PLACEHOLDER": "選擇機器人"
     },
     "ADD": {
       "TITLE": "設定新的機器人",
       "CANCEL_BUTTON_TEXT": "取消",
       "API": {
         "SUCCESS_MESSAGE": "機器人新增成功.",
-        "ERROR_MESSAGE": "Could not add bot. Please try again later."
+        "ERROR_MESSAGE": "無法新增機器人，請稍後再試."
       }
     },
     "LIST": {
-      "404": "No bots found. You can create a bot by clicking the 'Configure new bot' button ↗",
-      "LOADING": "Fetching bots...",
-      "TYPE": "Bot type"
+      "404": "查無機器人，你可以點擊「設定新的機器人」按鈕設定一個機器人",
+      "LOADING": "正在取得機器人...",
+      "TYPE": "機器人類型"
     },
     "DELETE": {
       "BUTTON_TEXT": "刪除",
-      "TITLE": "Delete bot",
+      "TITLE": "刪除機器人",
       "SUBMIT": "刪除",
       "CANCEL_BUTTON_TEXT": "取消",
       "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible.",
@@ -57,17 +57,17 @@
     },
     "EDIT": {
       "BUTTON_TEXT": "編輯",
-      "LOADING": "Fetching bots...",
-      "TITLE": "Edit bot",
+      "LOADING": "正在取得機器人...",
+      "TITLE": "編輯機器人",
       "CANCEL_BUTTON_TEXT": "取消",
       "API": {
         "SUCCESS_MESSAGE": "機器人更新成功.",
-        "ERROR_MESSAGE": "Could not update bot. Please try again."
+        "ERROR_MESSAGE": "無法更新機器人，請稍後再試"
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook bot",
-      "CSML": "CSML bot"
+      "WEBHOOK": "Webhook 機器人",
+      "CSML": "CSML 機器人"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json b/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
index ea3f02a43530f..1f80e99f5cb4d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
@@ -4,11 +4,11 @@
     "AGENT_SELECT_LABEL": "選擇客服",
     "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
     "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
-    "GO_BACK_LABEL": "Go back",
+    "GO_BACK_LABEL": "返回",
     "ASSIGN_LABEL": "指派",
     "YES": "是",
-    "ASSIGN_AGENT_TOOLTIP": "Assign agent",
-    "ASSIGN_TEAM_TOOLTIP": "Assign team",
+    "ASSIGN_AGENT_TOOLTIP": "指派客服",
+    "ASSIGN_TEAM_TOOLTIP": "指派團隊",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully.",
     "ASSIGN_FAILED": "Failed to assign conversations. Please try again.",
     "RESOLVE_SUCCESFUL": "Conversations resolved successfully.",
@@ -17,7 +17,7 @@
     "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
+      "SNOOZE_UNTIL": "Snooze",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
       "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
index dce1758d9620c..bdf71dec7dfc4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
@@ -28,7 +28,7 @@
         "CONTENT": {
           "LABEL": "訊息",
           "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
-          "ERROR": "Message is required."
+          "ERROR": "訊息為必填."
         },
         "SUBMIT": "送出"
       },
@@ -38,7 +38,7 @@
       }
     },
     "EDIT": {
-      "TITLE": "Edit canned response",
+      "TITLE": "編輯罐頭回覆",
       "CANCEL_BUTTON_TEXT": "取消操作",
       "FORM": {
         "SHORT_CODE": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 42d75710a17e5..6902a3e637254 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -48,7 +48,8 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "自訂屬性",
       "CONTACT_LABELS": "聯絡人標籤",
-      "PREVIOUS_CONVERSATIONS": "上一次對話"
+      "PREVIOUS_CONVERSATIONS": "上一次對話",
+      "NO_RECORDS_FOUND": "No attributes found"
     }
   },
   "EDIT_CONTACT": {
@@ -83,6 +84,7 @@
     "CONFIRM": {
       "TITLE": "Export Contacts",
       "MESSAGE": "Are you sure you want to export all contacts?",
+      "FILTERED_MESSAGE": "Are you sure you want to export all the filtered contacts?",
       "YES": "Yes, Export",
       "NO": "No, Cancel"
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 9dc691df50b8e..f8546a7444038 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -280,6 +280,7 @@
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
+    "NO_RECORDS_FOUND": "No attributes found",
     "UPDATE": {
       "SUCCESS": "屬性更新成功",
       "ERROR": "Unable to update attribute. Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/datePicker.json b/app/javascript/dashboard/i18n/locale/zh_TW/datePicker.json
new file mode 100644
index 0000000000000..8e187f50d4e7d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/datePicker.json
@@ -0,0 +1,19 @@
+{
+  "DATE_PICKER": {
+    "APPLY_BUTTON": "套用",
+    "CLEAR_BUTTON": "Clear",
+    "DATE_RANGE_INPUT": {
+      "START": "Start Date",
+      "END": "End Date"
+    },
+    "DATE_RANGE_OPTIONS": {
+      "TITLE": "DATE RANGE",
+      "LAST_7_DAYS": "最近7天",
+      "LAST_30_DAYS": "最近30天",
+      "LAST_3_MONTHS": "三個月內",
+      "LAST_6_MONTHS": "六個月內",
+      "LAST_YEAR": "去年",
+      "CUSTOM_RANGE": "自定日期範圍"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index 2d3949f38d200..49f69de56cca2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -107,6 +107,7 @@
       "GENERAL": "General",
       "REPORTS": "報表",
       "CONVERSATION": "對話",
+      "BULK_ACTIONS": "Bulk Actions",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index aa42ec52fd7db..bdbc90b71bb7d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -22,7 +22,7 @@
         "body": "將客服增加到建立的收件匣。"
       },
       {
-        "title": "Voila!",
+        "title": "Voilà!",
         "route": "settings_inbox_finish",
         "body": "您已設定狀態為離開"
       }
@@ -43,7 +43,7 @@
         "CHOOSE_PLACEHOLDER": "從列表中選擇一個頁面",
         "INBOX_NAME": "收件匣名稱",
         "ADD_NAME": "為收件匣新增名稱",
-        "PICK_NAME": "選擇收件匣名稱",
+        "PICK_NAME": "Pick a Name for your Inbox",
         "PICK_A_VALUE": "選擇一個數值"
       },
       "TWITTER": {
@@ -62,7 +62,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook 網址",
-          "PLACEHOLDER": "輸入你的 Webhook URL",
+          "PLACEHOLDER": "Please enter your Webhook URL",
           "ERROR": "請輸入一個有效的 URL"
         },
         "CHANNEL_DOMAIN": {
@@ -143,7 +143,7 @@
           "ERROR": "此欄位是必填項目"
         },
         "PHONE_NUMBER": {
-          "LABEL": "電話號碼",
+          "LABEL": "聯絡人電話",
           "PLACEHOLDER": "請輸入發送消息的電話號碼。",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -175,12 +175,12 @@
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "PLACEHOLDER": "Please enter your Bandwidth API Key",
             "ERROR": "此欄位是必填項目"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
             "ERROR": "此欄位是必填項目"
           },
           "APPLICATION_ID": {
@@ -239,7 +239,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
@@ -269,7 +269,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook 網址",
-          "SUBTITLE": "設定接收回呼事件的網址。",
+          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
           "PLACEHOLDER": "Webhook 網址"
         },
         "SUBMIT_BUTTON": "建立 API 頻道",
@@ -279,7 +279,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "電子信箱頻道",
-        "DESC": "整合您的電子信箱收件匣",
+        "DESC": "Integrate your email inbox.",
         "CHANNEL_NAME": {
           "LABEL": "頻道類型",
           "PLACEHOLDER": "請輸入頻道名稱",
@@ -345,7 +345,7 @@
       "AGENTS": {
         "TITLE": "客服",
         "DESC": "在這裡您可以新增客服來管理您新建立的收件匣。只有這些選定的客服才能訪問您的收件匣。 不屬於此收件匣的客服在登入時將無法看到或回覆此收件匣中的消息。 <br> <b>PS：</b> 作為管理員，如果您需要訪問所有收件匣， 您應該將自己建立到您建立的所有收件匣中。",
-        "VALIDATION_ERROR": "新增至少一位客服到新的收件匣",
+        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
         "PICK_AGENTS": "為收件匣挑選一些客服"
       },
       "DETAILS": {
@@ -406,7 +406,7 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "Sender name",
-        "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
+        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
@@ -508,12 +508,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "更新 API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "在此輸入新的 API Key",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
@@ -585,7 +585,7 @@
       "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Update IMAP settings",
       "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
       "EDIT": {
         "SUCCESS_MESSAGE": "IMAP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update IMAP settings"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 170ea0382ca6a..1e57f93e056d4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -10,6 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "你的密碼已成功變更",
     "AFTER_EMAIL_CHANGED": "您的個人資料已成功更新，請在您的登入憑證更改後重新登入",
     "FORM": {
+      "PICTURE": "Profile Picture",
       "AVATAR": "頭像",
       "ERROR": "請修正表單錯誤",
       "REMOVE_IMAGE": "刪除",
@@ -56,13 +57,19 @@
       },
       "ACCESS_TOKEN": {
         "TITLE": "訪問 token",
-        "NOTE": "如果要構建基於 API 的整合，則可以使用此 token"
+        "NOTE": "如果要構建基於 API 的整合，則可以使用此 token",
+        "COPY": "複製"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "音效通知",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "ALERT_TYPES": {
+          "NONE": "無",
+          "MINE": "Assigned",
+          "ALL": "所有的"
+        },
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Alert events for conversations:",
           "NONE": "無",
           "ASSIGNED": "已指派的對話",
           "ALL_CONVERSATIONS": "所有對話"
@@ -88,6 +95,23 @@
         "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
         "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
       },
+      "NOTIFICATIONS": {
+        "TITLE": "Notification preferences",
+        "TYPE_TITLE": "Notification type",
+        "EMAIL": "Email",
+        "PUSH": "Push notification",
+        "TYPES": {
+          "CONVERSATION_CREATED": "A new conversation is created",
+          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
+          "CONVERSATION_MENTION": "You are mentioned in a conversation",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
+          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
+          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+        },
+        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+      },
       "API": {
         "UPDATE_SUCCESS": "您的通知設定已成功更新",
         "UPDATE_ERROR": "更新配置時出錯，請再試一次"
@@ -320,7 +344,6 @@
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "前往設定",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/sla.json b/app/javascript/dashboard/i18n/locale/zh_TW/sla.json
index 4fbb66ae297fe..2dcd814249864 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/sla.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/sla.json
@@ -6,6 +6,18 @@
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
+    "PAYWALL": {
+      "TITLE": "Upgrade to create SLAs",
+      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
+      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
+      "UPGRADE_NOW": "Upgrade now",
+      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+    },
+    "ENTERPRISE_PAYWALL": {
+      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
+      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+    },
     "LIST": {
       "404": "There are no SLAs available in this account.",
       "EMPTY": {
@@ -93,4 +105,4 @@
       "HIDE": "Hide {count} rows"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
index 9adb9b2eb856e..4e45508eea28a 100644
--- a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
+++ b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
@@ -106,7 +106,6 @@
 <script>
 import alertMixin from 'shared/mixins/alertMixin';
 import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import AddCannedModal from 'dashboard/routes/dashboard/settings/canned/AddCanned.vue';
 import { copyTextToClipboard } from 'shared/helpers/clipboard';
@@ -124,7 +123,7 @@ export default {
     TranslateModal,
     MenuItem,
   },
-  mixins: [alertMixin, clickaway, messageFormatterMixin],
+  mixins: [alertMixin, messageFormatterMixin],
   props: {
     message: {
       type: Object,
diff --git a/app/javascript/dashboard/modules/notes/components/AddNote.vue b/app/javascript/dashboard/modules/notes/components/AddNote.vue
index a445c21adde23..69f999e17993d 100644
--- a/app/javascript/dashboard/modules/notes/components/AddNote.vue
+++ b/app/javascript/dashboard/modules/notes/components/AddNote.vue
@@ -23,12 +23,12 @@
 
 <script>
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor.vue';
-import { hasPressedCommandAndEnter } from 'shared/helpers/KeyboardHelpers';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 export default {
   components: {
     WootMessageEditor,
   },
-
+  mixins: [keyboardEventListenerMixins],
   data() {
     return {
       noteContent: '',
@@ -40,21 +40,14 @@ export default {
       return this.noteContent === '';
     },
   },
-
-  mounted() {
-    document.addEventListener('keydown', this.onMetaEnter);
-  },
-
-  beforeDestroy() {
-    document.removeEventListener('keydown', this.onMetaEnter);
-  },
-
   methods: {
-    onMetaEnter(e) {
-      if (hasPressedCommandAndEnter(e)) {
-        e.preventDefault();
-        this.onAdd();
-      }
+    getKeyboardEvents() {
+      return {
+        '$mod+Enter': {
+          action: () => this.onAdd(),
+          allowOnFocusedInput: true,
+        },
+      };
     },
     onAdd() {
       if (this.noteContent !== '') {
diff --git a/app/javascript/dashboard/modules/search/components/SearchView.vue b/app/javascript/dashboard/modules/search/components/SearchView.vue
index 1706bc45e6b6a..c9b122b323ce4 100644
--- a/app/javascript/dashboard/modules/search/components/SearchView.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchView.vue
@@ -73,7 +73,6 @@ import SearchResultConversationsList from './SearchResultConversationsList.vue';
 import SearchResultMessagesList from './SearchResultMessagesList.vue';
 import SearchResultContactsList from './SearchResultContactsList.vue';
 
-import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
 import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
 export default {
@@ -84,7 +83,6 @@ export default {
     SearchResultConversationsList,
     SearchResultMessagesList,
   },
-  mixins: [clickaway],
   data() {
     return {
       selectedTab: 'all',
diff --git a/app/javascript/dashboard/routes/dashboard/commands/bulkActionsHotKeys.js b/app/javascript/dashboard/routes/dashboard/commands/bulkActionsHotKeys.js
new file mode 100644
index 0000000000000..8f5efd605a230
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/commands/bulkActionsHotKeys.js
@@ -0,0 +1,151 @@
+import { mapGetters } from 'vuex';
+import wootConstants from 'dashboard/constants/globals';
+
+import {
+  CMD_BULK_ACTION_SNOOZE_CONVERSATION,
+  CMD_BULK_ACTION_REOPEN_CONVERSATION,
+  CMD_BULK_ACTION_RESOLVE_CONVERSATION,
+} from './commandBarBusEvents';
+import {
+  ICON_SNOOZE_CONVERSATION,
+  ICON_REOPEN_CONVERSATION,
+  ICON_RESOLVE_CONVERSATION,
+} from './CommandBarIcons';
+
+const SNOOZE_OPTIONS = wootConstants.SNOOZE_OPTIONS;
+
+export const SNOOZE_CONVERSATION_BULK_ACTIONS = [
+  {
+    id: 'bulk_action_snooze_conversation',
+    title: 'COMMAND_BAR.COMMANDS.SNOOZE_CONVERSATION',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    icon: ICON_SNOOZE_CONVERSATION,
+    children: Object.values(SNOOZE_OPTIONS),
+  },
+
+  {
+    id: SNOOZE_OPTIONS.UNTIL_NEXT_REPLY,
+    title: 'COMMAND_BAR.COMMANDS.UNTIL_NEXT_REPLY',
+    parent: 'bulk_action_snooze_conversation',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    icon: ICON_SNOOZE_CONVERSATION,
+    handler: () =>
+      bus.$emit(
+        CMD_BULK_ACTION_SNOOZE_CONVERSATION,
+        SNOOZE_OPTIONS.UNTIL_NEXT_REPLY
+      ),
+  },
+  {
+    id: SNOOZE_OPTIONS.AN_HOUR_FROM_NOW,
+    title: 'COMMAND_BAR.COMMANDS.AN_HOUR_FROM_NOW',
+    parent: 'bulk_action_snooze_conversation',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    icon: ICON_SNOOZE_CONVERSATION,
+    handler: () =>
+      bus.$emit(
+        CMD_BULK_ACTION_SNOOZE_CONVERSATION,
+        SNOOZE_OPTIONS.AN_HOUR_FROM_NOW
+      ),
+  },
+  {
+    id: SNOOZE_OPTIONS.UNTIL_TOMORROW,
+    title: 'COMMAND_BAR.COMMANDS.UNTIL_TOMORROW',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    parent: 'bulk_action_snooze_conversation',
+    icon: ICON_SNOOZE_CONVERSATION,
+    handler: () =>
+      bus.$emit(
+        CMD_BULK_ACTION_SNOOZE_CONVERSATION,
+        SNOOZE_OPTIONS.UNTIL_TOMORROW
+      ),
+  },
+  {
+    id: SNOOZE_OPTIONS.UNTIL_NEXT_WEEK,
+    title: 'COMMAND_BAR.COMMANDS.UNTIL_NEXT_WEEK',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    parent: 'bulk_action_snooze_conversation',
+    icon: ICON_SNOOZE_CONVERSATION,
+    handler: () =>
+      bus.$emit(
+        CMD_BULK_ACTION_SNOOZE_CONVERSATION,
+        SNOOZE_OPTIONS.UNTIL_NEXT_WEEK
+      ),
+  },
+  {
+    id: SNOOZE_OPTIONS.UNTIL_NEXT_MONTH,
+    title: 'COMMAND_BAR.COMMANDS.UNTIL_NEXT_MONTH',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    parent: 'bulk_action_snooze_conversation',
+    icon: ICON_SNOOZE_CONVERSATION,
+    handler: () =>
+      bus.$emit(
+        CMD_BULK_ACTION_SNOOZE_CONVERSATION,
+        SNOOZE_OPTIONS.UNTIL_NEXT_MONTH
+      ),
+  },
+  {
+    id: SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME,
+    title: 'COMMAND_BAR.COMMANDS.CUSTOM',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    parent: 'bulk_action_snooze_conversation',
+    icon: ICON_SNOOZE_CONVERSATION,
+    handler: () =>
+      bus.$emit(
+        CMD_BULK_ACTION_SNOOZE_CONVERSATION,
+        SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME
+      ),
+  },
+];
+
+export const RESOLVED_CONVERSATION_BULK_ACTIONS = [
+  {
+    id: 'bulk_action_reopen_conversation',
+    title: 'COMMAND_BAR.COMMANDS.REOPEN_CONVERSATION',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    icon: ICON_REOPEN_CONVERSATION,
+    handler: () => bus.$emit(CMD_BULK_ACTION_REOPEN_CONVERSATION),
+  },
+];
+
+export const OPEN_CONVERSATION_BULK_ACTIONS = [
+  {
+    id: 'bulk_action_resolve_conversation',
+    title: 'COMMAND_BAR.COMMANDS.RESOLVE_CONVERSATION',
+    section: 'COMMAND_BAR.SECTIONS.BULK_ACTIONS',
+    icon: ICON_RESOLVE_CONVERSATION,
+    handler: () => bus.$emit(CMD_BULK_ACTION_RESOLVE_CONVERSATION),
+  },
+];
+
+export default {
+  computed: {
+    ...mapGetters({
+      selectedConversations: 'bulkActions/getSelectedConversationIds',
+    }),
+    bulkActionsHotKeys() {
+      let actions = [];
+      if (this.selectedConversations.length > 0) {
+        actions = [
+          ...SNOOZE_CONVERSATION_BULK_ACTIONS,
+          ...RESOLVED_CONVERSATION_BULK_ACTIONS,
+          ...OPEN_CONVERSATION_BULK_ACTIONS,
+        ];
+      }
+      return this.prepareActions(actions);
+    },
+  },
+  watch: {
+    selectedConversations() {
+      this.setCommandbarData();
+    },
+  },
+  methods: {
+    prepareActions(actions) {
+      return actions.map(action => ({
+        ...action,
+        title: this.$t(action.title),
+        section: this.$t(action.section),
+      }));
+    },
+  },
+};
diff --git a/app/javascript/dashboard/routes/dashboard/commands/commandBarBusEvents.js b/app/javascript/dashboard/routes/dashboard/commands/commandBarBusEvents.js
index 86e417ad7bec2..f42688f54517a 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/commandBarBusEvents.js
+++ b/app/javascript/dashboard/routes/dashboard/commands/commandBarBusEvents.js
@@ -16,5 +16,13 @@ export const CMD_RESOLVE_CONVERSATION = 'CMD_RESOLVE_CONVERSATION';
 export const CMD_SNOOZE_CONVERSATION = 'CMD_SNOOZE_CONVERSATION';
 export const CMD_AI_ASSIST = 'CMD_AI_ASSIST';
 
+// Bulk Actions
+export const CMD_BULK_ACTION_SNOOZE_CONVERSATION =
+  'CMD_BULK_ACTION_SNOOZE_CONVERSATION';
+export const CMD_BULK_ACTION_REOPEN_CONVERSATION =
+  'CMD_BULK_ACTION_REOPEN_CONVERSATION';
+export const CMD_BULK_ACTION_RESOLVE_CONVERSATION =
+  'CMD_BULK_ACTION_RESOLVE_CONVERSATION';
+
 // Inbox Commands (Notifications)
 export const CMD_SNOOZE_NOTIFICATION = 'CMD_SNOOZE_NOTIFICATION';
diff --git a/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue b/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue
index 45b807fb3d72a..69405b3e82afe 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue
+++ b/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue
@@ -12,6 +12,7 @@
 <script>
 import 'ninja-keys';
 import conversationHotKeysMixin from './conversationHotKeys';
+import bulkActionsHotKeysMixin from './bulkActionsHotKeys';
 import inboxHotKeysMixin from './inboxHotKeys';
 import goToCommandHotKeys from './goToCommandHotKeys';
 import appearanceHotKeys from './appearanceHotKeys';
@@ -26,6 +27,7 @@ export default {
     adminMixin,
     agentMixin,
     conversationHotKeysMixin,
+    bulkActionsHotKeysMixin,
     inboxHotKeysMixin,
     conversationLabelMixin,
     conversationTeamMixin,
@@ -46,6 +48,7 @@ export default {
       return [
         ...this.inboxHotKeys,
         ...this.conversationHotKeys,
+        ...this.bulkActionsHotKeys,
         ...this.goToCommandHotKeys,
         ...this.goToAppearanceHotKeys,
       ];
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
index c7bc915b50869..01a790194f89f 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="w-1/4 bg-white dark:bg-slate-900 border-slate-50 dark:border-slate-800/50 h-full text-sm overflow-y-auto relative"
+    class="relative w-1/4 h-full overflow-y-auto text-sm bg-white dark:bg-slate-900 border-slate-50 dark:border-slate-800/50"
     :class="showAvatar ? 'border-l border-solid ' : 'border-r border-solid'"
   >
     <contact-info
@@ -40,6 +40,9 @@
                 attribute-class="conversation--attribute"
                 attribute-from="contact_panel"
                 :custom-attributes="contact.custom_attributes"
+                :empty-state-message="
+                  $t('CONTACT_PANEL.SIDEBAR_SECTIONS.NO_RECORDS_FOUND')
+                "
                 class="even"
               />
             </accordion-item>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index 6c00f9901b11f..2ca3f595fe282 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -28,7 +28,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import { VeTable } from 'vue-easytable';
 import { getCountryFlag } from 'dashboard/helper/flag';
 
@@ -45,7 +44,7 @@ export default {
     Spinner,
     VeTable,
   },
-  mixins: [clickaway, timeMixin, rtlMixin],
+  mixins: [timeMixin, rtlMixin],
   props: {
     contacts: {
       type: Array,
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index 41e0dff567195..1a824f5871727 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-full flex flex-row">
+  <div class="flex flex-row w-full">
     <div class="flex flex-col h-full" :class="wrapClass">
       <contacts-header
         :search-query="searchQuery"
@@ -391,8 +391,19 @@ export default {
       this.fetchContacts(this.pageParameter);
     },
     onExportSubmit() {
+      let query = { payload: [] };
+
+      if (this.hasActiveSegments) {
+        query = this.activeSegment.query;
+      } else if (this.hasAppliedFilters) {
+        query = filterQueryGenerator(this.getAppliedContactFilters);
+      }
+
       try {
-        this.$store.dispatch('contacts/export');
+        this.$store.dispatch('contacts/export', {
+          ...query,
+          label: this.label,
+        });
         this.showAlert(this.$t('EXPORT_CONTACTS.SUCCESS_MESSAGE'));
       } catch (error) {
         this.showAlert(
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 1b4fd90e0fd97..e165c68d18537 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -1,12 +1,12 @@
 <template>
   <header
-    class="bg-white dark:bg-slate-900 border-b border-slate-50 dark:border-slate-800"
+    class="bg-white border-b dark:bg-slate-900 border-slate-50 dark:border-slate-800"
   >
-    <div class="flex justify-between w-full py-2 px-4">
+    <div class="flex justify-between w-full px-4 py-2">
       <div class="flex items-center justify-center max-w-full min-w-[6.25rem]">
         <woot-sidemenu-icon />
         <h1
-          class="m-0 text-xl text-slate-900 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis my-0 mx-2"
+          class="m-0 mx-2 my-0 overflow-hidden text-xl text-slate-900 dark:text-slate-100 whitespace-nowrap text-ellipsis"
         >
           {{ headerTitle }}
         </h1>
@@ -18,7 +18,7 @@
           <div class="flex items-center absolute h-full left-2.5">
             <fluent-icon
               icon="search"
-              class="h-5 leading-9 text-sm text-slate-700 dark:text-slate-200"
+              class="h-5 text-sm leading-9 text-slate-700 dark:text-slate-200"
             />
           </div>
           <input
@@ -59,7 +59,7 @@
         <div v-if="!hasActiveSegments" class="relative">
           <div
             v-if="hasAppliedFilters"
-            class="absolute h-2 w-2 top-1 right-3 bg-slate-500 dark:bg-slate-500 rounded-full"
+            class="absolute w-2 h-2 rounded-full top-1 right-3 bg-slate-500 dark:bg-slate-500"
           />
           <woot-button
             class="clear"
@@ -116,7 +116,7 @@
     <woot-confirm-modal
       ref="confirmExportContactsDialog"
       :title="$t('EXPORT_CONTACTS.CONFIRM.TITLE')"
-      :description="$t('EXPORT_CONTACTS.CONFIRM.MESSAGE')"
+      :description="exportDescription"
       :confirm-label="$t('EXPORT_CONTACTS.CONFIRM.YES')"
       :cancel-label="$t('EXPORT_CONTACTS.CONFIRM.NO')"
     />
@@ -162,6 +162,11 @@ export default {
     hasActiveSegments() {
       return this.segmentsId !== 0;
     },
+    exportDescription() {
+      return this.hasAppliedFilters
+        ? this.$t('EXPORT_CONTACTS.CONFIRM.FILTERED_MESSAGE')
+        : this.$t('EXPORT_CONTACTS.CONFIRM.MESSAGE');
+    },
   },
   methods: {
     onToggleSegmentsModal() {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index 81c889b21031a..aa5f5cc12f5cb 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-300 border-slate-50 dark:border-slate-800/50 border-l rtl:border-l-0 rtl:border-r contact--panel overflow-y-auto"
+    class="overflow-y-auto bg-white border-l dark:bg-slate-900 text-slate-900 dark:text-slate-300 border-slate-50 dark:border-slate-800/50 rtl:border-l-0 rtl:border-r contact--panel"
   >
     <contact-info
       :contact="contact"
@@ -89,6 +89,9 @@
                 class="even"
                 attribute-from="conversation_contact_panel"
                 :contact-id="contact.id"
+                :empty-state-message="
+                  $t('CONVERSATION_CUSTOM_ATTRIBUTES.NO_RECORDS_FOUND')
+                "
               />
             </accordion-item>
           </div>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
index 2daf16c3f2683..820295b57ca5a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
@@ -78,7 +78,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import Spinner from 'shared/components/Spinner.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import { mapGetters } from 'vuex';
@@ -92,7 +91,7 @@ export default {
     ThumbnailGroup,
     MultiselectDropdownItems,
   },
-  mixins: [alertMixin, agentMixin, clickaway],
+  mixins: [alertMixin, agentMixin],
   props: {
     conversationId: {
       type: [Number, String],
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
index 9a1883a246ab7..38650bee06a2f 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
@@ -34,7 +34,6 @@
 
 <script>
 import alertMixin from 'shared/mixins/alertMixin';
-import { mixin as clickaway } from 'vue-clickaway';
 import MacroPreview from './MacroPreview.vue';
 import { CONVERSATION_EVENTS } from '../../../../helper/AnalyticsHelper/events';
 
@@ -42,7 +41,7 @@ export default {
   components: {
     MacroPreview,
   },
-  mixins: [alertMixin, clickaway],
+  mixins: [alertMixin],
   props: {
     macro: {
       type: Object,
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 380b4afd3adbd..316352c7a6ab8 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -166,7 +166,6 @@
   </div>
 </template>
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import timeMixin from 'dashboard/mixins/time';
 import ContactInfoRow from './ContactInfoRow.vue';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
@@ -195,7 +194,7 @@ export default {
     NewConversation,
     ContactMergeModal,
   },
-  mixins: [alertMixin, adminMixin, clickaway, timeMixin],
+  mixins: [alertMixin, adminMixin, timeMixin],
   props: {
     contact: {
       type: Object,
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
index cf54e708789bb..20bef48f629fb 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
@@ -7,6 +7,7 @@
       :attribute-type="attribute.attribute_display_type"
       :values="attribute.attribute_values"
       :label="attribute.attribute_display_name"
+      :description="attribute.attribute_description"
       :value="attribute.value"
       :show-actions="true"
       :attribute-regex="attribute.regex_pattern"
@@ -17,6 +18,12 @@
       @delete="onDelete"
       @copy="onCopy"
     />
+    <p
+      v-if="!displayedAttributes.length && emptyStateMessage"
+      class="p-3 text-center"
+    >
+      {{ emptyStateMessage }}
+    </p>
     <!-- Show more and show less buttons show it if the filteredAttributes length is greater than 5 -->
     <div v-if="filteredAttributes.length > 5" class="flex px-2 py-2">
       <woot-button
@@ -59,6 +66,10 @@ export default {
       type: String,
       required: true,
     },
+    emptyStateMessage: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
index 48dbb71ddc5a0..df0d6d7ec9186 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
@@ -48,15 +48,9 @@ import { mapGetters } from 'vuex';
 import Spinner from 'shared/components/Spinner.vue';
 import LabelDropdown from 'shared/components/ui/label/LabelDropdown.vue';
 import AddLabel from 'shared/components/ui/dropdown/AddLabel.vue';
-import { mixin as clickaway } from 'vue-clickaway';
 import adminMixin from 'dashboard/mixins/isAdmin';
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import conversationLabelMixin from 'dashboard/mixins/conversation/labelMixin';
-import {
-  buildHotKeys,
-  isEscape,
-  isActiveElementTypeable,
-} from 'shared/helpers/KeyboardHelpers';
 
 export default {
   components: {
@@ -65,7 +59,7 @@ export default {
     AddLabel,
   },
 
-  mixins: [clickaway, conversationLabelMixin, adminMixin, eventListenerMixins],
+  mixins: [conversationLabelMixin, adminMixin, keyboardEventListenerMixins],
   props: {
     conversationId: {
       type: Number,
@@ -93,16 +87,23 @@ export default {
     closeDropdownLabel() {
       this.showSearchDropdownLabel = false;
     },
-    handleKeyEvents(e) {
-      const keyPattern = buildHotKeys(e);
-
-      if (keyPattern === 'l' && !isActiveElementTypeable(e)) {
-        this.toggleLabels();
-        e.preventDefault();
-      } else if (isEscape(e) && this.showSearchDropdownLabel) {
-        this.closeDropdownLabel();
-        e.preventDefault();
-      }
+    getKeyboardEvents() {
+      return {
+        KeyL: {
+          action: e => {
+            e.preventDefault();
+            this.toggleLabels();
+          },
+        },
+        Escape: {
+          action: () => {
+            if (this.showSearchDropdownLabel) {
+              this.toggleLabels();
+            }
+          },
+          allowOnFocusedInput: true,
+        },
+      };
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
index 2e94c7112db6a..d84158477292e 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
@@ -33,7 +33,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
 import timeMixin from '../../../../mixins/time';
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
@@ -50,7 +49,7 @@ export default {
       },
     },
   },
-  mixins: [timeMixin, messageFormatterMixin, clickaway],
+  mixins: [timeMixin, messageFormatterMixin],
   props: {
     isOnExpandedLayout: {
       type: Boolean,
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
index 3074f5eec9885..6614733165cf8 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
@@ -34,15 +34,11 @@
 </template>
 
 <script>
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
-import {
-  buildHotKeys,
-  isActiveElementTypeable,
-} from 'shared/helpers/KeyboardHelpers';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 
 export default {
   name: 'ChatwootSearch',
-  mixins: [eventListenerMixins],
+  mixins: [keyboardEventListenerMixins],
   props: {
     title: {
       type: String,
@@ -71,13 +67,15 @@ export default {
     onBlur() {
       this.isInputFocused = false;
     },
-    handleKeyEvents(e) {
-      const keyPattern = buildHotKeys(e);
-
-      if (keyPattern === '/' && !isActiveElementTypeable(e)) {
-        e.preventDefault();
-        this.$refs.searchInput.focus();
-      }
+    getKeyboardEvents() {
+      return {
+        Slash: {
+          action: e => {
+            e.preventDefault();
+            this.$refs.searchInput.focus();
+          },
+        },
+      };
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue
index 7de19a9e3c676..b7370939f3e08 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue
@@ -34,11 +34,7 @@
 
 <script>
 import { debounce } from '@chatwoot/utils';
-import { mixin as clickaway } from 'vue-clickaway';
-import {
-  isEscape,
-  isActiveElementTypeable,
-} from 'shared/helpers/KeyboardHelpers';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 
 import SearchHeader from './Header.vue';
 import SearchResults from './SearchResults.vue';
@@ -55,7 +51,7 @@ export default {
     SearchResults,
     ArticleView,
   },
-  mixins: [clickaway, portalMixin, alertMixin],
+  mixins: [portalMixin, alertMixin, keyboardEventListenerMixins],
   props: {
     selectedPortalSlug: {
       type: String,
@@ -97,10 +93,6 @@ export default {
   mounted() {
     this.fetchArticlesByQuery(this.searchQuery);
     this.debounceSearch = debounce(this.fetchArticlesByQuery, 500, false);
-    document.body.addEventListener('keydown', this.closeOnEsc);
-  },
-  beforeDestroy() {
-    document.body.removeEventListener('keydown', this.closeOnEsc);
   },
   methods: {
     generateArticleUrl(article) {
@@ -158,11 +150,15 @@ export default {
       );
       this.onClose();
     },
-    closeOnEsc(e) {
-      if (isEscape(e) && !isActiveElementTypeable(e)) {
-        e.preventDefault();
-        this.onClose();
-      }
+    getKeyboardEvents() {
+      return {
+        Escape: {
+          action: () => {
+            this.onClose();
+          },
+          allowOnFocusedInput: true,
+        },
+      };
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
index 4235d9d9f6b51..d946b1b1187ec 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
@@ -138,8 +138,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
-
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
 import MultiselectDropdownItems from 'shared/components/ui/MultiselectDropdownItems.vue';
@@ -152,7 +150,6 @@ export default {
     WootDropdownMenu,
     MultiselectDropdownItems,
   },
-  mixins: [clickaway],
   props: {
     headerTitle: {
       type: String,
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
index b22d9b562e3c4..67b9ccc6142bb 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
@@ -109,14 +109,13 @@
 
 <script>
 import alertMixin from 'shared/mixins/alertMixin';
-import { mixin as clickaway } from 'vue-clickaway';
 import wootConstants from 'dashboard/constants/globals';
 import { PORTALS_EVENTS } from '../../../../../helper/AnalyticsHelper/events';
 
 const { ARTICLE_STATUS_TYPES } = wootConstants;
 
 export default {
-  mixins: [alertMixin, clickaway],
+  mixins: [alertMixin],
   props: {
     isSidebarOpen: {
       type: Boolean,
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Layout/SettingsLayout.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Layout/SettingsLayout.vue
new file mode 100644
index 0000000000000..bc3c51a39f380
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Layout/SettingsLayout.vue
@@ -0,0 +1,34 @@
+<script setup>
+defineProps({
+  title: {
+    type: String,
+    default: null,
+  },
+});
+</script>
+
+<template>
+  <div
+    class="flex-grow-0 flex-shrink-0 w-full h-full max-w-full bg-white border border-transparent border-solid dark:bg-slate-900 dark:border-transparent md:max-w-2xl"
+  >
+    <h3
+      v-if="$slots.title || title"
+      class="text-lg text-black-900 dark:text-slate-200"
+    >
+      <slot name="title">{{ title }}</slot>
+    </h3>
+    <div
+      class="mx-0 my-4 border-b border-solid border-slate-25 dark:border-slate-800"
+    >
+      <slot />
+    </div>
+    <div class="flex justify-between">
+      <div>
+        <slot name="footer-left" />
+      </div>
+      <div>
+        <slot name="footer-right" />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue
index 47a1c59b5e54a..3de2a6f52bc93 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalPopover.vue
@@ -47,13 +47,11 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import PortalSwitch from './PortalSwitch.vue';
 export default {
   components: {
     PortalSwitch,
   },
-  mixins: [clickaway],
   props: {
     portals: {
       type: Array,
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
index 85c035a2a7a2a..4417fdf57cb87 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
@@ -1,256 +1,241 @@
-<template>
-  <div
-    class="pt-3 bg-white dark:bg-slate-900 h-full border border-solid border-transparent px-6 pb-6 dark:border-transparent w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
-  >
-    <div class="w-full">
-      <h3 class="text-lg text-black-900 dark:text-slate-200">
-        {{
-          $t(
-            'HELP_CENTER.PORTAL.ADD.CREATE_FLOW_PAGE.BASIC_SETTINGS_PAGE.TITLE'
-          )
-        }}
-      </h3>
-    </div>
-    <div
-      class="my-4 mx-0 border-b border-solid border-slate-25 dark:border-slate-800"
-    >
-      <div class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%]">
-        <div class="mb-4">
-          <div class="flex items-center flex-row">
-            <woot-avatar-uploader
-              ref="imageUpload"
-              :label="$t('HELP_CENTER.PORTAL.ADD.LOGO.LABEL')"
-              :src="logoUrl"
-              @change="onFileChange"
-            />
-            <div v-if="showDeleteButton" class="avatar-delete-btn">
-              <woot-button
-                type="button"
-                color-scheme="alert"
-                variant="hollow"
-                size="small"
-                @click="deleteAvatar"
-              >
-                {{ $t('PROFILE_SETTINGS.DELETE_AVATAR') }}
-              </woot-button>
-            </div>
-          </div>
-          <p
-            class="mt-1 mb-0 text-xs text-slate-600 dark:text-slate-400 not-italic"
-          >
-            {{ $t('HELP_CENTER.PORTAL.ADD.LOGO.HELP_TEXT') }}
-          </p>
-        </div>
-        <div class="mb-4">
-          <woot-input
-            v-model.trim="name"
-            :class="{ error: $v.name.$error }"
-            :error="nameError"
-            :label="$t('HELP_CENTER.PORTAL.ADD.NAME.LABEL')"
-            :placeholder="$t('HELP_CENTER.PORTAL.ADD.NAME.PLACEHOLDER')"
-            :help-text="$t('HELP_CENTER.PORTAL.ADD.NAME.HELP_TEXT')"
-            @blur="$v.name.$touch"
-            @input="onNameChange"
-          />
-        </div>
-        <div class="mb-4">
-          <woot-input
-            v-model.trim="slug"
-            :class="{ error: $v.slug.$error }"
-            :error="slugError"
-            :label="$t('HELP_CENTER.PORTAL.ADD.SLUG.LABEL')"
-            :placeholder="$t('HELP_CENTER.PORTAL.ADD.SLUG.PLACEHOLDER')"
-            :help-text="domainHelpText"
-            @blur="$v.slug.$touch"
-          />
-        </div>
-        <div class="mb-4">
-          <woot-input
-            v-model.trim="domain"
-            :class="{ error: $v.domain.$error }"
-            :label="$t('HELP_CENTER.PORTAL.ADD.DOMAIN.LABEL')"
-            :placeholder="$t('HELP_CENTER.PORTAL.ADD.DOMAIN.PLACEHOLDER')"
-            :help-text="domainExampleHelpText"
-            :error="domainError"
-            @blur="$v.domain.$touch"
-          />
-        </div>
-      </div>
-    </div>
-    <div class="flex justify-end">
-      <woot-button
-        :is-loading="isSubmitting"
-        :is-disabled="$v.$invalid"
-        @click="onSubmitClick"
-      >
-        {{ submitButtonText }}
-      </woot-button>
-    </div>
-  </div>
-</template>
+<script setup>
+import { useVuelidate } from '@vuelidate/core';
+import { required, minLength } from '@vuelidate/validators';
 
-<script>
-import { required, minLength } from 'vuelidate/lib/validators';
-import { isDomain } from 'shared/helpers/Validators';
+import { defineComponent, reactive, computed, onMounted } from 'vue';
+import { useI18n } from 'dashboard/composables/useI18n';
+import { useAlert } from 'dashboard/composables';
 
-import alertMixin from 'shared/mixins/alertMixin';
 import { convertToCategorySlug } from 'dashboard/helper/commons.js';
 import { buildPortalURL } from 'dashboard/helper/portalHelper';
 import wootConstants from 'dashboard/constants/globals';
 import { hasValidAvatarUrl } from 'dashboard/helper/URLHelper';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { uploadFile } from 'dashboard/helper/uploadHelper';
+import { isDomain } from 'shared/helpers/Validators';
+import SettingsLayout from './Layout/SettingsLayout.vue';
 
 const { EXAMPLE_URL } = wootConstants;
 const MAXIMUM_FILE_UPLOAD_SIZE = 4; // in MB
 
-export default {
-  mixins: [alertMixin],
-  props: {
-    portal: {
-      type: Object,
-      default: () => {},
-    },
-    isSubmitting: {
-      type: Boolean,
-      default: false,
-    },
-    submitButtonText: {
-      type: String,
-      default: '',
-    },
-  },
-  data() {
-    return {
-      name: '',
-      slug: '',
-      domain: '',
-      alertMessage: '',
+const { t } = useI18n();
 
-      // Logouploader keys
-      avatarBlobId: '',
-      logoUrl: '',
-    };
-  },
-  validations: {
-    name: {
-      required,
-      minLength: minLength(2),
-    },
-    slug: {
-      required,
-    },
-    domain: {
-      isDomain,
-    },
+defineComponent({
+  name: 'PortalSettingsBasicForm',
+});
+
+const props = defineProps({
+  portal: {
+    type: Object,
+    default: () => {},
   },
-  computed: {
-    nameError() {
-      if (this.$v.name.$error) {
-        return this.$t('HELP_CENTER.CATEGORY.ADD.NAME.ERROR');
-      }
-      return '';
-    },
-    slugError() {
-      if (this.$v.slug.$error) {
-        return this.$t('HELP_CENTER.CATEGORY.ADD.SLUG.ERROR');
-      }
-      return '';
-    },
-    domainError() {
-      if (this.$v.domain.$error) {
-        return this.$t('HELP_CENTER.PORTAL.ADD.DOMAIN.ERROR');
-      }
-      return '';
-    },
-    domainHelpText() {
-      return buildPortalURL(this.slug);
-    },
-    domainExampleHelpText() {
-      return this.$t('HELP_CENTER.PORTAL.ADD.DOMAIN.HELP_TEXT', {
-        exampleURL: EXAMPLE_URL,
-      });
-    },
-    showDeleteButton() {
-      return hasValidAvatarUrl(this.logoUrl);
-    },
+  isSubmitting: {
+    type: Boolean,
+    default: false,
   },
-  mounted() {
-    const portal = this.portal || {};
-    this.name = portal.name || '';
-    this.slug = portal.slug || '';
-    this.domain = portal.custom_domain || '';
-    this.alertMessage = '';
-    if (portal.logo) {
-      const {
-        logo: { file_url: logoURL, blob_id: blobId },
-      } = portal;
-      this.logoUrl = logoURL;
-      this.avatarBlobId = blobId;
-    }
+  submitButtonText: {
+    type: String,
+    default: '',
   },
-  methods: {
-    onNameChange() {
-      this.slug = convertToCategorySlug(this.name);
-    },
-    onSubmitClick() {
-      this.$v.$touch();
-      if (this.$v.$invalid) {
-        return;
-      }
+});
 
-      const portal = {
-        name: this.name,
-        slug: this.slug,
-        custom_domain: this.domain,
-        blob_id: this.avatarBlobId || null,
-      };
-      this.$emit('submit', portal);
-    },
-    async deleteAvatar() {
-      this.logoUrl = '';
-      this.avatarBlobId = '';
-      this.$emit('delete-logo');
-    },
-    onFileChange({ file }) {
-      if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
-        this.uploadLogoToStorage(file);
-      } else {
-        this.showAlert(
-          this.$t(
-            'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.IMAGE_UPLOAD_SIZE_ERROR',
-            {
-              size: MAXIMUM_FILE_UPLOAD_SIZE,
-            }
-          )
-        );
-      }
+const state = reactive({
+  name: '',
+  slug: '',
+  domain: '',
+  logoUrl: '',
+  avatarBlobId: '',
+});
 
-      this.$refs.imageUpload.value = '';
-    },
-    async uploadLogoToStorage(file) {
-      try {
-        const { fileUrl, blobId } = await uploadFile(file);
-        if (fileUrl) {
-          this.logoUrl = fileUrl;
-          this.avatarBlobId = blobId;
-        }
-      } catch (error) {
-        this.showAlert(
-          this.$t('HELP_CENTER.PORTAL.ADD.LOGO.IMAGE_DELETE_ERROR')
-        );
-      }
-    },
+const rules = {
+  name: {
+    required,
+    minLength: minLength(2),
+  },
+  slug: {
+    required,
+  },
+  domain: {
+    isDomain,
   },
 };
-</script>
-<style lang="scss" scoped>
-::v-deep {
-  input {
-    @apply mb-1;
+
+const v$ = useVuelidate(rules, state);
+
+const nameError = computed(() => {
+  if (v$.value.name.$error) {
+    return t('HELP_CENTER.CATEGORY.ADD.NAME.ERROR');
+  }
+  return '';
+});
+
+const slugError = computed(() => {
+  if (v$.value.slug.$error) {
+    return t('HELP_CENTER.CATEGORY.ADD.SLUG.ERROR');
+  }
+  return '';
+});
+
+const domainError = computed(() => {
+  if (v$.value.domain.$error) {
+    return t('HELP_CENTER.PORTAL.ADD.DOMAIN.ERROR');
+  }
+  return '';
+});
+
+const domainHelpText = computed(() => {
+  return buildPortalURL(state.slug);
+});
+
+const domainExampleHelpText = computed(() => {
+  return t('HELP_CENTER.PORTAL.ADD.DOMAIN.HELP_TEXT', {
+    exampleURL: EXAMPLE_URL,
+  });
+});
+
+const showDeleteButton = computed(() => {
+  return hasValidAvatarUrl(state.logoUrl);
+});
+
+const emit = defineEmits(['submit', 'delete-logo']);
+
+onMounted(() => {
+  const portal = props.portal || {};
+  state.name = portal.name || '';
+  state.slug = portal.slug || '';
+  state.domain = portal.custom_domain || '';
+
+  if (portal.logo) {
+    const {
+      logo: { file_url: logoURL, blob_id: blobId },
+    } = portal;
+    state.logoUrl = logoURL;
+    state.avatarBlobId = blobId;
   }
-  .help-text {
-    @apply mb-0;
+});
+
+function onNameChange() {
+  state.slug = convertToCategorySlug(state.name);
+}
+
+function onSubmitClick() {
+  v$.value.$touch();
+  if (v$.value.$invalid) {
+    return;
   }
+
+  const portal = {
+    name: state.name,
+    slug: state.slug,
+    custom_domain: state.domain,
+    blob_id: state.avatarBlobId || null,
+  };
+  emit('submit', portal);
 }
-</style>
+async function deleteAvatar() {
+  state.logoUrl = '';
+  state.avatarBlobId = '';
+  emit('delete-logo');
+}
+
+async function uploadLogoToStorage(file) {
+  try {
+    const { fileUrl, blobId } = await uploadFile(file);
+    if (fileUrl) {
+      state.logoUrl = fileUrl;
+      state.avatarBlobId = blobId;
+    }
+  } catch (error) {
+    useAlert(t('HELP_CENTER.PORTAL.ADD.LOGO.IMAGE_UPLOAD_ERROR'));
+  }
+}
+
+function onFileChange({ file }) {
+  if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
+    uploadLogoToStorage(file);
+  } else {
+    const errorKey =
+      'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.IMAGE_UPLOAD_SIZE_ERROR';
+    useAlert(t(errorKey, { size: MAXIMUM_FILE_UPLOAD_SIZE }));
+  }
+}
+</script>
+
+<template>
+  <SettingsLayout
+    :title="
+      $t('HELP_CENTER.PORTAL.ADD.CREATE_FLOW_PAGE.BASIC_SETTINGS_PAGE.TITLE')
+    "
+  >
+    <div>
+      <div class="mb-4">
+        <div class="flex flex-row items-center">
+          <woot-avatar-uploader
+            :label="$t('HELP_CENTER.PORTAL.ADD.LOGO.LABEL')"
+            :src="state.logoUrl"
+            @change="onFileChange"
+          />
+          <div v-if="showDeleteButton" class="avatar-delete-btn">
+            <woot-button
+              type="button"
+              color-scheme="alert"
+              variant="hollow"
+              size="small"
+              @click="deleteAvatar"
+            >
+              {{ $t('PROFILE_SETTINGS.DELETE_AVATAR') }}
+            </woot-button>
+          </div>
+        </div>
+        <p
+          class="mt-1 mb-0 text-xs not-italic text-slate-600 dark:text-slate-400"
+        >
+          {{ $t('HELP_CENTER.PORTAL.ADD.LOGO.HELP_TEXT') }}
+        </p>
+      </div>
+      <div class="mb-4">
+        <woot-input
+          v-model="state.name"
+          :class="{ error: v$.name.$error }"
+          :error="nameError"
+          :label="$t('HELP_CENTER.PORTAL.ADD.NAME.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.NAME.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.NAME.HELP_TEXT')"
+          @blur="v$.name.$touch"
+          @input="onNameChange"
+        />
+      </div>
+      <div class="mb-4">
+        <woot-input
+          v-model="state.slug"
+          :class="{ error: v$.slug.$error }"
+          :error="slugError"
+          :label="$t('HELP_CENTER.PORTAL.ADD.SLUG.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.SLUG.PLACEHOLDER')"
+          :help-text="domainHelpText"
+          @blur="v$.slug.$touch"
+        />
+      </div>
+      <div class="mb-4">
+        <woot-input
+          v-model="state.domain"
+          :class="{ error: v$.domain.$error }"
+          :label="$t('HELP_CENTER.PORTAL.ADD.DOMAIN.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.DOMAIN.PLACEHOLDER')"
+          :help-text="domainExampleHelpText"
+          :error="domainError"
+          @blur="v$.domain.$touch"
+        />
+      </div>
+    </div>
+    <template #footer-right>
+      <woot-button
+        :is-loading="isSubmitting"
+        :is-disabled="v$.$invalid"
+        @click="onSubmitClick"
+      >
+        {{ submitButtonText }}
+      </woot-button>
+    </template>
+  </SettingsLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue
index c00ab9bebdc28..7572f5b802c55 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue
@@ -1,68 +1,140 @@
+<script setup>
+import { getRandomColor } from 'dashboard/helper/labelColor';
+import SettingsLayout from './Layout/SettingsLayout.vue';
+import wootConstants from 'dashboard/constants/globals';
+const { EXAMPLE_URL } = wootConstants;
+
+import { useVuelidate } from '@vuelidate/core';
+import { url } from '@vuelidate/validators';
+
+import { defineComponent, reactive, computed, onMounted } from 'vue';
+import { useI18n } from 'dashboard/composables/useI18n';
+
+defineComponent({
+  name: 'PortalSettingsCustomizationForm',
+});
+
+const { t } = useI18n();
+
+const props = defineProps({
+  portal: {
+    type: Object,
+    default: () => ({}),
+  },
+  isSubmitting: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['submit']);
+
+const state = reactive({
+  color: getRandomColor(),
+  pageTitle: '',
+  headerText: '',
+  homePageLink: '',
+});
+
+const rules = {
+  homePageLink: { url },
+};
+
+const homepageExampleHelpText = computed(() => {
+  return t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.HELP_TEXT', {
+    exampleURL: EXAMPLE_URL,
+  });
+});
+
+const v$ = useVuelidate(rules, state);
+
+function updateDataFromStore() {
+  const { portal } = props;
+  if (portal) {
+    state.color = portal.color || getRandomColor();
+    state.pageTitle = portal.page_title || '';
+    state.headerText = portal.header_text || '';
+    state.homePageLink = portal.homepage_link || '';
+  }
+}
+
+function onSubmitClick() {
+  v$.value.$touch();
+  if (v$.value.$invalid) {
+    return;
+  }
+
+  const portal = {
+    id: props.portal.id,
+    slug: props.portal.slug,
+    color: state.color,
+    page_title: state.pageTitle,
+    header_text: state.headerText,
+    homepage_link: state.homePageLink,
+  };
+
+  emit('submit', portal);
+}
+
+onMounted(() => {
+  updateDataFromStore();
+});
+</script>
+
 <template>
-  <div
-    class="pt-3 bg-white dark:bg-slate-900 h-full border border-solid border-transparent px-6 pb-6 dark:border-transparent w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  <SettingsLayout
+    :title="
+      $t('HELP_CENTER.PORTAL.ADD.CREATE_FLOW_PAGE.CUSTOMIZATION_PAGE.TITLE')
+    "
   >
-    <div class="w-full">
-      <h3 class="text-lg text-black-900 dark:text-slate-200">
-        {{
-          $t('HELP_CENTER.PORTAL.ADD.CREATE_FLOW_PAGE.CUSTOMIZATION_PAGE.TITLE')
-        }}
-      </h3>
-    </div>
-    <div
-      class="my-4 mx-0 border-b border-solid border-slate-25 dark:border-slate-800"
-    >
-      <div class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%]">
-        <div class="mb-4">
-          <label>
-            {{ $t('HELP_CENTER.PORTAL.ADD.THEME_COLOR.LABEL') }}
-          </label>
-          <woot-color-picker v-model="color" />
-          <p
-            class="mt-1 mb-0 text-xs text-slate-600 dark:text-slate-400 not-italic"
-          >
-            {{ $t('HELP_CENTER.PORTAL.ADD.THEME_COLOR.HELP_TEXT') }}
-          </p>
-        </div>
-        <div class="mb-4">
-          <woot-input
-            v-model.trim="pageTitle"
-            :label="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.LABEL')"
-            :placeholder="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.PLACEHOLDER')"
-            :help-text="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.HELP_TEXT')"
-          />
-        </div>
-        <div class="mb-4">
-          <woot-input
-            v-model.trim="headerText"
-            :label="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.LABEL')"
-            :placeholder="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.PLACEHOLDER')"
-            :help-text="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.HELP_TEXT')"
-          />
-        </div>
-        <div class="mb-4">
-          <woot-input
-            v-model.trim="homePageLink"
-            :label="$t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.LABEL')"
-            :placeholder="
-              $t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.PLACEHOLDER')
-            "
-            :help-text="homepageExampleHelpText"
-            :error="
-              $v.homePageLink.$error
-                ? $t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.ERROR')
-                : ''
-            "
-            :class="{ error: $v.homePageLink.$error }"
-            @blur="$v.homePageLink.$touch"
-          />
-        </div>
+    <div class="flex-grow-0 flex-shrink-0">
+      <div class="mb-4">
+        <label>
+          {{ $t('HELP_CENTER.PORTAL.ADD.THEME_COLOR.LABEL') }}
+        </label>
+        <woot-color-picker v-model="state.color" />
+        <p
+          class="mt-1 mb-0 text-xs not-italic text-slate-600 dark:text-slate-400"
+        >
+          {{ $t('HELP_CENTER.PORTAL.ADD.THEME_COLOR.HELP_TEXT') }}
+        </p>
+      </div>
+      <div class="mb-4">
+        <woot-input
+          v-model="state.pageTitle"
+          :label="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.PAGE_TITLE.HELP_TEXT')"
+        />
+      </div>
+      <div class="mb-4">
+        <woot-input
+          v-model="state.headerText"
+          :label="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.PLACEHOLDER')"
+          :help-text="$t('HELP_CENTER.PORTAL.ADD.HEADER_TEXT.HELP_TEXT')"
+        />
+      </div>
+      <div class="mb-4">
+        <woot-input
+          v-model="state.homePageLink"
+          :label="$t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.LABEL')"
+          :placeholder="$t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.PLACEHOLDER')"
+          :help-text="homepageExampleHelpText"
+          :error="
+            v$.homePageLink.$error
+              ? $t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.ERROR')
+              : ''
+          "
+          :class="{ error: v$.homePageLink.$error }"
+          @blur="v$.homePageLink.$touch"
+        />
       </div>
     </div>
-    <div class="flex justify-end">
+    <template #footer-right>
       <woot-button
         :is-loading="isSubmitting"
-        :is-disabled="$v.$invalid"
+        :is-disabled="v$.$invalid"
         @click="onSubmitClick"
       >
         {{
@@ -71,94 +143,12 @@
           )
         }}
       </woot-button>
-    </div>
-  </div>
+    </template>
+  </SettingsLayout>
 </template>
 
-<script>
-import { url } from 'vuelidate/lib/validators';
-import { getRandomColor } from 'dashboard/helper/labelColor';
-
-import alertMixin from 'shared/mixins/alertMixin';
-import wootConstants from 'dashboard/constants/globals';
-
-const { EXAMPLE_URL } = wootConstants;
-
-export default {
-  components: {},
-  mixins: [alertMixin],
-  props: {
-    portal: {
-      type: Object,
-      default: () => ({}),
-    },
-    isSubmitting: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      color: '#000',
-      pageTitle: '',
-      headerText: '',
-      homePageLink: '',
-      alertMessage: '',
-    };
-  },
-  validations: {
-    homePageLink: {
-      url,
-    },
-  },
-  computed: {
-    homepageExampleHelpText() {
-      return this.$t('HELP_CENTER.PORTAL.ADD.HOME_PAGE_LINK.HELP_TEXT', {
-        exampleURL: EXAMPLE_URL,
-      });
-    },
-  },
-  mounted() {
-    this.color = getRandomColor();
-    this.updateDataFromStore();
-  },
-  methods: {
-    updateDataFromStore() {
-      const { portal } = this;
-      if (portal) {
-        this.color = portal.color || getRandomColor();
-        this.pageTitle = portal.page_title || '';
-        this.headerText = portal.header_text || '';
-        this.homePageLink = portal.homepage_link || '';
-        this.alertMessage = '';
-      }
-    },
-    onSubmitClick() {
-      this.$v.$touch();
-      if (this.$v.$invalid) {
-        return;
-      }
-      const portal = {
-        id: this.portal.id,
-        slug: this.portal.slug,
-        color: this.color,
-        page_title: this.pageTitle,
-        header_text: this.headerText,
-        homepage_link: this.homePageLink,
-      };
-      this.$emit('submit', portal);
-    },
-  },
-};
-</script>
 <style lang="scss" scoped>
 ::v-deep {
-  input {
-    @apply mb-1;
-  }
-  .help-text {
-    @apply mb-0;
-  }
   .colorpicker--selected {
     @apply mb-0;
   }
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/ListAllCategories.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/ListAllCategories.vue
index b8f016a75d1a1..2152fc1470a5b 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/ListAllCategories.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/ListAllCategories.vue
@@ -1,15 +1,115 @@
+<script setup>
+import { useRoute } from 'dashboard/composables/route';
+import { useStoreGetters, useStore } from 'dashboard/composables/store';
+import { useI18n } from 'dashboard/composables/useI18n';
+import { useAlert, useTrack } from 'dashboard/composables';
+import { PORTALS_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+
+import { defineComponent, ref, computed } from 'vue';
+
+import CategoryListItem from './CategoryListItem.vue';
+import AddCategory from './AddCategory.vue';
+import EditCategory from './EditCategory.vue';
+
+defineComponent({
+  name: 'ListAllCategories',
+});
+
+const selectedCategory = ref({});
+const currentLocaleCode = ref('en');
+const showEditCategoryModal = ref(false);
+const showAddCategoryModal = ref(false);
+
+const getters = useStoreGetters();
+const store = useStore();
+const route = useRoute();
+const track = useTrack();
+const { t } = useI18n();
+const currentPortalSlug = computed(() => {
+  return route.params.portalSlug;
+});
+
+const categoriesByLocaleCode = computed(() => {
+  return getters['categories/categoriesByLocaleCode'].value(
+    currentLocaleCode.value
+  );
+});
+
+const currentPortal = computed(() => {
+  const slug = currentPortalSlug.value;
+  if (slug) return getters['portals/portalBySlug'].value(slug);
+
+  return getters['portals/allPortals'].value[0];
+});
+const currentPortalName = computed(() => {
+  return currentPortal.value ? currentPortal.value.name : '';
+});
+const allLocales = computed(() => {
+  return currentPortal.value ? currentPortal.value.config.allowed_locales : [];
+});
+
+const allowedLocaleCodes = computed(() => {
+  return allLocales.value.map(locale => locale.code);
+});
+
+function openAddCategoryModal() {
+  showAddCategoryModal.value = true;
+}
+function openEditCategoryModal(category) {
+  selectedCategory.value = category;
+  showEditCategoryModal.value = true;
+}
+function closeAddCategoryModal() {
+  showAddCategoryModal.value = false;
+}
+function closeEditCategoryModal() {
+  showEditCategoryModal.value = false;
+}
+async function fetchCategoriesByPortalSlugAndLocale(localeCode) {
+  await store.dispatch('categories/index', {
+    portalSlug: currentPortalSlug.value,
+    locale: localeCode,
+  });
+}
+
+async function deleteCategory(category) {
+  let alertMessage = '';
+  try {
+    await store.dispatch('categories/delete', {
+      portalSlug: currentPortalSlug.value,
+      categoryId: category.id,
+    });
+    alertMessage = t('HELP_CENTER.CATEGORY.DELETE.API.SUCCESS_MESSAGE');
+    track(PORTALS_EVENTS.DELETE_CATEGORY, {
+      hasArticles: category?.meta?.articles_count !== 0,
+    });
+  } catch (error) {
+    const errorMessage = error?.message;
+    alertMessage =
+      errorMessage || t('HELP_CENTER.CATEGORY.DELETE.API.ERROR_MESSAGE');
+  } finally {
+    useAlert(alertMessage);
+  }
+}
+function changeCurrentCategory(event) {
+  const localeCode = event.target.value;
+  currentLocaleCode.value = localeCode;
+  fetchCategoriesByPortalSlugAndLocale(localeCode);
+}
+</script>
+
 <template>
-  <div class="w-full pl-4">
-    <header class="flex justify-between items-center mb-4">
+  <div class="w-full max-w-6xl">
+    <header class="flex items-center justify-between mb-4">
       <div class="flex items-center w-full gap-3">
         <label
-          class="font-normal mb-0 text-base text-slate-800 dark:text-slate-100"
+          class="mb-0 text-base font-normal text-slate-800 dark:text-slate-100"
         >
           {{ $t('HELP_CENTER.PORTAL.EDIT.CATEGORIES.TITLE') }}
         </label>
         <select
           :value="currentLocaleCode"
-          class="w-[15%] select-locale"
+          class="w-[15%] h-8 mb-0 py-0.5"
           @change="changeCurrentCategory"
         >
           <option
@@ -21,7 +121,7 @@
           </option>
         </select>
       </div>
-      <div class="flex-none items-center">
+      <div class="items-center flex-none">
         <woot-button
           size="small"
           variant="smooth"
@@ -58,119 +158,3 @@
     />
   </div>
 </template>
-<script>
-import { mapGetters } from 'vuex';
-import alertMixin from 'shared/mixins/alertMixin';
-import portalMixin from '../../mixins/portalMixin';
-
-import CategoryListItem from './CategoryListItem.vue';
-import AddCategory from './AddCategory.vue';
-import EditCategory from './EditCategory.vue';
-import { PORTALS_EVENTS } from '../../../../../helper/AnalyticsHelper/events';
-
-export default {
-  components: {
-    CategoryListItem,
-    AddCategory,
-    EditCategory,
-  },
-  mixins: [alertMixin, portalMixin],
-  data() {
-    return {
-      selectedCategory: {},
-      selectedLocaleCode: '',
-      currentLocaleCode: 'en',
-      showEditCategoryModal: false,
-      showAddCategoryModal: false,
-      alertMessage: '',
-    };
-  },
-  computed: {
-    ...mapGetters({
-      portals: 'portals/allPortals',
-      meta: 'portals/getMeta',
-      isFetching: 'portals/isFetchingPortals',
-    }),
-    currentPortalSlug() {
-      return this.$route.params.portalSlug;
-    },
-    categoriesByLocaleCode() {
-      return this.$store.getters['categories/categoriesByLocaleCode'](
-        this.currentLocaleCode
-      );
-    },
-    currentPortal() {
-      const slug = this.currentPortalSlug;
-      if (slug) return this.$store.getters['portals/portalBySlug'](slug);
-
-      return this.$store.getters['portals/allPortals'][0];
-    },
-    currentPortalName() {
-      return this.currentPortal ? this.currentPortal.name : '';
-    },
-    currentPortalLocale() {
-      return this.currentPortal ? this.currentPortal?.meta?.default_locale : '';
-    },
-    allLocales() {
-      return this.currentPortal
-        ? this.currentPortal.config.allowed_locales
-        : [];
-    },
-    allowedLocaleCodes() {
-      return this.allLocales.map(locale => locale.code);
-    },
-  },
-  methods: {
-    openAddCategoryModal() {
-      this.showAddCategoryModal = true;
-    },
-    openEditCategoryModal(category) {
-      this.selectedCategory = category;
-      this.showEditCategoryModal = true;
-    },
-    closeAddCategoryModal() {
-      this.showAddCategoryModal = false;
-    },
-    closeEditCategoryModal() {
-      this.showEditCategoryModal = false;
-    },
-    async fetchCategoriesByPortalSlugAndLocale(localeCode) {
-      await this.$store.dispatch('categories/index', {
-        portalSlug: this.currentPortalSlug,
-        locale: localeCode,
-      });
-    },
-    async deleteCategory(category) {
-      try {
-        await this.$store.dispatch('categories/delete', {
-          portalSlug: this.currentPortalSlug,
-          categoryId: category.id,
-        });
-        this.alertMessage = this.$t(
-          'HELP_CENTER.CATEGORY.DELETE.API.SUCCESS_MESSAGE'
-        );
-        this.$track(PORTALS_EVENTS.DELETE_CATEGORY, {
-          hasArticles: category?.meta?.articles_count !== 0,
-        });
-      } catch (error) {
-        const errorMessage = error?.message;
-        this.alertMessage =
-          errorMessage ||
-          this.$t('HELP_CENTER.CATEGORY.DELETE.API.ERROR_MESSAGE');
-      } finally {
-        this.showAlert(this.alertMessage);
-      }
-    },
-    changeCurrentCategory(event) {
-      const localeCode = event.target.value;
-      this.currentLocaleCode = localeCode;
-      this.fetchCategoriesByPortalSlugAndLocale(localeCode);
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.select-locale {
-  @apply h-8 mb-0 py-0.5;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
index 5d6862758b3d9..b888a5440eef1 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
@@ -36,13 +36,10 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
-
 const EmojiInput = () => import('shared/components/emoji/EmojiInput');
 
 export default {
   components: { EmojiInput },
-  mixins: [clickaway],
   props: {
     label: {
       type: String,
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortal.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortal.vue
index 53a8bdf4081af..cbbb4cb15ccfe 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortal.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortal.vue
@@ -24,7 +24,7 @@
           />
         </woot-tabs>
       </setting-intro-banner>
-      <div class="p-4 max-w-full my-auto flex flex-wrap">
+      <div class="flex flex-wrap max-w-full px-8 py-4 my-auto">
         <router-view />
       </div>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalBasic.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalBasic.vue
index 8e3579f025676..aac8125e56075 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalBasic.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalBasic.vue
@@ -1,3 +1,75 @@
+<script setup>
+import PortalSettingsBasicForm from 'dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue';
+
+import { useAlert } from 'dashboard/composables';
+import { useStoreGetters, useStore } from 'dashboard/composables/store';
+import { useRoute, useRouter } from 'dashboard/composables/route';
+import { useI18n } from 'dashboard/composables/useI18n';
+import { defineComponent, computed, ref, onMounted } from 'vue';
+
+defineComponent({ name: 'EditPortalBasic' });
+
+const getters = useStoreGetters();
+const route = useRoute();
+const router = useRouter();
+const store = useStore();
+const { t } = useI18n();
+
+const uiFlags = getters['portals/uiFlagsIn'];
+
+const lastPortalSlug = ref(null);
+
+const currentPortalSlug = computed(() => {
+  return route.params.portalSlug;
+});
+
+const currentPortal = computed(() => {
+  const slug = route.params.portalSlug;
+  return getters['portals/portalBySlug'].value(slug);
+});
+
+onMounted(() => {
+  lastPortalSlug.value = currentPortalSlug.value;
+});
+
+async function updatePortalSettings(portalObj) {
+  let alertMessage = '';
+
+  try {
+    const portalSlug = lastPortalSlug.value;
+    await store.dispatch('portals/update', { ...portalObj, portalSlug });
+
+    alertMessage = t('HELP_CENTER.PORTAL.ADD.API.SUCCESS_MESSAGE_FOR_UPDATE');
+
+    if (lastPortalSlug.value !== portalObj.slug) {
+      await store.dispatch('portals/index');
+      router.replace({
+        name: route.name,
+        params: { portalSlug: portalObj.slug },
+      });
+    }
+  } catch (error) {
+    alertMessage =
+      error?.message ||
+      t('HELP_CENTER.PORTAL.ADD.API.ERROR_MESSAGE_FOR_UPDATE');
+  } finally {
+    useAlert(alertMessage);
+  }
+}
+async function deleteLogo() {
+  try {
+    const portalSlug = lastPortalSlug.value;
+    await store.dispatch('portals/deleteLogo', {
+      portalSlug,
+    });
+  } catch (error) {
+    useAlert(
+      error?.message || t('HELP_CENTER.PORTAL.ADD.LOGO.IMAGE_DELETE_ERROR')
+    );
+  }
+}
+</script>
+
 <template>
   <portal-settings-basic-form
     v-if="currentPortal"
@@ -10,80 +82,3 @@
     @delete-logo="deleteLogo"
   />
 </template>
-
-<script>
-import { mapGetters } from 'vuex';
-import alertMixin from 'shared/mixins/alertMixin';
-
-import PortalSettingsBasicForm from 'dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue';
-
-export default {
-  components: {
-    PortalSettingsBasicForm,
-  },
-  mixins: [alertMixin],
-  data() {
-    return {
-      lastPortalSlug: undefined,
-      alertMessage: '',
-    };
-  },
-  computed: {
-    ...mapGetters({
-      uiFlags: 'portals/uiFlagsIn',
-    }),
-    currentPortalSlug() {
-      return this.$route.params.portalSlug;
-    },
-    currentPortal() {
-      return this.$store.getters['portals/portalBySlug'](
-        this.currentPortalSlug
-      );
-    },
-  },
-  mounted() {
-    this.lastPortalSlug = this.currentPortalSlug;
-  },
-  methods: {
-    async updatePortalSettings(portalObj) {
-      try {
-        const portalSlug = this.lastPortalSlug;
-        await this.$store.dispatch('portals/update', {
-          ...portalObj,
-          portalSlug,
-        });
-        this.alertMessage = this.$t(
-          'HELP_CENTER.PORTAL.ADD.API.SUCCESS_MESSAGE_FOR_UPDATE'
-        );
-
-        if (this.lastPortalSlug !== portalObj.slug) {
-          await this.$store.dispatch('portals/index');
-          this.$router.replace({
-            name: this.$route.name,
-            params: { portalSlug: portalObj.slug },
-          });
-        }
-      } catch (error) {
-        this.alertMessage =
-          error?.message ||
-          this.$t('HELP_CENTER.PORTAL.ADD.API.ERROR_MESSAGE_FOR_UPDATE');
-      } finally {
-        this.showAlert(this.alertMessage);
-      }
-    },
-    async deleteLogo() {
-      try {
-        const portalSlug = this.lastPortalSlug;
-        await this.$store.dispatch('portals/deleteLogo', {
-          portalSlug,
-        });
-      } catch (error) {
-        this.alertMessage =
-          error?.message ||
-          this.$t('HELP_CENTER.PORTAL.ADD.LOGO.IMAGE_DELETE_ERROR');
-        this.showAlert(this.alertMessage);
-      }
-    },
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalCustomization.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalCustomization.vue
index d1c9341f1f66e..902dc3ca61dca 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalCustomization.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalCustomization.vue
@@ -1,3 +1,48 @@
+<script setup>
+import PortalSettingsCustomizationForm from 'dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue';
+
+import { useAlert } from 'dashboard/composables';
+import { useStoreGetters, useStore } from 'dashboard/composables/store';
+import { useRoute } from 'dashboard/composables/route';
+import { useI18n } from 'dashboard/composables/useI18n';
+import { defineComponent, computed } from 'vue';
+
+defineComponent({
+  name: 'EditPortalCustomization',
+});
+
+const getters = useStoreGetters();
+const route = useRoute();
+const store = useStore();
+const { t } = useI18n();
+
+const uiFlags = getters['portals/uiFlagsIn'];
+
+const currentPortal = computed(() => {
+  const slug = route.params.portalSlug;
+  return getters['portals/portalBySlug'].value(slug);
+});
+
+async function updatePortalSettings(portalObj) {
+  const portalSlug = route.params.portalSlug;
+  let alertMessage = '';
+  try {
+    await store.dispatch('portals/update', {
+      ...portalObj,
+      portalSlug,
+    });
+
+    alertMessage = t('HELP_CENTER.PORTAL.ADD.API.SUCCESS_MESSAGE_FOR_UPDATE');
+  } catch (error) {
+    alertMessage =
+      error?.message ||
+      t('HELP_CENTER.PORTAL.ADD.API.ERROR_MESSAGE_FOR_UPDATE');
+  } finally {
+    useAlert(alertMessage);
+  }
+}
+</script>
+
 <template>
   <portal-settings-customization-form
     v-if="currentPortal"
@@ -9,51 +54,3 @@
     @submit="updatePortalSettings"
   />
 </template>
-
-<script>
-import alertMixin from 'shared/mixins/alertMixin';
-import PortalSettingsCustomizationForm from 'dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue';
-
-import { mapGetters } from 'vuex';
-
-export default {
-  components: {
-    PortalSettingsCustomizationForm,
-  },
-  mixins: [alertMixin],
-  data() {
-    return {
-      alertMessage: '',
-    };
-  },
-  computed: {
-    ...mapGetters({
-      uiFlags: 'portals/uiFlagsIn',
-    }),
-    currentPortal() {
-      const slug = this.$route.params.portalSlug;
-      return this.$store.getters['portals/portalBySlug'](slug);
-    },
-  },
-  methods: {
-    async updatePortalSettings(portalObj) {
-      const portalSlug = this.$route.params.portalSlug;
-      try {
-        await this.$store.dispatch('portals/update', {
-          ...portalObj,
-          portalSlug,
-        });
-        this.alertMessage = this.$t(
-          'HELP_CENTER.PORTAL.ADD.API.SUCCESS_MESSAGE_FOR_UPDATE'
-        );
-      } catch (error) {
-        this.alertMessage =
-          error?.message ||
-          this.$t('HELP_CENTER.PORTAL.ADD.API.ERROR_MESSAGE_FOR_UPDATE');
-      } finally {
-        this.showAlert(this.alertMessage);
-      }
-    },
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalLocales.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalLocales.vue
index 3c1c4c87265bc..e6cee06a4da4d 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalLocales.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalLocales.vue
@@ -1,6 +1,117 @@
+<script setup>
+import LocaleItemTable from 'dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue';
+import AddLocale from 'dashboard/routes/dashboard/helpcenter/components/AddLocale.vue';
+import { PORTALS_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+
+import { useAlert, useTrack } from 'dashboard/composables';
+import { useStoreGetters, useStore } from 'dashboard/composables/store';
+import { useRoute } from 'dashboard/composables/route';
+import { useI18n } from 'dashboard/composables/useI18n';
+import { defineComponent, ref, onBeforeMount, computed } from 'vue';
+
+defineComponent({
+  name: 'EditPortalLocales',
+});
+
+const isAddLocaleModalOpen = ref(false);
+
+const getters = useStoreGetters();
+const store = useStore();
+const route = useRoute();
+const track = useTrack();
+const { t } = useI18n();
+
+const currentPortalSlug = computed(() => {
+  return route.params.portalSlug;
+});
+const currentPortal = computed(() => {
+  const slug = currentPortalSlug.value;
+  if (slug) return getters['portals/portalBySlug'].value(slug);
+
+  return getters['portals/allPortals'].value[0];
+});
+const locales = computed(() => {
+  return currentPortal.value?.config.allowed_locales;
+});
+const allowedLocales = computed(() => {
+  return Object.keys(locales.value).map(key => {
+    return this.locales.value[key].code;
+  });
+});
+
+async function fetchPortals() {
+  await store.dispatch('portals/index');
+}
+
+onBeforeMount(() => {
+  fetchPortals();
+});
+
+async function updatePortalLocales({
+  newAllowedLocales,
+  defaultLocale,
+  messageKey,
+}) {
+  let alertMessage = '';
+  try {
+    await store.dispatch('portals/update', {
+      portalSlug: currentPortalSlug.value,
+      config: {
+        default_locale: defaultLocale,
+        allowed_locales: newAllowedLocales,
+      },
+    });
+    alertMessage = t(`HELP_CENTER.PORTAL.${messageKey}.API.SUCCESS_MESSAGE`);
+  } catch (error) {
+    alertMessage =
+      error?.message || t(`HELP_CENTER.PORTAL.${messageKey}.API.ERROR_MESSAGE`);
+  } finally {
+    useAlert(alertMessage);
+  }
+}
+
+function changeDefaultLocale({ localeCode }) {
+  updatePortalLocales({
+    allowedLocales: allowedLocales.value,
+    defaultLocale: localeCode,
+    messageKey: 'CHANGE_DEFAULT_LOCALE',
+  });
+
+  track(PORTALS_EVENTS.SET_DEFAULT_LOCALE, {
+    newLocale: localeCode,
+    from: route.name,
+  });
+}
+function deletePortalLocale({ localeCode }) {
+  const updatedLocales = allowedLocales.value.filter(
+    code => code !== localeCode
+  );
+
+  const defaultLocale = currentPortal.value?.meta.default_locale;
+
+  updatePortalLocales({
+    allowedLocales: updatedLocales,
+    defaultLocale,
+    messageKey: 'DELETE_LOCALE',
+  });
+
+  track(PORTALS_EVENTS.DELETE_LOCALE, {
+    deletedLocale: localeCode,
+    from: route.name,
+  });
+}
+
+function closeAddLocaleModal() {
+  isAddLocaleModalOpen.value = false;
+}
+function addLocale() {
+  isAddLocaleModalOpen.value = true;
+}
+</script>
+
 <template>
-  <div class="portal-locales">
-    <div class="button-container">
+  <div class="w-full h-full max-w-6xl space-y-4 bg-white dark:bg-slate-900">
+    <div class="flex justify-end">
       <woot-button
         variant="smooth"
         size="small"
@@ -11,19 +122,18 @@
         {{ $t('HELP_CENTER.PORTAL.PORTAL_SETTINGS.LIST_ITEM.HEADER.ADD') }}
       </woot-button>
     </div>
-    <div class="locale-container">
-      <locale-item-table
-        :locales="locales"
-        :selected-locale-code="currentPortal.meta.default_locale"
-        @change-default-locale="changeDefaultLocale"
-        @delete="deletePortalLocale"
-      />
-    </div>
+    <LocaleItemTable
+      v-if="currentPortal"
+      :locales="locales"
+      :selected-locale-code="currentPortal.meta.default_locale"
+      @change-default-locale="changeDefaultLocale"
+      @delete="deletePortalLocale"
+    />
     <woot-modal
       :show.sync="isAddLocaleModalOpen"
       :on-close="closeAddLocaleModal"
     >
-      <add-locale
+      <AddLocale
         :show="isAddLocaleModalOpen"
         :portal="currentPortal"
         @cancel="closeAddLocaleModal"
@@ -31,126 +141,3 @@
     </woot-modal>
   </div>
 </template>
-<script>
-import { mapGetters } from 'vuex';
-import alertMixin from 'shared/mixins/alertMixin';
-import LocaleItemTable from 'dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue';
-import AddLocale from 'dashboard/routes/dashboard/helpcenter/components/AddLocale.vue';
-import { PORTALS_EVENTS } from '../../../../../helper/AnalyticsHelper/events';
-export default {
-  components: {
-    LocaleItemTable,
-    AddLocale,
-  },
-  mixins: [alertMixin],
-  data() {
-    return {
-      isAddLocaleModalOpen: false,
-      lastPortalSlug: undefined,
-      alertMessage: '',
-    };
-  },
-  computed: {
-    ...mapGetters({
-      uiFlags: 'portals/uiFlagsIn',
-    }),
-    currentPortalSlug() {
-      return this.$route.params.portalSlug;
-    },
-    currentPortal() {
-      return this.$store.getters['portals/portalBySlug'](
-        this.currentPortalSlug
-      );
-    },
-    locales() {
-      return this.currentPortal.config.allowed_locales;
-    },
-    allowedLocales() {
-      return Object.keys(this.locales).map(key => {
-        return this.locales[key].code;
-      });
-    },
-  },
-  mounted() {
-    this.lastPortalSlug = this.currentPortalSlug;
-  },
-  methods: {
-    changeDefaultLocale({ localeCode }) {
-      this.updatePortalLocales({
-        allowedLocales: this.allowedLocales,
-        defaultLocale: localeCode,
-        successMessage: this.$t(
-          'HELP_CENTER.PORTAL.CHANGE_DEFAULT_LOCALE.API.SUCCESS_MESSAGE'
-        ),
-        errorMessage: this.$t(
-          'HELP_CENTER.PORTAL.CHANGE_DEFAULT_LOCALE.API.ERROR_MESSAGE'
-        ),
-      });
-      this.$track(PORTALS_EVENTS.SET_DEFAULT_LOCALE, {
-        newLocale: localeCode,
-        from: this.$route.name,
-      });
-    },
-    deletePortalLocale({ localeCode }) {
-      const updatedLocales = this.allowedLocales.filter(
-        code => code !== localeCode
-      );
-      const defaultLocale = this.currentPortal.meta.default_locale;
-      this.updatePortalLocales({
-        allowedLocales: updatedLocales,
-        defaultLocale,
-        successMessage: this.$t(
-          'HELP_CENTER.PORTAL.DELETE_LOCALE.API.SUCCESS_MESSAGE'
-        ),
-        errorMessage: this.$t(
-          'HELP_CENTER.PORTAL.DELETE_LOCALE.API.ERROR_MESSAGE'
-        ),
-      });
-      this.$track(PORTALS_EVENTS.DELETE_LOCALE, {
-        deletedLocale: localeCode,
-        from: this.$route.name,
-      });
-    },
-    async updatePortalLocales({
-      allowedLocales,
-      defaultLocale,
-      successMessage,
-      errorMessage,
-    }) {
-      try {
-        await this.$store.dispatch('portals/update', {
-          portalSlug: this.currentPortal.slug,
-          config: {
-            default_locale: defaultLocale,
-            allowed_locales: allowedLocales,
-          },
-        });
-        this.alertMessage = successMessage;
-      } catch (error) {
-        this.alertMessage = error?.message || errorMessage;
-      } finally {
-        this.showAlert(this.alertMessage);
-      }
-    },
-    closeAddLocaleModal() {
-      this.isAddLocaleModalOpen = false;
-      this.selectedPortal = {};
-    },
-    addLocale() {
-      this.isAddLocaleModalOpen = true;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.portal-locales {
-  @apply w-full bg-white dark:bg-slate-900 h-full py-0 pr-0 pl-4;
-  .button-container {
-    @apply flex justify-end;
-  }
-  .locale-container {
-    @apply mt-4;
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/NewPortal.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/NewPortal.vue
index e1472347683f6..0222044bc7b3d 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/NewPortal.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/NewPortal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-1">
+  <section class="flex-1">
     <settings-header
       button-route="new"
       :header-title="portalHeaderText"
@@ -10,16 +10,20 @@
       :show-new-button="false"
     />
     <div
-      class="flex flex-row overflow-auto py-4 pl-4 rtl:pl-0 rtl:pr-4 h-full bg-slate-50 dark:bg-slate-800"
+      class="grid grid-cols-[20rem_1fr] w-full h-full overflow-auto rtl:pl-0 rtl:pr-4 bg-slate-50 dark:bg-slate-800 p-5"
     >
       <woot-wizard
-        class="hidden md:block w-1/4"
+        class="hidden md:block"
         :global-config="globalConfig"
         :items="items"
       />
-      <router-view />
+      <div
+        class="w-full p-5 bg-white border border-transparent border-solid rounded-md shadow-sm dark:bg-slate-900 dark:border-transparent"
+      >
+        <router-view />
+      </div>
     </div>
-  </div>
+  </section>
 </template>
 
 <script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalCustomization.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalCustomization.vue
index 19fa0efba81ef..60420be90d6d0 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalCustomization.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalCustomization.vue
@@ -1,3 +1,63 @@
+<script setup>
+import PortalSettingsCustomizationForm from 'dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue';
+import { PORTALS_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+
+import { useAlert, useTrack } from 'dashboard/composables';
+import { useStoreGetters, useStore } from 'dashboard/composables/store';
+import { useRoute, useRouter } from 'dashboard/composables/route';
+import { useI18n } from 'dashboard/composables/useI18n';
+import { defineComponent, onMounted, computed } from 'vue';
+
+defineComponent({
+  name: 'PortalCustomization',
+});
+
+const getters = useStoreGetters();
+const route = useRoute();
+const router = useRouter();
+const store = useStore();
+const track = useTrack();
+const { t } = useI18n();
+
+const uiFlags = getters['portals/uiFlagsIn'];
+
+const currentPortal = computed(() => {
+  const slug = route.params.portalSlug;
+  if (slug) return getters['portals/portalBySlug'].value(slug);
+
+  return {};
+});
+
+onMounted(() => {
+  store.dispatch('portals/index');
+});
+
+async function updatePortalSettings(portalObj) {
+  const portalSlug = route.params.portalSlug;
+  let alertMessage = '';
+  try {
+    await store.dispatch('portals/update', {
+      portalSlug,
+      ...portalObj,
+    });
+    alertMessage = t('HELP_CENTER.PORTAL.ADD.API.SUCCESS_MESSAGE_FOR_UPDATE');
+
+    track(PORTALS_EVENTS.ONBOARD_CUSTOMIZATION, {
+      hasHomePageLink: Boolean(portalObj.homepage_link),
+      hasPageTitle: Boolean(portalObj.page_title),
+      hasHeaderText: Boolean(portalObj.headerText),
+    });
+  } catch (error) {
+    alertMessage =
+      error?.message ||
+      t('HELP_CENTER.PORTAL.ADD.API.ERROR_MESSAGE_FOR_UPDATE');
+  } finally {
+    useAlert(alertMessage);
+    router.push({ name: 'portal_finish' });
+  }
+}
+</script>
+
 <template>
   <portal-settings-customization-form
     v-if="currentPortal"
@@ -9,75 +69,3 @@
     @submit="updatePortalSettings"
   />
 </template>
-
-<script>
-import alertMixin from 'shared/mixins/alertMixin';
-import PortalSettingsCustomizationForm from 'dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue';
-
-import { mapGetters } from 'vuex';
-
-import { getRandomColor } from 'dashboard/helper/labelColor';
-import { PORTALS_EVENTS } from '../../../../../helper/AnalyticsHelper/events';
-
-export default {
-  components: {
-    PortalSettingsCustomizationForm,
-  },
-  mixins: [alertMixin],
-  data() {
-    return {
-      color: '#000',
-      pageTitle: '',
-      headerText: '',
-      homePageLink: '',
-      alertMessage: '',
-    };
-  },
-  computed: {
-    ...mapGetters({
-      uiFlags: 'portals/uiFlagsIn',
-      portals: 'portals/allPortals',
-    }),
-    currentPortal() {
-      const slug = this.$route.params.portalSlug;
-      return this.$store.getters['portals/portalBySlug'](slug);
-    },
-  },
-  mounted() {
-    this.fetchPortals();
-    this.color = getRandomColor();
-  },
-  methods: {
-    fetchPortals() {
-      this.$store.dispatch('portals/index');
-    },
-    async updatePortalSettings(portalObj) {
-      const portalSlug = this.$route.params.portalSlug;
-      try {
-        await this.$store.dispatch('portals/update', {
-          portalSlug,
-          ...portalObj,
-        });
-        this.alertMessage = this.$t(
-          'HELP_CENTER.PORTAL.ADD.API.SUCCESS_MESSAGE_FOR_UPDATE'
-        );
-
-        this.$track(PORTALS_EVENTS.ONBOARD_CUSTOMIZATION, {
-          hasHomePageLink: Boolean(portalObj.homepage_link),
-          hasPageTitle: Boolean(portalObj.page_title),
-          hasHeaderText: Boolean(portalObj.headerText),
-        });
-      } catch (error) {
-        this.alertMessage =
-          error?.message ||
-          this.$t('HELP_CENTER.PORTAL.ADD.API.ERROR_MESSAGE_FOR_UPDATE');
-      } finally {
-        this.showAlert(this.alertMessage);
-        this.$router.push({
-          name: 'portal_finish',
-        });
-      }
-    },
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalSettingsFinish.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalSettingsFinish.vue
index 690f058a462ec..3a3e77142d9d5 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalSettingsFinish.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalSettingsFinish.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="pt-3 bg-white dark:bg-slate-900 h-full border border-solid border-transparent px-6 pb-6 dark:border-transparent w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+    class="flex-grow-0 flex-shrink-0 w-full h-full max-w-full px-6 pt-3 pb-6 bg-white border border-transparent border-solid dark:bg-slate-900 dark:border-transparent"
   >
     <empty-state
       :title="$t('HELP_CENTER.PORTAL.ADD.CREATE_FLOW_PAGE.FINISH_PAGE.TITLE')"
@@ -10,7 +10,7 @@
     >
       <div class="w-full text-center">
         <router-link
-          class="button success nice rounded"
+          class="rounded button success nice"
           :to="{
             name: 'list_all_portals',
           }"
@@ -22,18 +22,10 @@
   </div>
 </template>
 
-<script>
+<script setup>
 import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
-export default {
-  components: {
-    EmptyState,
-  },
-  methods: {
-    changeRoute() {
-      this.$router.push({
-        name: 'list_all_portals',
-      });
-    },
-  },
-};
+import { defineComponent } from 'vue';
+defineComponent({
+  name: 'PortalSettingsFinish',
+});
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
index 35411f546948f..556a22de0a9fc 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
@@ -57,7 +57,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import InboxOptionMenu from './InboxOptionMenu.vue';
 import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 import InboxDisplayMenu from './InboxDisplayMenu.vue';
@@ -68,7 +67,7 @@ export default {
     InboxOptionMenu,
     InboxDisplayMenu,
   },
-  mixins: [clickaway, alertMixin],
+  mixins: [alertMixin],
   props: {
     isContextMenuOpen: {
       type: Boolean,
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
index d18e0ccdc6e89..459f9aaef376c 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
@@ -115,7 +115,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
 import rtlMixin from 'shared/mixins/rtlMixin';
 import NotificationPanelList from './NotificationPanelList.vue';
 
@@ -125,7 +124,7 @@ export default {
   components: {
     NotificationPanelList,
   },
-  mixins: [clickaway, rtlMixin],
+  mixins: [rtlMixin],
   data() {
     return {
       pageSize: 15,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
index cf900d1a82254..3c73cbf77aa9e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import Spinner from 'shared/components/Spinner.vue';
 import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
 import campaignMixin from 'shared/mixins/campaignMixin';
@@ -34,7 +33,7 @@ export default {
     CampaignCard,
   },
 
-  mixins: [clickaway, campaignMixin],
+  mixins: [campaignMixin],
 
   props: {
     campaigns: {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index dd070097aa0d2..379d4af6f97f5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -32,9 +32,25 @@
             <th
               v-for="thHeader in $t('CANNED_MGMT.LIST.TABLE_HEADER')"
               :key="thHeader"
-              class="last:text-right"
+              class="last:text-right first:m-0 first:p-0"
             >
-              {{ thHeader }}
+              <p v-if="thHeader !== $t('CANNED_MGMT.LIST.TABLE_HEADER[0]')">
+                {{ thHeader }}
+              </p>
+
+              <button
+                v-if="thHeader === $t('CANNED_MGMT.LIST.TABLE_HEADER[0]')"
+                class="cursor-pointer flex items-center p-0"
+                @click="toggleSort"
+              >
+                <p class="uppercase">
+                  {{ thHeader }}
+                </p>
+                <fluent-icon
+                  class="mb-2 ml-2"
+                  :icon="sortOrder === 'asc' ? 'chevron-up' : 'chevron-down'"
+                />
+              </button>
             </th>
           </thead>
           <tbody>
@@ -132,6 +148,7 @@ export default {
       cannedResponseAPI: {
         message: '',
       },
+      sortOrder: 'asc',
     };
   },
   computed: {
@@ -156,9 +173,20 @@ export default {
   },
   mounted() {
     // Fetch API Call
-    this.$store.dispatch('getCannedResponse');
+    this.$store.dispatch('getCannedResponse').then(() => {
+      this.toggleSort();
+    });
   },
   methods: {
+    toggleSort() {
+      this.records.sort((a, b) => {
+        if (this.sortOrder === 'asc') {
+          return a.short_code.localeCompare(b.short_code);
+        }
+        return b.short_code.localeCompare(a.short_code);
+      });
+      this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc';
+    },
     showAlert(message) {
       // Reset loading, current selected agent
       this.loading[this.selectedResponse.id] = false;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
index 6a55f588927c7..93bff206d68de 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
@@ -3,6 +3,7 @@
     class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
   >
     <page-header
+      class="max-w-4xl"
       :header-title="$t('INBOX_MGMT.ADD.AUTH.TITLE')"
       :header-content="
         useInstallationName(
@@ -11,7 +12,9 @@
         )
       "
     />
-    <div class="mt-6 mx-0 flex flex-wrap">
+    <div
+      class="mt-6 grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 mx-0 max-w-3xl"
+    >
       <channel-item
         v-for="channel in channelList"
         :key="channel.key"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue
index ded9142db0a30..ebac2a2d179fc 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue
@@ -111,7 +111,9 @@ export default {
           },
         });
       } catch (error) {
-        this.showAlert(this.$t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE'));
+        this.showAlert(
+          error.message || this.$t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE')
+        );
       }
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue
index a6253e51673ce..dd320dd177e5a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue
@@ -155,7 +155,9 @@ export default {
           },
         });
       } catch (error) {
-        this.showAlert(this.$t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE'));
+        this.showAlert(
+          error.message || this.$t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE')
+        );
       }
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue
index 1091183748a12..3112b10892a63 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue
@@ -4,16 +4,18 @@
     class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full md:w-full max-w-full md:max-w-[75%] flex-shrink-0 flex-grow-0"
   >
     <page-header
+      class="max-w-4xl"
       :header-title="$t('INBOX_MGMT.ADD.EMAIL_PROVIDER.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.EMAIL_PROVIDER.DESCRIPTION')"
     />
-    <div class="flex flex-row flex-wrap mx-0 mt-6">
+    <div class="grid grid-cols-4 max-w-3xl mx-0 mt-6">
       <channel-selector
         v-for="emailProvider in emailProviderList"
         :key="emailProvider.key"
+        :class="{ inactive: !emailProvider.isEnabled }"
         :title="emailProvider.title"
         :src="emailProvider.src"
-        @click="() => onClick(emailProvider.key)"
+        @click="() => onClick(emailProvider)"
       />
     </div>
   </div>
@@ -38,7 +40,10 @@ export default {
     return { provider: '' };
   },
   computed: {
-    ...mapGetters({ globalConfig: 'globalConfig/get' }),
+    ...mapGetters({
+      globalConfig: 'globalConfig/get',
+      isAChatwootInstance: 'globalConfig/isAChatwootInstance',
+    }),
     emailProviderList() {
       return [
         {
@@ -53,12 +58,19 @@ export default {
           key: 'other_provider',
           src: '/assets/images/dashboard/channels/email.png',
         },
-      ].filter(provider => provider.isEnabled);
+      ].filter(provider => {
+        if (this.isAChatwootInstance) {
+          return true;
+        }
+        return provider.isEnabled;
+      });
     },
   },
   methods: {
-    onClick(provider) {
-      this.provider = provider;
+    onClick(emailProvider) {
+      if (emailProvider.isEnabled) {
+        this.provider = emailProvider.key;
+      }
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue
index 1f677bd66d263..c7cbaeb4a9e6e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue
@@ -86,7 +86,8 @@ export default {
         });
       } catch (error) {
         this.showAlert(
-          this.$t('INBOX_MGMT.ADD.TELEGRAM_CHANNEL.API.ERROR_MESSAGE')
+          error.message ||
+            this.$t('INBOX_MGMT.ADD.TELEGRAM_CHANNEL.API.ERROR_MESSAGE')
         );
       }
     },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index d1f8d5b8c9184..8206e46514bb8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -16,9 +16,6 @@
           <option value="twilio">
             {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO') }}
           </option>
-          <option value="360dialog">
-            {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.360_DIALOG') }}
-          </option>
         </select>
       </label>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
index ea3c3f84dcbef..c70fbddc112d0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
@@ -2,15 +2,15 @@
   <tr>
     <td>{{ macro.name }}</td>
     <td>
-      <div class="avatar-container">
-        <thumbnail :username="macro.created_by.name" size="24px" />
-        <span>{{ macro.created_by.name }}</span>
+      <div v-if="macro.created_by" class="avatar-container">
+        <thumbnail :username="createdByName" size="24px" />
+        <span>{{ createdByName }}</span>
       </div>
     </td>
     <td>
-      <div class="avatar-container">
-        <thumbnail :username="macro.updated_by.name" size="24px" />
-        <span>{{ macro.updated_by.name }}</span>
+      <div v-if="macro.updated_by" class="avatar-container">
+        <thumbnail :username="updatedByName" size="24px" />
+        <span>{{ updatedByName }}</span>
       </div>
     </td>
     <td>{{ visibilityLabel }}</td>
@@ -53,6 +53,14 @@ export default {
     },
   },
   computed: {
+    createdByName() {
+      const createdBy = this.macro.created_by;
+      return createdBy.available_name ?? createdBy.email ?? '';
+    },
+    updatedByName() {
+      const updatedBy = this.macro.updated_by;
+      return updatedBy.available_name ?? updatedBy.email ?? '';
+    },
     visibilityLabel() {
       return this.macro.visibility === 'global'
         ? this.$t('MACROS.EDITOR.VISIBILITY.GLOBAL.LABEL')
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AccessToken.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AccessToken.vue
new file mode 100644
index 0000000000000..93b6fcb238088
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AccessToken.vue
@@ -0,0 +1,58 @@
+<template>
+  <div class="flex flex-row justify-between gap-4">
+    <woot-input
+      name="access_token"
+      class="flex-1 [&>input]:!py-1.5 ltr:[&>input]:!pr-9 ltr:[&>input]:!pl-3 rtl:[&>input]:!pl-9 rtl:[&>input]:!pr-3 focus:[&>input]:!border-slate-200 focus:[&>input]:dark:!border-slate-600 [&>input]:cursor-not-allowed relative"
+      :styles="{
+        borderRadius: '12px',
+        fontSize: '14px',
+        marginBottom: '2px',
+      }"
+      :type="inputType"
+      :value="value"
+      readonly
+    >
+      <template #masked>
+        <button
+          class="absolute top-1.5 ltr:right-0.5 rtl:left-0.5"
+          @click="toggleMasked"
+        >
+          <fluent-icon :icon="maskIcon" :size="16" />
+        </button>
+      </template>
+    </woot-input>
+    <form-button
+      type="submit"
+      size="large"
+      icon="text-copy"
+      variant="outline"
+      color-scheme="secondary"
+      @click="onClick"
+    >
+      {{ $t('PROFILE_SETTINGS.FORM.ACCESS_TOKEN.COPY') }}
+    </form-button>
+  </div>
+</template>
+<script setup>
+import { ref, computed } from 'vue';
+import FormButton from 'v3/components/Form/Button.vue';
+const props = defineProps({
+  value: {
+    type: String,
+    default: '',
+  },
+});
+const emit = defineEmits(['on-copy']);
+const inputType = ref('password');
+const toggleMasked = () => {
+  inputType.value = inputType.value === 'password' ? 'text' : 'password';
+};
+
+const maskIcon = computed(() => {
+  return inputType.value === 'password' ? 'eye-hide' : 'eye-show';
+});
+
+const onClick = () => {
+  emit('on-copy', props.value);
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertCondition.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertCondition.vue
new file mode 100644
index 0000000000000..ead4b77f2dcd4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertCondition.vue
@@ -0,0 +1,42 @@
+<template>
+  <div>
+    <label
+      class="flex justify-between pb-1 text-sm font-medium leading-6 text-ash-900"
+    >
+      {{ label }}
+    </label>
+    <div class="flex flex-col gap-4">
+      <div
+        v-for="item in items"
+        :key="item.id"
+        class="flex flex-row items-start gap-2"
+      >
+        <CheckBox
+          :is-checked="item.model"
+          :value="item.value"
+          @update="onChange"
+        />
+        <label class="text-sm font-normal text-ash-900">
+          {{ item.label }}
+        </label>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+import CheckBox from 'v3/components/Form/CheckBox.vue';
+defineProps({
+  label: {
+    type: String,
+    required: true,
+  },
+  items: {
+    type: Array,
+    required: true,
+  },
+});
+const emit = defineEmits(['change']);
+const onChange = (id, value) => {
+  emit('change', id, value);
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertEvent.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertEvent.vue
new file mode 100644
index 0000000000000..41d25b5224eb3
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertEvent.vue
@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <label
+      class="flex justify-between pb-1 text-sm font-medium leading-6 text-ash-900"
+    >
+      {{ label }}
+    </label>
+    <div
+      class="flex flex-row justify-between h-10 max-w-xl p-2 border border-solid rounded-xl border-ash-200"
+    >
+      <div
+        v-for="option in alertEvents"
+        :key="option.value"
+        class="flex flex-row items-center justify-center gap-2 px-4 border-r border-ash-200 grow last:border-r-0"
+      >
+        <input
+          :id="`radio-${option.value}`"
+          v-model="selectedValue"
+          class="shadow-sm cursor-pointer grid place-items-center border-2 border-ash-200 appearance-none rounded-full w-4 h-4 checked:bg-primary-600 before:content-[''] before:bg-primary-600 before:border-4 before:rounded-full before:border-ash-25 checked:before:w-[14px] checked:before:h-[14px] checked:border checked:border-primary-600"
+          type="radio"
+          :value="option.value"
+        />
+        <label
+          :for="`radio-${option.value}`"
+          class="text-sm font-medium"
+          :class="
+            selectedValue === option.value ? 'text-ash-900' : 'text-ash-800'
+          "
+        >
+          {{
+            $t(
+              `PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.ALERT_TYPES.${option.label.toUpperCase()}`
+            )
+          }}
+        </label>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+import { ALERT_EVENTS } from './constants';
+
+const props = defineProps({
+  label: {
+    type: String,
+    default: '',
+  },
+  value: {
+    type: String,
+    default: 'all',
+  },
+});
+
+const alertEvents = ALERT_EVENTS;
+
+const emit = defineEmits(['update']);
+
+const selectedValue = computed({
+  get: () => props.value,
+  set: value => {
+    emit('update', value);
+  },
+});
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertTone.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertTone.vue
new file mode 100644
index 0000000000000..3246e12af6ecb
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertTone.vue
@@ -0,0 +1,56 @@
+<template>
+  <form-select
+    v-model="selectedValue"
+    name="alertTone"
+    spacing="compact"
+    :value="selectedValue"
+    :options="alertTones"
+    :label="label"
+    class="max-w-xl"
+  >
+    <option
+      v-for="tone in alertTones"
+      :key="tone.label"
+      :value="tone.value"
+      :selected="tone.value === selectedValue"
+    >
+      {{ tone.label }}
+    </option>
+  </form-select>
+</template>
+<script setup>
+import { computed } from 'vue';
+import FormSelect from 'v3/components/Form/Select.vue';
+
+const props = defineProps({
+  value: {
+    type: String,
+    required: true,
+    validator: value => ['ding', 'bell'].includes(value),
+  },
+  label: {
+    type: String,
+    default: '',
+  },
+});
+
+const alertTones = computed(() => [
+  {
+    value: 'ding',
+    label: 'Ding',
+  },
+  {
+    value: 'bell',
+    label: 'Bell',
+  },
+]);
+
+const emit = defineEmits(['change']);
+
+const selectedValue = computed({
+  get: () => props.value,
+  set: value => {
+    emit('change', value);
+  },
+});
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioNotifications.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioNotifications.vue
new file mode 100644
index 0000000000000..84f369f5a3ba6
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioNotifications.vue
@@ -0,0 +1,128 @@
+<template>
+  <div id="profile-settings-notifications" class="flex flex-col gap-6">
+    <audio-alert-tone
+      :value="alertTone"
+      :label="
+        $t(
+          'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.DEFAULT_TONE.TITLE'
+        )
+      "
+      @change="handleAudioToneChange"
+    />
+
+    <audio-alert-event
+      :label="
+        $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.ALERT_TYPE.TITLE')
+      "
+      :value="audioAlert"
+      @update="handAudioAlertChange"
+    />
+
+    <audio-alert-condition
+      :items="audioAlertConditions"
+      :label="
+        $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.CONDITIONS.TITLE')
+      "
+      @change="handleAudioAlertConditions"
+    />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import configMixin from 'shared/mixins/configMixin';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import AudioAlertTone from './AudioAlertTone.vue';
+import AudioAlertEvent from './AudioAlertEvent.vue';
+import AudioAlertCondition from './AudioAlertCondition.vue';
+
+export default {
+  components: {
+    AudioAlertEvent,
+    AudioAlertTone,
+    AudioAlertCondition,
+  },
+  mixins: [alertMixin, configMixin, uiSettingsMixin],
+  data() {
+    return {
+      audioAlert: '',
+      playAudioWhenTabIsInactive: false,
+      alertIfUnreadConversationExist: false,
+      alertTone: 'ding',
+      audioAlertConditions: [],
+    };
+  },
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+      uiSettings: 'getUISettings',
+    }),
+  },
+  watch: {
+    uiSettings(value) {
+      this.notificationUISettings(value);
+    },
+  },
+  mounted() {
+    this.notificationUISettings(this.uiSettings);
+    this.$store.dispatch('userNotificationSettings/get');
+  },
+  methods: {
+    notificationUISettings(uiSettings) {
+      const {
+        enable_audio_alerts: audioAlert = '',
+        always_play_audio_alert: alwaysPlayAudioAlert,
+        alert_if_unread_assigned_conversation_exist:
+          alertIfUnreadConversationExist,
+        notification_tone: alertTone,
+      } = uiSettings;
+      this.audioAlert = audioAlert;
+      this.playAudioWhenTabIsInactive = !alwaysPlayAudioAlert;
+      this.alertIfUnreadConversationExist = alertIfUnreadConversationExist;
+      this.audioAlertConditions = [
+        {
+          id: 'audio1',
+          label: this.$t(
+            'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.CONDITIONS.CONDITION_ONE'
+          ),
+          model: this.playAudioWhenTabIsInactive,
+          value: 'tab_is_inactive',
+        },
+        {
+          id: 'audio2',
+          label: this.$t(
+            'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.CONDITIONS.CONDITION_TWO'
+          ),
+          model: this.alertIfUnreadConversationExist,
+          value: 'conversations_are_read',
+        },
+      ];
+      this.alertTone = alertTone || 'ding';
+    },
+    handAudioAlertChange(value) {
+      this.audioAlert = value;
+      this.updateUISettings({
+        enable_audio_alerts: this.audioAlert,
+      });
+      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
+    },
+    handleAudioAlertConditions(id, value) {
+      if (id === 'tab_is_inactive') {
+        this.updateUISettings({
+          always_play_audio_alert: !value,
+        });
+      } else if (id === 'conversations_are_read') {
+        this.updateUISettings({
+          alert_if_unread_assigned_conversation_exist: value,
+        });
+      }
+      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
+    },
+    handleAudioToneChange(value) {
+      this.updateUISettings({ notification_tone: value });
+      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
index 99cee03254ffa..0c2fa9e7863af 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
@@ -1,82 +1,73 @@
 <template>
   <form @submit.prevent="changePassword()">
-    <div
-      class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center"
-    >
-      <div class="w-1/4">
-        <h4 class="text-lg text-black-900 dark:text-slate-200">
-          {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.TITLE') }}
-        </h4>
-        <p>{{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.NOTE') }}</p>
-      </div>
-      <div class="w-[45%] p-4">
-        <woot-input
-          v-model="currentPassword"
-          type="password"
-          :class="{ error: $v.currentPassword.$error }"
-          :label="$t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.LABEL')"
-          :placeholder="
-            $t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.PLACEHOLDER')
-          "
-          :error="
-            $v.currentPassword.$error
-              ? $t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.ERROR')
-              : ''
-          "
-          @blur="$v.currentPassword.$touch"
-        />
+    <div class="flex flex-col w-full gap-4">
+      <woot-input
+        v-model="currentPassword"
+        type="password"
+        :styles="inputStyles"
+        :class="{ error: $v.currentPassword.$error }"
+        :label="$t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.LABEL')"
+        :placeholder="$t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.PLACEHOLDER')"
+        :error="`${
+          $v.currentPassword.$error
+            ? $t('PROFILE_SETTINGS.FORM.CURRENT_PASSWORD.ERROR')
+            : ''
+        }`"
+        @input="$v.currentPassword.$touch"
+      />
 
-        <woot-input
-          v-model="password"
-          type="password"
-          :class="{ error: $v.password.$error }"
-          :label="$t('PROFILE_SETTINGS.FORM.PASSWORD.LABEL')"
-          :placeholder="$t('PROFILE_SETTINGS.FORM.PASSWORD.PLACEHOLDER')"
-          :error="
-            $v.password.$error ? $t('PROFILE_SETTINGS.FORM.PASSWORD.ERROR') : ''
-          "
-          @blur="$v.password.$touch"
-        />
+      <woot-input
+        v-model="password"
+        type="password"
+        :styles="inputStyles"
+        :class="{ error: $v.password.$error }"
+        :label="$t('PROFILE_SETTINGS.FORM.PASSWORD.LABEL')"
+        :placeholder="$t('PROFILE_SETTINGS.FORM.PASSWORD.PLACEHOLDER')"
+        :error="`${
+          $v.password.$error ? $t('PROFILE_SETTINGS.FORM.PASSWORD.ERROR') : ''
+        }`"
+        @input="$v.password.$touch"
+      />
 
-        <woot-input
-          v-model="passwordConfirmation"
-          type="password"
-          :class="{ error: $v.passwordConfirmation.$error }"
-          :label="$t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.LABEL')"
-          :placeholder="
-            $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.PLACEHOLDER')
-          "
-          :error="
-            $v.passwordConfirmation.$error
-              ? $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.ERROR')
-              : ''
-          "
-          @blur="$v.passwordConfirmation.$touch"
-        />
+      <woot-input
+        v-model="passwordConfirmation"
+        type="password"
+        :styles="inputStyles"
+        :class="{ error: $v.passwordConfirmation.$error }"
+        :label="$t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.LABEL')"
+        :placeholder="
+          $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.PLACEHOLDER')
+        "
+        :error="`${
+          $v.passwordConfirmation.$error
+            ? $t('PROFILE_SETTINGS.FORM.PASSWORD_CONFIRMATION.ERROR')
+            : ''
+        }`"
+        @input="$v.passwordConfirmation.$touch"
+      />
 
-        <woot-button
-          :is-loading="isPasswordChanging"
-          type="submit"
-          :disabled="
-            !currentPassword ||
-            !passwordConfirmation ||
-            !$v.passwordConfirmation.isEqPassword
-          "
-        >
-          {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.BTN_TEXT') }}
-        </woot-button>
-      </div>
+      <form-button
+        type="submit"
+        color-scheme="primary"
+        variant="solid"
+        size="large"
+        :disabled="isButtonDisabled"
+      >
+        {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.BTN_TEXT') }}
+      </form-button>
     </div>
   </form>
 </template>
 
 <script>
 import { required, minLength } from 'vuelidate/lib/validators';
-import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
-
+import FormButton from 'v3/components/Form/Button.vue';
 export default {
+  components: {
+    FormButton,
+  },
   mixins: [alertMixin],
   data() {
     return {
@@ -85,6 +76,12 @@ export default {
       passwordConfirmation: '',
       isPasswordChanging: false,
       errorMessage: '',
+      inputStyles: {
+        borderRadius: '12px',
+        padding: '6px 12px',
+        fontSize: '14px',
+        marginBottom: '2px',
+      },
     };
   },
   validations: {
@@ -105,10 +102,13 @@ export default {
     },
   },
   computed: {
-    ...mapGetters({
-      currentUser: 'getCurrentUser',
-      currentUserId: 'getCurrentUserID',
-    }),
+    isButtonDisabled() {
+      return (
+        !this.currentPassword ||
+        !this.passwordConfirmation ||
+        !this.$v.passwordConfirmation.isEqPassword
+      );
+    },
   },
   methods: {
     async changePassword() {
@@ -117,38 +117,21 @@ export default {
         this.showAlert(this.$t('PROFILE_SETTINGS.FORM.ERROR'));
         return;
       }
-
+      let alertMessage = this.$t('PROFILE_SETTINGS.PASSWORD_UPDATE_SUCCESS');
       try {
         await this.$store.dispatch('updateProfile', {
           password: this.password,
           password_confirmation: this.passwordConfirmation,
           current_password: this.currentPassword,
         });
-        this.errorMessage = this.$t('PROFILE_SETTINGS.PASSWORD_UPDATE_SUCCESS');
       } catch (error) {
-        this.errorMessage =
+        alertMessage =
           parseAPIErrorResponse(error) ||
           this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
       } finally {
-        this.isPasswordChanging = false;
-        this.showAlert(this.errorMessage);
+        this.showAlert(alertMessage);
       }
     },
   },
 };
 </script>
-
-<style lang="scss">
-@import '~dashboard/assets/scss/mixins.scss';
-
-.profile--settings--row {
-  @include border-normal-bottom;
-  padding: var(--space-normal);
-  .small-3 {
-    padding: var(--space-normal) var(--space-medium) var(--space-normal) 0;
-  }
-  .small-9 {
-    padding: var(--space-normal);
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/HotKeyCard.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/HotKeyCard.vue
new file mode 100644
index 0000000000000..35cbbeb7bea4d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/HotKeyCard.vue
@@ -0,0 +1,64 @@
+<template>
+  <div
+    class="flex flex-col gap-4 w-full h-fit sm:max-h-[220px] p-4 sm:max-w-[350px] rounded-md border border-solid border-ash-200"
+    :class="{
+      'border-primary-300 ': active,
+    }"
+    @click="$emit('click')"
+  >
+    <div class="flex flex-col gap-2 items-center w-full rounded-t-[5px]">
+      <div class="flex items-center justify-between w-full gap-1">
+        <div class="flex items-center text-base font-medium text-ash-900">
+          {{ title }}
+        </div>
+        <input
+          :checked="active"
+          type="radio"
+          :name="`hotkey-${title}`"
+          class="shadow cursor-pointer grid place-items-center border-2 border-ash-200 appearance-none rounded-full w-5 h-5 checked:bg-primary-600 before:content-[''] before:bg-primary-600 before:border-4 before:rounded-full before:border-ash-25 checked:before:w-[18px] checked:before:h-[18px] checked:border checked:border-primary-600"
+        />
+      </div>
+      <span class="text-ash-900 text-sm line-clamp-2 leading-[1.4] text-start">
+        {{ description }}
+      </span>
+    </div>
+
+    <div>
+      <img
+        :src="lightImage"
+        :alt="`Light themed image for ${title}`"
+        class="block object-cover w-full dark:hidden"
+      />
+      <img
+        :src="darkImage"
+        :alt="`Dark themed image for ${title}`"
+        class="hidden object-cover w-full dark:block"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineProps({
+  active: {
+    type: Boolean,
+    default: false,
+  },
+  title: {
+    type: String,
+    default: '',
+  },
+  description: {
+    type: String,
+    default: '',
+  },
+  lightImage: {
+    type: String,
+    default: '',
+  },
+  darkImage: {
+    type: String,
+    default: '',
+  },
+});
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index f337b333bba41..45ec109aaabf6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -1,152 +1,116 @@
 <template>
-  <div class="overflow-auto p-6">
-    <form @submit.prevent="updateUser('profile')">
+  <div class="grid py-16 px-5 font-inter mx-auto gap-16 sm:max-w-[720px]">
+    <div class="flex flex-col gap-6">
+      <h2 class="text-2xl font-medium text-ash-900">
+        {{ $t('PROFILE_SETTINGS.TITLE') }}
+      </h2>
+      <user-profile-picture
+        :src="avatarUrl"
+        :name="name"
+        size="72px"
+        @change="updateProfilePicture"
+        @delete="deleteProfilePicture"
+      />
+      <user-basic-details
+        :name="name"
+        :display-name="displayName"
+        :email="email"
+        :email-enabled="!globalConfig.disableUserProfileUpdate"
+        @update-user="updateProfile"
+      />
+    </div>
+
+    <form-section
+      :title="$t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.TITLE')"
+      :description="$t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.NOTE')"
+    >
+      <message-signature
+        :message-signature="messageSignature"
+        @update-signature="updateSignature"
+      />
+    </form-section>
+    <form-section
+      :title="$t('PROFILE_SETTINGS.FORM.SEND_MESSAGE.TITLE')"
+      :description="$t('PROFILE_SETTINGS.FORM.SEND_MESSAGE.NOTE')"
+    >
       <div
-        class="flex flex-row border-b border-slate-50 dark:border-slate-700 items-center flex p-4"
+        class="flex flex-col justify-between w-full gap-5 sm:gap-4 sm:flex-row"
       >
-        <div class="w-1/4 py-4 pr-6 ml-0">
-          <h4 class="text-lg text-black-900 dark:text-slate-200">
-            {{ $t('PROFILE_SETTINGS.FORM.PROFILE_SECTION.TITLE') }}
-          </h4>
-          <p>{{ $t('PROFILE_SETTINGS.FORM.PROFILE_SECTION.NOTE') }}</p>
-        </div>
-        <div class="p-4 w-[45%]">
-          <woot-avatar-uploader
-            :label="$t('PROFILE_SETTINGS.FORM.PROFILE_IMAGE.LABEL')"
-            :src="avatarUrl"
-            @change="handleImageUpload"
-          />
-          <div v-if="showDeleteButton" class="avatar-delete-btn">
-            <woot-button
-              type="button"
-              color-scheme="alert"
-              variant="hollow"
-              size="small"
-              @click="deleteAvatar"
-            >
-              {{ $t('PROFILE_SETTINGS.DELETE_AVATAR') }}
-            </woot-button>
-          </div>
-          <label :class="{ error: $v.name.$error }">
-            {{ $t('PROFILE_SETTINGS.FORM.NAME.LABEL') }}
-            <input
-              v-model="name"
-              type="text"
-              :placeholder="$t('PROFILE_SETTINGS.FORM.NAME.PLACEHOLDER')"
-              @input="$v.name.$touch"
-            />
-            <span v-if="$v.name.$error" class="message">
-              {{ $t('PROFILE_SETTINGS.FORM.NAME.ERROR') }}
-            </span>
-          </label>
-          <label :class="{ error: $v.displayName.$error }">
-            {{ $t('PROFILE_SETTINGS.FORM.DISPLAY_NAME.LABEL') }}
-            <input
-              v-model="displayName"
-              type="text"
-              :placeholder="
-                $t('PROFILE_SETTINGS.FORM.DISPLAY_NAME.PLACEHOLDER')
-              "
-              @input="$v.displayName.$touch"
-            />
-          </label>
-          <label
-            v-if="!globalConfig.disableUserProfileUpdate"
-            :class="{ error: $v.email.$error }"
-          >
-            {{ $t('PROFILE_SETTINGS.FORM.EMAIL.LABEL') }}
-            <input
-              v-model.trim="email"
-              type="email"
-              :placeholder="$t('PROFILE_SETTINGS.FORM.EMAIL.PLACEHOLDER')"
-              @input="$v.email.$touch"
-            />
-            <span v-if="$v.email.$error" class="message">
-              {{ $t('PROFILE_SETTINGS.FORM.EMAIL.ERROR') }}
-            </span>
-          </label>
-          <woot-button type="submit" :is-loading="isProfileUpdating">
-            {{ $t('PROFILE_SETTINGS.BTN_TEXT') }}
-          </woot-button>
-        </div>
-      </div>
-    </form>
-    <message-signature />
-    <div
-      class="border-b border-slate-50 dark:border-slate-700 items-center flex p-4 text-black-900 dark:text-slate-300 row"
-    >
-      <div class="w-1/4 py-4 pr-6 ml-0">
-        <h4 class="text-lg text-black-900 dark:text-slate-200">
-          {{ $t('PROFILE_SETTINGS.FORM.SEND_MESSAGE.TITLE') }}
-        </h4>
-        <p>
-          {{ $t('PROFILE_SETTINGS.FORM.SEND_MESSAGE.NOTE') }}
-        </p>
-      </div>
-      <div class="p-4 w-[45%] flex gap-4 flex-row">
         <button
-          v-for="keyOption in keyOptions"
-          :key="keyOption.key"
-          class="cursor-pointer p-0"
-          @click="toggleEditorMessageKey(keyOption.key)"
+          v-for="hotKey in hotKeys"
+          :key="hotKey.key"
+          class="px-0 reset-base"
         >
-          <preview-card
-            :heading="keyOption.heading"
-            :content="keyOption.content"
-            :src="keyOption.src"
-            :active="isEditorHotKeyEnabled(uiSettings, keyOption.key)"
+          <hot-key-card
+            :key="hotKey.title"
+            :title="hotKey.title"
+            :description="hotKey.description"
+            :light-image="hotKey.lightImage"
+            :dark-image="hotKey.darkImage"
+            :active="isEditorHotKeyEnabled(uiSettings, hotKey.key)"
+            @click="toggleHotKey(hotKey.key)"
           />
         </button>
       </div>
-    </div>
-    <change-password v-if="!globalConfig.disableUserProfileUpdate" />
-    <notification-settings />
-    <div
-      class="border-b border-slate-50 dark:border-slate-700 items-center flex p-4 text-black-900 dark:text-slate-300 row"
+    </form-section>
+    <form-section :title="$t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.TITLE')">
+      <change-password v-if="!globalConfig.disableUserProfileUpdate" />
+    </form-section>
+    <form-section
+      :title="$t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.TITLE')"
+      :description="
+        $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.NOTE')
+      "
     >
-      <div class="w-1/4 py-4 pr-6 ml-0">
-        <h4 class="text-lg text-black-900 dark:text-slate-200">
-          {{ $t('PROFILE_SETTINGS.FORM.ACCESS_TOKEN.TITLE') }}
-        </h4>
-        <p>
-          {{
-            useInstallationName(
-              $t('PROFILE_SETTINGS.FORM.ACCESS_TOKEN.NOTE'),
-              globalConfig.installationName
-            )
-          }}
-        </p>
-      </div>
-      <div class="p-4 w-[45%]">
-        <masked-text :value="currentUser.access_token" />
-      </div>
-    </div>
+      <audio-notifications />
+    </form-section>
+    <form-section :title="$t('PROFILE_SETTINGS.FORM.NOTIFICATIONS.TITLE')">
+      <notification-preferences />
+    </form-section>
+    <form-section
+      :title="$t('PROFILE_SETTINGS.FORM.ACCESS_TOKEN.TITLE')"
+      :description="
+        useInstallationName(
+          $t('PROFILE_SETTINGS.FORM.ACCESS_TOKEN.NOTE'),
+          globalConfig.installationName
+        )
+      "
+    >
+      <access-token :value="currentUser.access_token" @on-copy="onCopyToken" />
+    </form-section>
   </div>
 </template>
-
 <script>
-import { required, minLength, email } from 'vuelidate/lib/validators';
-import { mapGetters } from 'vuex';
-import { clearCookiesOnLogout } from '../../../../store/utils/api';
-import { hasValidAvatarUrl } from 'dashboard/helper/URLHelper';
-import NotificationSettings from './NotificationSettings.vue';
-import alertMixin from 'shared/mixins/alertMixin';
-import ChangePassword from './ChangePassword.vue';
-import MessageSignature from './MessageSignature.vue';
 import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 import uiSettingsMixin, {
   isEditorHotKeyEnabled,
 } from 'dashboard/mixins/uiSettings';
-import MaskedText from 'dashboard/components/MaskedText.vue';
-import PreviewCard from 'dashboard/components/ui/PreviewCard.vue';
+import alertMixin from 'shared/mixins/alertMixin';
+import { mapGetters } from 'vuex';
+import { clearCookiesOnLogout } from 'dashboard/store/utils/api.js';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
+
+import UserProfilePicture from './UserProfilePicture.vue';
+import UserBasicDetails from './UserBasicDetails.vue';
+import MessageSignature from './MessageSignature.vue';
+import HotKeyCard from './HotKeyCard.vue';
+import ChangePassword from './ChangePassword.vue';
+import NotificationPreferences from './NotificationPreferences.vue';
+import AudioNotifications from './AudioNotifications.vue';
+import FormSection from 'dashboard/components/FormSection.vue';
+import AccessToken from './AccessToken.vue';
 
 export default {
   components: {
-    NotificationSettings,
-    ChangePassword,
     MessageSignature,
-    PreviewCard,
-    MaskedText,
+    FormSection,
+    UserProfilePicture,
+    UserBasicDetails,
+    HotKeyCard,
+    ChangePassword,
+    NotificationPreferences,
+    AudioNotifications,
+    AccessToken,
   },
   mixins: [alertMixin, globalConfigMixin, uiSettingsMixin],
   data() {
@@ -156,59 +120,40 @@ export default {
       name: '',
       displayName: '',
       email: '',
-      isProfileUpdating: false,
-      errorMessage: '',
-      keyOptions: [
+      messageSignature: '',
+      hotKeys: [
         {
           key: 'enter',
-          src: '/assets/images/dashboard/editor/enter-editor.png',
-          heading: this.$t(
+          title: this.$t(
             'PROFILE_SETTINGS.FORM.SEND_MESSAGE.CARD.ENTER_KEY.HEADING'
           ),
-          content: this.$t(
+          description: this.$t(
             'PROFILE_SETTINGS.FORM.SEND_MESSAGE.CARD.ENTER_KEY.CONTENT'
           ),
+          lightImage: '/assets/images/dashboard/profile/hot-key-enter.svg',
+          darkImage: '/assets/images/dashboard/profile/hot-key-enter-dark.svg',
         },
         {
           key: 'cmd_enter',
-          src: '/assets/images/dashboard/editor/cmd-editor.png',
-          heading: this.$t(
+          title: this.$t(
             'PROFILE_SETTINGS.FORM.SEND_MESSAGE.CARD.CMD_ENTER_KEY.HEADING'
           ),
-          content: this.$t(
+          description: this.$t(
             'PROFILE_SETTINGS.FORM.SEND_MESSAGE.CARD.CMD_ENTER_KEY.CONTENT'
           ),
+          lightImage: '/assets/images/dashboard/profile/hot-key-ctrl-enter.svg',
+          darkImage:
+            '/assets/images/dashboard/profile/hot-key-ctrl-enter-dark.svg',
         },
       ],
     };
   },
-  validations: {
-    name: {
-      required,
-      minLength: minLength(1),
-    },
-    displayName: {},
-    email: {
-      required,
-      email,
-    },
-  },
   computed: {
     ...mapGetters({
       currentUser: 'getCurrentUser',
       currentUserId: 'getCurrentUserID',
       globalConfig: 'globalConfig/get',
     }),
-    showDeleteButton() {
-      return hasValidAvatarUrl(this.avatarUrl);
-    },
-  },
-  watch: {
-    currentUserId(newCurrentUserId, prevCurrentUserId) {
-      if (prevCurrentUserId !== newCurrentUserId) {
-        this.initializeUser();
-      }
-    },
   },
   mounted() {
     if (this.currentUserId) {
@@ -221,45 +166,66 @@ export default {
       this.email = this.currentUser.email;
       this.avatarUrl = this.currentUser.avatar_url;
       this.displayName = this.currentUser.display_name;
+      this.messageSignature = this.currentUser.message_signature;
     },
     isEditorHotKeyEnabled,
-    async updateUser() {
-      this.$v.$touch();
-      if (this.$v.$invalid) {
-        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.ERROR'));
-        return;
-      }
-
-      this.isProfileUpdating = true;
-      const hasEmailChanged = this.currentUser.email !== this.email;
+    async dispatchUpdate(payload, successMessage, errorMessage) {
+      let alertMessage = '';
       try {
-        await this.$store.dispatch('updateProfile', {
-          name: this.name,
-          email: this.email,
-          avatar: this.avatarFile,
-          displayName: this.displayName,
-        });
-        this.isProfileUpdating = false;
-        if (hasEmailChanged) {
-          clearCookiesOnLogout();
-          this.errorMessage = this.$t('PROFILE_SETTINGS.AFTER_EMAIL_CHANGED');
-        }
-        this.errorMessage = this.$t('PROFILE_SETTINGS.UPDATE_SUCCESS');
+        await this.$store.dispatch('updateProfile', payload);
+        alertMessage = successMessage;
+
+        return true; // return the value so that the status can be known
       } catch (error) {
-        this.errorMessage = this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
-        if (error?.response?.data?.error) {
-          this.errorMessage = error.response.data.error;
-        }
+        alertMessage = error?.response?.data?.error
+          ? error.response.data.error
+          : errorMessage;
+
+        return false; // return the value so that the status can be known
       } finally {
-        this.isProfileUpdating = false;
-        this.showAlert(this.errorMessage);
+        this.showAlert(alertMessage);
       }
     },
-    handleImageUpload({ file, url }) {
+    async updateProfile(userAttributes) {
+      const { name, email, displayName } = userAttributes;
+      const hasEmailChanged = this.currentUser.email !== email;
+      this.name = name || this.name;
+      this.email = email || this.email;
+      this.displayName = displayName || this.displayName;
+
+      const updatePayload = {
+        name: this.name,
+        email: this.email,
+        displayName: this.displayName,
+        avatar: this.avatarFile,
+      };
+
+      const success = await this.dispatchUpdate(
+        updatePayload,
+        hasEmailChanged
+          ? this.$t('PROFILE_SETTINGS.AFTER_EMAIL_CHANGED')
+          : this.$t('PROFILE_SETTINGS.UPDATE_SUCCESS'),
+        this.$t('RESET_PASSWORD.API.ERROR_MESSAGE')
+      );
+
+      if (hasEmailChanged && success) clearCookiesOnLogout();
+    },
+    async updateSignature(signature) {
+      const payload = { message_signature: signature };
+      let successMessage = this.$t(
+        'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.API_SUCCESS'
+      );
+      let errorMessage = this.$t(
+        'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.API_ERROR'
+      );
+
+      await this.dispatchUpdate(payload, successMessage, errorMessage);
+    },
+    updateProfilePicture({ file, url }) {
       this.avatarFile = file;
       this.avatarUrl = url;
     },
-    async deleteAvatar() {
+    async deleteProfilePicture() {
       try {
         await this.$store.dispatch('deleteAvatar');
         this.avatarUrl = '';
@@ -269,12 +235,19 @@ export default {
         this.showAlert(this.$t('PROFILE_SETTINGS.AVATAR_DELETE_FAILED'));
       }
     },
-    toggleEditorMessageKey(key) {
+    toggleHotKey(key) {
+      this.hotKeys = this.hotKeys.map(hotKey =>
+        hotKey.key === key ? { ...hotKey, active: !hotKey.active } : hotKey
+      );
       this.updateUISettings({ editor_message_key: key });
       this.showAlert(
         this.$t('PROFILE_SETTINGS.FORM.SEND_MESSAGE.UPDATE_SUCCESS')
       );
     },
+    async onCopyToken(value) {
+      await copyTextToClipboard(value);
+      this.showAlert(this.$t('COMPONENTS.CODE.COPY_SUCCESSFUL'));
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
index d2eb246d51f39..a86b4fa5c2d8f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
@@ -1,110 +1,50 @@
 <template>
-  <div
-    class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center"
-  >
-    <div class="w-1/4 py-4 pr-6 ml-0">
-      <h4 class="text-lg text-black-900 dark:text-slate-200">
-        {{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.TITLE') }}
-      </h4>
-      <p>{{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.NOTE') }}</p>
-    </div>
-    <div class="p-4 w-[45%]">
-      <div>
-        <label for="message-signature-input">{{
-          $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE.LABEL')
-        }}</label>
-        <woot-message-editor
-          id="message-signature-input"
-          v-model="messageSignature"
-          class="message-editor h-[10rem]"
-          :is-format-mode="true"
-          :placeholder="
-            $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE.PLACEHOLDER')
-          "
-          :enabled-menu-options="customEditorMenuList"
-          :enable-suggestions="false"
-          :show-image-resize-toolbar="true"
-        />
-      </div>
-      <woot-button
-        :is-loading="isUpdating"
-        type="button"
-        @click.prevent="updateSignature"
-      >
-        {{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.BTN_TEXT') }}
-      </woot-button>
-    </div>
-  </div>
+  <form class="flex flex-col gap-6" @submit.prevent="updateSignature()">
+    <woot-message-editor
+      id="message-signature-input"
+      v-model="signature"
+      class="message-editor h-[10rem] !px-3"
+      :is-format-mode="true"
+      :placeholder="$t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE.PLACEHOLDER')"
+      :enabled-menu-options="customEditorMenuList"
+      :enable-suggestions="false"
+      :show-image-resize-toolbar="true"
+    />
+    <form-button
+      type="submit"
+      color-scheme="primary"
+      variant="solid"
+      size="large"
+    >
+      {{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.BTN_TEXT') }}
+    </form-button>
+  </form>
 </template>
-
-<script>
-import { mapGetters } from 'vuex';
-
+<script setup>
+import { ref, watch } from 'vue';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor.vue';
-import alertMixin from 'shared/mixins/alertMixin';
 import { MESSAGE_SIGNATURE_EDITOR_MENU_OPTIONS } from 'dashboard/constants/editor';
+import FormButton from 'v3/components/Form/Button.vue';
 
-export default {
-  components: {
-    WootMessageEditor,
-  },
-  mixins: [alertMixin],
-  data() {
-    return {
-      messageSignature: '',
-      enableMessageSignature: false,
-      isUpdating: false,
-      errorMessage: '',
-      customEditorMenuList: MESSAGE_SIGNATURE_EDITOR_MENU_OPTIONS,
-    };
-  },
-  computed: {
-    ...mapGetters({
-      currentUser: 'getCurrentUser',
-      currentUserId: 'getCurrentUserID',
-    }),
-  },
-  mounted() {
-    this.initValues();
-  },
-  methods: {
-    initValues() {
-      const { message_signature: messageSignature } = this.currentUser;
-      this.messageSignature = messageSignature || '';
-    },
-    async updateSignature() {
-      try {
-        await this.$store.dispatch('updateProfile', {
-          message_signature: this.messageSignature || '',
-        });
-        this.errorMessage = this.$t(
-          'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.API_SUCCESS'
-        );
-      } catch (error) {
-        this.errorMessage = this.$t(
-          'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.API_ERROR'
-        );
-        if (error?.response?.data?.message) {
-          this.errorMessage = error.response.data.message;
-        }
-      } finally {
-        this.isUpdating = false;
-        this.initValues();
-        this.showAlert(this.errorMessage);
-      }
-    },
+const props = defineProps({
+  messageSignature: {
+    type: String,
+    default: '',
   },
-};
-</script>
+});
 
-<style lang="scss" scoped>
-.message-editor {
-  @apply px-3 mb-4;
+const customEditorMenuList = MESSAGE_SIGNATURE_EDITOR_MENU_OPTIONS;
+const signature = ref(props.messageSignature);
+const emit = defineEmits(['update-signature']);
 
-  ::v-deep {
-    .ProseMirror-menubar {
-      @apply left-2;
-    }
+watch(
+  () => props.messageSignature ?? '',
+  newValue => {
+    signature.value = newValue;
   }
-}
-</style>
+);
+
+const updateSignature = () => {
+  emit('update-signature', signature.value);
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationCheckBox.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationCheckBox.vue
new file mode 100644
index 0000000000000..feb180014f169
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationCheckBox.vue
@@ -0,0 +1,53 @@
+<template>
+  <div
+    class="flex items-start gap-2 px-0 text-sm tracking-[0.5] text-left rtl:text-right"
+    :class="`col-span-${span}`"
+  >
+    <input
+      v-model="localFlags"
+      class="mt-1 flex-shrink-0 border-ash-200 border checked:border-none checked:bg-primary-600 dark:checked:bg-primary-600 shadow appearance-none rounded-[4px] w-4 h-4 focus:ring-1 after:content-[''] after:text-white checked:after:content-['✓'] after:flex after:items-center after:justify-center after:text-center after:text-xs after:font-bold after:relative"
+      type="checkbox"
+      :value="localValue"
+      @input="handleInput"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  value: {
+    type: String,
+    required: true,
+  },
+  span: {
+    type: Number,
+    default: 2,
+  },
+  selectedFlags: {
+    type: Array,
+    required: true,
+  },
+  type: {
+    type: String,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['input']);
+
+const localValue = ref(props.value);
+const localFlags = ref(props.selectedFlags);
+
+watch(
+  () => props.selectedFlags,
+  newValue => {
+    localFlags.value = newValue;
+  }
+);
+
+const handleInput = e => {
+  emit('input', props.type, e);
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationPreferences.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationPreferences.vue
new file mode 100644
index 0000000000000..986ff9aca21e4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationPreferences.vue
@@ -0,0 +1,294 @@
+<template>
+  <div id="profile-settings-notifications" class="flex flex-col gap-6">
+    <!-- Layout for desktop devices -->
+    <div class="hidden sm:block">
+      <div
+        class="grid content-center h-12 grid-cols-12 gap-4 py-0 rounded-t-xl"
+      >
+        <table-header-cell
+          :span="7"
+          label="`${$t('PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPE_TITLE')}`"
+        >
+          <span class="text-sm font-normal normal-case text-ash-800">
+            {{ $t('PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPE_TITLE') }}
+          </span>
+        </table-header-cell>
+        <table-header-cell
+          :span="2"
+          label="`${$t('PROFILE_SETTINGS.FORM.NOTIFICATIONS.EMAIL')}`"
+        >
+          <span class="text-sm font-medium normal-case text-ash-900">
+            {{ $t('PROFILE_SETTINGS.FORM.NOTIFICATIONS.EMAIL') }}
+          </span>
+        </table-header-cell>
+        <table-header-cell
+          :span="3"
+          label="`${$t('PROFILE_SETTINGS.FORM.NOTIFICATIONS.PUSH')}`"
+        >
+          <div class="flex items-center justify-between gap-1">
+            <span
+              class="text-sm font-medium normal-case text-ash-900 whitespace-nowrap"
+            >
+              {{ $t('PROFILE_SETTINGS.FORM.NOTIFICATIONS.PUSH') }}
+            </span>
+          </div>
+        </table-header-cell>
+      </div>
+      <div
+        v-for="(notification, index) in filteredNotificationTypes"
+        :key="index"
+      >
+        <div
+          class="grid items-center content-center h-12 grid-cols-12 gap-4 py-0 rounded-t-xl"
+        >
+          <div
+            class="flex flex-row items-start gap-2 col-span-7 px-0 py-2 text-sm tracking-[0.5] rtl:text-right"
+          >
+            <span class="text-sm text-ash-900">
+              {{ $t(notification.label) }}
+            </span>
+          </div>
+          <div
+            v-for="(type, typeIndex) in ['email', 'push']"
+            :key="typeIndex"
+            class="flex items-start gap-2 px-0 text-sm tracking-[0.5] text-left rtl:text-right"
+            :class="`col-span-${type === 'push' ? 3 : 2}`"
+          >
+            <CheckBox
+              :value="`${type}_${notification.value}`"
+              :is-checked="
+                checkFlagStatus(type, notification.value, selectedPushFlags)
+              "
+              @update="id => handleInput(type, id)"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <!--  Layout for mobile devices -->
+    <div class="flex flex-col gap-6 sm:hidden">
+      <span class="text-sm font-medium normal-case text-ash-900">
+        {{ $t('PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.TITLE') }}
+      </span>
+      <div class="flex flex-col gap-4">
+        <div
+          v-for="(notification, index) in filteredNotificationTypes"
+          :key="index"
+          class="flex flex-row items-start gap-2"
+        >
+          <CheckBox
+            :id="`email_${notification.value}`"
+            :value="`email_${notification.value}`"
+            :is-checked="checkFlagStatus('email', notification.value)"
+            @update="handleEmailInput"
+          />
+          <span class="text-sm text-ash-900">{{ $t(notification.label) }}</span>
+        </div>
+      </div>
+
+      <div class="flex items-center justify-start gap-2">
+        <span class="text-sm font-medium normal-case text-ash-900">
+          {{ $t('PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.TITLE') }}
+        </span>
+      </div>
+
+      <div class="flex flex-col gap-4">
+        <div
+          v-for="(notification, index) in filteredNotificationTypes"
+          :key="index"
+          class="flex flex-row items-start gap-2"
+        >
+          <CheckBox
+            :id="`push_${notification.value}`"
+            :value="`push_${notification.value}`"
+            :is-checked="checkFlagStatus('push', notification.value)"
+            @update="handlePushInput"
+          />
+          <span class="text-sm text-ash-900">{{ $t(notification.label) }}</span>
+        </div>
+      </div>
+    </div>
+
+    <div
+      class="flex items-center justify-between w-full gap-2 p-4 border border-solid border-ash-200 rounded-xl"
+    >
+      <div class="flex flex-row items-center gap-2">
+        <fluent-icon
+          icon="alert"
+          class="flex-shrink-0 text-ash-900"
+          size="18"
+        />
+        <span class="text-sm text-ash-900">
+          {{ $t('PROFILE_SETTINGS.FORM.NOTIFICATIONS.BROWSER_PERMISSION') }}
+        </span>
+      </div>
+      <form-switch
+        :value="hasEnabledPushPermissions"
+        @input="onRequestPermissions"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import configMixin from 'shared/mixins/configMixin';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import TableHeaderCell from 'dashboard/components/widgets/TableHeaderCell.vue';
+import CheckBox from 'v3/components/Form/CheckBox.vue';
+import {
+  hasPushPermissions,
+  requestPushPermissions,
+  verifyServiceWorkerExistence,
+} from 'dashboard/helper/pushHelper.js';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import FormSwitch from 'v3/components/Form/Switch.vue';
+import { NOTIFICATION_TYPES } from './constants';
+
+export default {
+  components: {
+    TableHeaderCell,
+    FormSwitch,
+    CheckBox,
+  },
+  mixins: [alertMixin, configMixin, uiSettingsMixin],
+  data() {
+    return {
+      selectedEmailFlags: [],
+      selectedPushFlags: [],
+      enableAudioAlerts: false,
+      hasEnabledPushPermissions: false,
+      notificationTypes: NOTIFICATION_TYPES,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+      emailFlags: 'userNotificationSettings/getSelectedEmailFlags',
+      pushFlags: 'userNotificationSettings/getSelectedPushFlags',
+      uiSettings: 'getUISettings',
+      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
+    }),
+    hasPushAPISupport() {
+      return !!('Notification' in window);
+    },
+    isSLAEnabled() {
+      return this.isFeatureEnabledonAccount(this.accountId, FEATURE_FLAGS.SLA);
+    },
+    filteredNotificationTypes() {
+      return this.notificationTypes.filter(notification =>
+        this.isSLAEnabled
+          ? true
+          : ![
+              'sla_missed_first_response',
+              'sla_missed_next_response',
+              'sla_missed_resolution',
+            ].includes(notification.value)
+      );
+    },
+  },
+  watch: {
+    emailFlags(value) {
+      this.selectedEmailFlags = value;
+    },
+    pushFlags(value) {
+      this.selectedPushFlags = value;
+    },
+  },
+  mounted() {
+    if (hasPushPermissions()) {
+      this.getPushSubscription();
+    }
+    this.$store.dispatch('userNotificationSettings/get');
+  },
+  methods: {
+    checkFlagStatus(type, flagType) {
+      const selectedFlags =
+        type === 'email' ? this.selectedEmailFlags : this.selectedPushFlags;
+      return selectedFlags.includes(`${type}_${flagType}`);
+    },
+    onRegistrationSuccess() {
+      this.hasEnabledPushPermissions = true;
+    },
+    onRequestPermissions() {
+      requestPushPermissions({
+        onSuccess: this.onRegistrationSuccess,
+      });
+    },
+    getPushSubscription() {
+      verifyServiceWorkerExistence(registration =>
+        registration.pushManager
+          .getSubscription()
+          .then(subscription => {
+            if (!subscription) {
+              this.hasEnabledPushPermissions = false;
+            } else {
+              this.hasEnabledPushPermissions = true;
+            }
+          })
+          // eslint-disable-next-line no-console
+          .catch(error => console.log(error))
+      );
+    },
+    async updateNotificationSettings() {
+      try {
+        this.$store.dispatch('userNotificationSettings/update', {
+          selectedEmailFlags: this.selectedEmailFlags,
+          selectedPushFlags: this.selectedPushFlags,
+        });
+        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
+      } catch (error) {
+        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_ERROR'));
+      }
+    },
+
+    handleAudioInput(e) {
+      this.enableAudioAlerts = e.target.value;
+      this.updateUISettings({
+        enable_audio_alerts: this.enableAudioAlerts,
+      });
+      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
+    },
+    handleAudioAlertConditions(e) {
+      let condition = e.target.value;
+      if (condition === 'tab_is_inactive') {
+        this.updateUISettings({
+          always_play_audio_alert: !e.target.checked,
+        });
+      } else if (condition === 'conversations_are_read') {
+        this.updateUISettings({
+          alert_if_unread_assigned_conversation_exist: e.target.checked,
+        });
+      }
+      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
+    },
+    handleAudioToneChange(value) {
+      this.updateUISettings({ notification_tone: value });
+      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
+    },
+    handleInput(type, id) {
+      if (type === 'email') {
+        this.handleEmailInput(id);
+      } else {
+        this.handlePushInput(id);
+      }
+    },
+    handleEmailInput(id) {
+      this.selectedEmailFlags = this.toggleInput(this.selectedEmailFlags, id);
+      this.updateNotificationSettings();
+    },
+    handlePushInput(id) {
+      this.selectedPushFlags = this.toggleInput(this.selectedPushFlags, id);
+      this.updateNotificationSettings();
+    },
+    toggleInput(selected, current) {
+      if (selected.includes(current)) {
+        const newSelectedFlags = selected.filter(flag => flag !== current);
+        return newSelectedFlags;
+      }
+      return [...selected, current];
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
deleted file mode 100644
index cdbc40ec40bb6..0000000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
+++ /dev/null
@@ -1,649 +0,0 @@
-<template>
-  <div id="profile-settings-notifications">
-    <div
-      class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center"
-    >
-      <div class="w-1/4">
-        <h4 class="text-lg text-black-900 dark:text-slate-200">
-          {{ $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.TITLE') }}
-        </h4>
-        <p>
-          {{ $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.NOTE') }}
-        </p>
-      </div>
-      <div class="w-[45%] p-4">
-        <div class="mb-4">
-          <span class="text-sm notification-label">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.ALERT_TYPE.TITLE'
-              )
-            }}
-          </span>
-          <div class="flex items-center gap-2 mb-1">
-            <input
-              id="audio_enable_alert_none"
-              v-model="enableAudioAlerts"
-              class="notification--checkbox"
-              type="radio"
-              value="none"
-              @input="handleAudioInput"
-            />
-            <label for="audio_enable_alert_none">
-              {{
-                $t(
-                  'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.ALERT_TYPE.NONE'
-                )
-              }}
-            </label>
-          </div>
-          <div class="flex items-center gap-2 mb-1">
-            <input
-              id="audio_enable_alert_mine"
-              v-model="enableAudioAlerts"
-              class="notification--checkbox"
-              type="radio"
-              value="mine"
-              @input="handleAudioInput"
-            />
-            <label for="audio_enable_alert_mine">
-              {{
-                $t(
-                  'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.ALERT_TYPE.ASSIGNED'
-                )
-              }}
-            </label>
-          </div>
-          <div class="flex items-center gap-2 mb-1">
-            <input
-              id="audio_enable_alert_all"
-              v-model="enableAudioAlerts"
-              class="notification--checkbox"
-              type="radio"
-              value="all"
-              @input="handleAudioInput"
-            />
-            <label for="audio_enable_alert_all">
-              {{
-                $t(
-                  'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.ALERT_TYPE.ALL_CONVERSATIONS'
-                )
-              }}
-            </label>
-          </div>
-        </div>
-        <div class="mb-4">
-          <span class="text-sm notification-label">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.DEFAULT_TONE.TITLE'
-              )
-            }}
-          </span>
-          <div>
-            <select
-              v-model="notificationTone"
-              class="tone-selector mb-0"
-              @change="handleAudioToneChange"
-            >
-              <option
-                v-for="tone in notificationAlertTones"
-                :key="tone.value"
-                :value="tone.value"
-              >
-                {{ tone.label }}
-              </option>
-            </select>
-          </div>
-        </div>
-        <div class="mb-1">
-          <span class="text-sm notification-label">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.CONDITIONS.TITLE'
-              )
-            }}
-          </span>
-          <div class="flex items-center gap-2 mb-1">
-            <input
-              id="audio_alert_when_tab_is_inactive"
-              v-model="playAudioWhenTabIsInactive"
-              class="notification--checkbox"
-              type="checkbox"
-              value="tab_is_inactive"
-              @input="handleAudioAlertConditions"
-            />
-            <label for="audio_alert_when_tab_is_inactive">
-              {{
-                $t(
-                  'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.CONDITIONS.CONDITION_ONE'
-                )
-              }}
-            </label>
-          </div>
-          <div class="flex items-center gap-2 mb-1">
-            <input
-              id="audio_alert_until_all_conversations_are_read"
-              v-model="alertIfUnreadConversationExist"
-              class="notification--checkbox"
-              type="checkbox"
-              value="conversations_are_read"
-              @input="handleAudioAlertConditions"
-            />
-            <label for="audio_alert_until_all_conversations_are_read">
-              {{
-                $t(
-                  'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.CONDITIONS.CONDITION_TWO'
-                )
-              }}
-            </label>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center"
-    >
-      <div class="w-1/4">
-        <h4 class="text-lg text-black-900 dark:text-slate-200">
-          {{ $t('PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.TITLE') }}
-        </h4>
-        <p>
-          {{ $t('PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.NOTE') }}
-        </p>
-      </div>
-      <div class="w-[45%] p-4">
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedEmailFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="email_conversation_creation"
-            @input="handleEmailInput"
-          />
-          <label for="conversation_creation">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.CONVERSATION_CREATION'
-              )
-            }}
-          </label>
-        </div>
-
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedEmailFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="email_conversation_assignment"
-            @input="handleEmailInput"
-          />
-          <label for="conversation_assignment">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.CONVERSATION_ASSIGNMENT'
-              )
-            }}
-          </label>
-        </div>
-
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedEmailFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="email_conversation_mention"
-            @input="handleEmailInput"
-          />
-          <label for="conversation_mention">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.CONVERSATION_MENTION'
-              )
-            }}
-          </label>
-        </div>
-
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedEmailFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="email_assigned_conversation_new_message"
-            @input="handleEmailInput"
-          />
-          <label for="assigned_conversation_new_message">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.ASSIGNED_CONVERSATION_NEW_MESSAGE'
-              )
-            }}
-          </label>
-        </div>
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedEmailFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="email_participating_conversation_new_message"
-            @input="handleEmailInput"
-          />
-          <label for="assigned_conversation_new_message">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.PARTICIPATING_CONVERSATION_NEW_MESSAGE'
-              )
-            }}
-          </label>
-        </div>
-        <div v-if="isSLAEnabled" class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedEmailFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="email_sla_missed_first_response"
-            @input="handleEmailInput"
-          />
-          <label for="sla_missed_first_response">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.SLA_MISSED_FIRST_RESPONSE'
-              )
-            }}
-          </label>
-        </div>
-        <div v-if="isSLAEnabled" class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedEmailFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="email_sla_missed_next_response"
-            @input="handleEmailInput"
-          />
-          <label for="sla_missed_next_response">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.SLA_MISSED_NEXT_RESPONSE'
-              )
-            }}
-          </label>
-        </div>
-        <div v-if="isSLAEnabled" class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedEmailFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="email_sla_missed_resolution"
-            @input="handleEmailInput"
-          />
-          <label for="sla_missed_resolution">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.SLA_MISSED_RESOLUTION'
-              )
-            }}
-          </label>
-        </div>
-      </div>
-    </div>
-    <div
-      v-if="vapidPublicKey && hasPushAPISupport"
-      class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center push-row"
-    >
-      <div class="w-1/4">
-        <h4 class="text-lg text-black-900 dark:text-slate-200">
-          {{ $t('PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.TITLE') }}
-        </h4>
-        <p>{{ $t('PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.NOTE') }}</p>
-      </div>
-      <div class="w-[45%] p-4">
-        <p v-if="hasEnabledPushPermissions">
-          {{
-            $t(
-              'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.HAS_ENABLED_PUSH'
-            )
-          }}
-        </p>
-        <div v-else class="push-notification--button">
-          <woot-submit-button
-            :button-text="
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.REQUEST_PUSH'
-              )
-            "
-            class="button nice small"
-            type="button"
-            @click="onRequestPermissions"
-          />
-        </div>
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedPushFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="push_conversation_creation"
-            @input="handlePushInput"
-          />
-          <label for="conversation_creation">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.CONVERSATION_CREATION'
-              )
-            }}
-          </label>
-        </div>
-
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedPushFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="push_conversation_assignment"
-            @input="handlePushInput"
-          />
-          <label for="conversation_assignment">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.CONVERSATION_ASSIGNMENT'
-              )
-            }}
-          </label>
-        </div>
-
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedPushFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="push_conversation_mention"
-            @input="handlePushInput"
-          />
-          <label for="conversation_mention">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.CONVERSATION_MENTION'
-              )
-            }}
-          </label>
-        </div>
-
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedPushFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="push_assigned_conversation_new_message"
-            @input="handlePushInput"
-          />
-          <label for="assigned_conversation_new_message">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.ASSIGNED_CONVERSATION_NEW_MESSAGE'
-              )
-            }}
-          </label>
-        </div>
-
-        <div class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedPushFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="push_participating_conversation_new_message"
-            @input="handlePushInput"
-          />
-          <label for="assigned_conversation_new_message">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.PARTICIPATING_CONVERSATION_NEW_MESSAGE'
-              )
-            }}
-          </label>
-        </div>
-
-        <div v-if="isSLAEnabled" class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedPushFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="push_sla_missed_first_response"
-            @input="handlePushInput"
-          />
-          <label for="sla_missed_first_response">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.SLA_MISSED_FIRST_RESPONSE'
-              )
-            }}
-          </label>
-        </div>
-
-        <div v-if="isSLAEnabled" class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedPushFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="push_sla_missed_next_response"
-            @input="handlePushInput"
-          />
-          <label for="sla_missed_next_response">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.SLA_MISSED_NEXT_RESPONSE'
-              )
-            }}
-          </label>
-        </div>
-
-        <div v-if="isSLAEnabled" class="flex items-center gap-2 mb-1">
-          <input
-            v-model="selectedPushFlags"
-            class="notification--checkbox"
-            type="checkbox"
-            value="push_sla_missed_resolution"
-            @input="handlePushInput"
-          />
-          <label for="sla_missed_resolution">
-            {{
-              $t(
-                'PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.SLA_MISSED_RESOLUTION'
-              )
-            }}
-          </label>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import alertMixin from 'shared/mixins/alertMixin';
-import configMixin from 'shared/mixins/configMixin';
-import uiSettingsMixin from 'dashboard/mixins/uiSettings';
-import {
-  hasPushPermissions,
-  requestPushPermissions,
-  verifyServiceWorkerExistence,
-} from '../../../../helper/pushHelper';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
-
-export default {
-  mixins: [alertMixin, configMixin, uiSettingsMixin],
-  data() {
-    return {
-      selectedEmailFlags: [],
-      selectedPushFlags: [],
-      enableAudioAlerts: false,
-      hasEnabledPushPermissions: false,
-      playAudioWhenTabIsInactive: false,
-      alertIfUnreadConversationExist: false,
-      notificationTone: 'ding',
-      notificationAlertTones: [
-        {
-          value: 'ding',
-          label: 'Ding',
-        },
-        {
-          value: 'bell',
-          label: 'Bell',
-        },
-      ],
-    };
-  },
-  computed: {
-    ...mapGetters({
-      accountId: 'getCurrentAccountId',
-      emailFlags: 'userNotificationSettings/getSelectedEmailFlags',
-      pushFlags: 'userNotificationSettings/getSelectedPushFlags',
-      uiSettings: 'getUISettings',
-      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
-    }),
-    hasPushAPISupport() {
-      return !!('Notification' in window);
-    },
-    isSLAEnabled() {
-      return this.isFeatureEnabledonAccount(this.accountId, FEATURE_FLAGS.SLA);
-    },
-  },
-  watch: {
-    emailFlags(value) {
-      this.selectedEmailFlags = value;
-    },
-    pushFlags(value) {
-      this.selectedPushFlags = value;
-    },
-    uiSettings(value) {
-      this.notificationUISettings(value);
-    },
-  },
-  mounted() {
-    if (hasPushPermissions()) {
-      this.getPushSubscription();
-    }
-    this.notificationUISettings(this.uiSettings);
-    this.$store.dispatch('userNotificationSettings/get');
-  },
-  methods: {
-    notificationUISettings(uiSettings) {
-      const {
-        enable_audio_alerts: enableAudio = false,
-        always_play_audio_alert: alwaysPlayAudioAlert,
-        alert_if_unread_assigned_conversation_exist:
-          alertIfUnreadConversationExist,
-        notification_tone: notificationTone,
-      } = uiSettings;
-      this.enableAudioAlerts = enableAudio;
-      this.playAudioWhenTabIsInactive = !alwaysPlayAudioAlert;
-      this.alertIfUnreadConversationExist = alertIfUnreadConversationExist;
-      this.notificationTone = notificationTone || 'ding';
-    },
-    onRegistrationSuccess() {
-      this.hasEnabledPushPermissions = true;
-    },
-    onRequestPermissions() {
-      requestPushPermissions({
-        onSuccess: this.onRegistrationSuccess,
-      });
-    },
-    getPushSubscription() {
-      verifyServiceWorkerExistence(registration =>
-        registration.pushManager
-          .getSubscription()
-          .then(subscription => {
-            if (!subscription) {
-              this.hasEnabledPushPermissions = false;
-            } else {
-              this.hasEnabledPushPermissions = true;
-            }
-          })
-          // eslint-disable-next-line no-console
-          .catch(error => console.log(error))
-      );
-    },
-    async updateNotificationSettings() {
-      try {
-        this.$store.dispatch('userNotificationSettings/update', {
-          selectedEmailFlags: this.selectedEmailFlags,
-          selectedPushFlags: this.selectedPushFlags,
-        });
-        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
-      } catch (error) {
-        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_ERROR'));
-      }
-    },
-    handleEmailInput(e) {
-      this.selectedEmailFlags = this.toggleInput(
-        this.selectedEmailFlags,
-        e.target.value
-      );
-
-      this.updateNotificationSettings();
-    },
-    handlePushInput(e) {
-      this.selectedPushFlags = this.toggleInput(
-        this.selectedPushFlags,
-        e.target.value
-      );
-
-      this.updateNotificationSettings();
-    },
-    handleAudioInput(e) {
-      this.enableAudioAlerts = e.target.value;
-      this.updateUISettings({
-        enable_audio_alerts: this.enableAudioAlerts,
-      });
-      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
-    },
-    handleAudioAlertConditions(e) {
-      let condition = e.target.value;
-      if (condition === 'tab_is_inactive') {
-        this.updateUISettings({
-          always_play_audio_alert: !e.target.checked,
-        });
-      } else if (condition === 'conversations_are_read') {
-        this.updateUISettings({
-          alert_if_unread_assigned_conversation_exist: e.target.checked,
-        });
-      }
-      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
-    },
-    handleAudioToneChange(e) {
-      this.updateUISettings({ notification_tone: e.target.value });
-      this.showAlert(this.$t('PROFILE_SETTINGS.FORM.API.UPDATE_SUCCESS'));
-    },
-    toggleInput(selected, current) {
-      if (selected.includes(current)) {
-        const newSelectedFlags = selected.filter(flag => flag !== current);
-        return newSelectedFlags;
-      }
-      return [...selected, current];
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import '~dashboard/assets/scss/variables.scss';
-
-.notification--checkbox {
-  font-size: $font-size-large;
-}
-
-.push-notification--button {
-  margin-bottom: var(--space-one);
-}
-
-.notification-label {
-  display: flex;
-  font-weight: var(--font-weight-bold);
-  margin-bottom: var(--space-small);
-}
-
-.tone-selector {
-  height: var(--space-large);
-  padding-bottom: var(--space-micro);
-  padding-top: var(--space-micro);
-  width: var(--space-mega);
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/UserBasicDetails.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/UserBasicDetails.vue
new file mode 100644
index 0000000000000..1a0fb2eae7830
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/UserBasicDetails.vue
@@ -0,0 +1,135 @@
+<template>
+  <form class="flex flex-col gap-4" @submit.prevent="updateUser('profile')">
+    <woot-input
+      v-model="userName"
+      :styles="inputStyles"
+      :class="{ error: $v.userName.$error }"
+      :label="$t('PROFILE_SETTINGS.FORM.NAME.LABEL')"
+      :placeholder="$t('PROFILE_SETTINGS.FORM.NAME.PLACEHOLDER')"
+      :error="`${
+        $v.userName.$error ? $t('PROFILE_SETTINGS.FORM.NAME.ERROR') : ''
+      }`"
+      @input="$v.userName.$touch"
+    />
+    <woot-input
+      v-model="userDisplayName"
+      :styles="inputStyles"
+      :class="{ error: $v.userDisplayName.$error }"
+      :label="$t('PROFILE_SETTINGS.FORM.DISPLAY_NAME.LABEL')"
+      :placeholder="$t('PROFILE_SETTINGS.FORM.DISPLAY_NAME.PLACEHOLDER')"
+      :error="`${
+        $v.userDisplayName.$error
+          ? $t('PROFILE_SETTINGS.FORM.DISPLAY_NAME.ERROR')
+          : ''
+      }`"
+      @input="$v.userDisplayName.$touch"
+    />
+    <woot-input
+      v-if="emailEnabled"
+      v-model="userEmail"
+      :styles="inputStyles"
+      :class="{ error: $v.userEmail.$error }"
+      :label="$t('PROFILE_SETTINGS.FORM.EMAIL.LABEL')"
+      :placeholder="$t('PROFILE_SETTINGS.FORM.EMAIL.PLACEHOLDER')"
+      :error="`${
+        $v.userEmail.$error ? $t('PROFILE_SETTINGS.FORM.EMAIL.ERROR') : ''
+      }`"
+      @input="$v.userEmail.$touch"
+    />
+    <form-button
+      type="submit"
+      color-scheme="primary"
+      variant="solid"
+      size="large"
+    >
+      {{ $t('PROFILE_SETTINGS.BTN_TEXT') }}
+    </form-button>
+  </form>
+</template>
+<script>
+import FormButton from 'v3/components/Form/Button.vue';
+import { required, minLength, email } from 'vuelidate/lib/validators';
+import alertMixin from 'shared/mixins/alertMixin';
+export default {
+  components: {
+    FormButton,
+  },
+  mixins: [alertMixin],
+  props: {
+    name: {
+      type: String,
+      default: '',
+    },
+    email: {
+      type: String,
+      default: '',
+    },
+    displayName: {
+      type: String,
+      default: '',
+    },
+    emailEnabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      userName: this.name,
+      userDisplayName: this.displayName,
+      userEmail: this.email,
+      inputStyles: {
+        borderRadius: '12px',
+        padding: '6px 12px',
+        fontSize: '14px',
+        marginBottom: '2px',
+      },
+    };
+  },
+  validations: {
+    userName: {
+      required,
+      minLength: minLength(1),
+    },
+    userDisplayName: {},
+    userEmail: {
+      required,
+      email,
+    },
+  },
+  watch: {
+    name: {
+      handler(value) {
+        this.userName = value;
+      },
+      immediate: true,
+    },
+    displayName: {
+      handler(value) {
+        this.userDisplayName = value;
+      },
+      immediate: true,
+    },
+    email: {
+      handler(value) {
+        this.userEmail = value;
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    async updateUser() {
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.ERROR'));
+        return;
+      }
+      this.$emit('update-user', {
+        name: this.userName,
+        displayName: this.userDisplayName,
+        email: this.userEmail,
+      });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/UserProfilePicture.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/UserProfilePicture.vue
new file mode 100644
index 0000000000000..d4ab08bc1c90e
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/UserProfilePicture.vue
@@ -0,0 +1,40 @@
+<template>
+  <div class="flex flex-col gap-2">
+    <span class="text-sm font-medium text-ash-900">
+      {{ $t('PROFILE_SETTINGS.FORM.PICTURE') }}
+    </span>
+    <profile-avatar
+      :src="src"
+      :name="userNameWithoutEmoji"
+      @change="updateProfilePicture"
+      @delete="deleteProfilePicture"
+    />
+  </div>
+</template>
+<script setup>
+import { computed } from 'vue';
+import ProfileAvatar from 'v3/components/Form/ProfileAvatar.vue';
+import { removeEmoji } from 'shared/helpers/emoji';
+const props = defineProps({
+  src: {
+    type: String,
+    default: '',
+  },
+  name: {
+    type: String,
+    default: '',
+  },
+});
+
+const emits = defineEmits(['change', 'delete']);
+
+const userNameWithoutEmoji = computed(() => removeEmoji(props.name));
+
+const updateProfilePicture = e => {
+  emits('change', e);
+};
+
+const deleteProfilePicture = () => {
+  emits('delete');
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Wrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Wrapper.vue
new file mode 100644
index 0000000000000..f0931afdc5c3f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Wrapper.vue
@@ -0,0 +1,19 @@
+<template>
+  <div
+    class="flex flex-col justify-between flex-1 h-full m-0 overflow-auto bg-white dark:bg-slate-900"
+  >
+    <keep-alive v-if="keepAlive">
+      <router-view />
+    </keep-alive>
+    <router-view v-else />
+  </div>
+</template>
+
+<script setup>
+defineProps({
+  keepAlive: {
+    type: Boolean,
+    default: true,
+  },
+});
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/constants.js b/app/javascript/dashboard/routes/dashboard/settings/profile/constants.js
new file mode 100644
index 0000000000000..e25d5b52a9003
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/constants.js
@@ -0,0 +1,52 @@
+export const NOTIFICATION_TYPES = [
+  {
+    label: 'PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPES.CONVERSATION_CREATED',
+    value: 'conversation_creation',
+  },
+  {
+    label: 'PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPES.CONVERSATION_ASSIGNED',
+    value: 'conversation_assignment',
+  },
+  {
+    label: 'PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPES.CONVERSATION_MENTION',
+    value: 'conversation_mention',
+  },
+  {
+    label:
+      'PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPES.ASSIGNED_CONVERSATION_NEW_MESSAGE',
+    value: 'assigned_conversation_new_message',
+  },
+  {
+    label:
+      'PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPES.PARTICIPATING_CONVERSATION_NEW_MESSAGE',
+    value: 'participating_conversation_new_message',
+  },
+  {
+    label:
+      'PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPES.SLA_MISSED_FIRST_RESPONSE',
+    value: 'sla_missed_first_response',
+  },
+  {
+    label: 'PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPES.SLA_MISSED_NEXT_RESPONSE',
+    value: 'sla_missed_next_response',
+  },
+  {
+    label: 'PROFILE_SETTINGS.FORM.NOTIFICATIONS.TYPES.SLA_MISSED_RESOLUTION',
+    value: 'sla_missed_resolution',
+  },
+];
+
+export const ALERT_EVENTS = [
+  {
+    value: 'none',
+    label: 'none',
+  },
+  {
+    value: 'mine',
+    label: 'mine',
+  },
+  {
+    value: 'all',
+    label: 'all',
+  },
+];
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/profile.routes.js b/app/javascript/dashboard/routes/dashboard/settings/profile/profile.routes.js
index 634d15491736f..357c20e85ff6a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/profile.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/profile.routes.js
@@ -1,6 +1,6 @@
 import { frontendURL } from '../../../../helper/URLHelper';
 
-const SettingsContent = () => import('../Wrapper.vue');
+const SettingsContent = () => import('./Wrapper.vue');
 const Index = () => import('./Index.vue');
 
 export default {
@@ -10,12 +10,6 @@ export default {
       name: 'profile_settings',
       roles: ['administrator', 'agent'],
       component: SettingsContent,
-      props: {
-        headerTitle: 'PROFILE_SETTINGS.TITLE',
-        icon: 'edit',
-        showNewButton: false,
-        showSidemenuIcon: false,
-      },
       children: [
         {
           path: 'settings',
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
index fb7e7b5eb1b3d..6f28dabb54b67 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
@@ -1,308 +1,173 @@
+<script setup>
+import { computed } from 'vue';
+
+import format from 'date-fns/format';
+import getDay from 'date-fns/getDay';
+
+import { getQuantileIntervals } from '@chatwoot/utils';
+
+import { groupHeatmapByDay } from 'helpers/ReportsDataHelper';
+import { useI18n } from 'dashboard/composables/useI18n';
+
+const { t } = useI18n();
+const props = defineProps({
+  heatData: {
+    type: Array,
+    default: () => [],
+  },
+  isLoading: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const processedData = computed(() => {
+  return groupHeatmapByDay(props.heatData);
+});
+
+const quantileRange = computed(() => {
+  const flattendedData = props.heatData.map(data => data.value);
+  return getQuantileIntervals(flattendedData, [0.2, 0.4, 0.6, 0.8, 0.9, 0.99]);
+});
+
+function getCountTooltip(value) {
+  if (!value) {
+    return t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.NO_CONVERSATIONS');
+  }
+
+  if (value === 1) {
+    return t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.CONVERSATION', {
+      count: value,
+    });
+  }
+
+  return t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.CONVERSATIONS', {
+    count: value,
+  });
+}
+
+function formatDate(dateString) {
+  return format(new Date(dateString), 'MMM d, yyyy');
+}
+
+function getDayOfTheWeek(date) {
+  const dayIndex = getDay(date);
+  const days = [
+    t('DAYS_OF_WEEK.SUNDAY'),
+    t('DAYS_OF_WEEK.MONDAY'),
+    t('DAYS_OF_WEEK.TUESDAY'),
+    t('DAYS_OF_WEEK.WEDNESDAY'),
+    t('DAYS_OF_WEEK.THURSDAY'),
+    t('DAYS_OF_WEEK.FRIDAY'),
+    t('DAYS_OF_WEEK.SATURDAY'),
+  ];
+  return days[dayIndex];
+}
+function getHeatmapLevelClass(value) {
+  if (!value)
+    return 'outline-slate-100 dark:outline-slate-700 dark:bg-slate-700/40 bg-slate-50/50';
+
+  let level = [...quantileRange.value, Infinity].findIndex(
+    range => value <= range && value > 0
+  );
+
+  if (level > 6) level = 5;
+
+  if (level === 0) {
+    return 'outline-slate-100 dark:outline-slate-700 dark:bg-slate-700/40 bg-slate-50/50';
+  }
+
+  const classes = [
+    'bg-woot-50 dark:bg-woot-800/40 dark:outline-woot-800/80',
+    'bg-woot-100 dark:bg-woot-800/30 dark:outline-woot-800/80',
+    'bg-woot-200 dark:bg-woot-500/40 dark:outline-woot-700/80',
+    'bg-woot-300 dark:bg-woot-500/60 dark:outline-woot-600/80',
+    'bg-woot-600 dark:bg-woot-500/80 dark:outline-woot-500/80',
+    'bg-woot-800 dark:bg-woot-500 dark:outline-woot-400/80',
+  ];
+
+  return classes[level - 1];
+}
+</script>
+
 <template>
-  <div class="heatmap-container">
+  <div
+    class="grid relative w-full gap-x-4 gap-y-2.5 overflow-y-scroll md:overflow-visible grid-cols-[80px_1fr] min-h-72"
+  >
     <template v-if="isLoading">
-      <div class="heatmap-labels">
+      <div class="grid gap-[5px] flex-shrink-0">
         <div
           v-for="ii in 7"
           :key="ii"
-          class="loading-cell heatmap-axis-label"
+          class="w-full rounded-sm bg-slate-100 dark:bg-slate-900 animate-loader-pulse h-8 min-w-[70px]"
         />
       </div>
-      <div class="heatmap-grid">
-        <div v-for="ii in 7" :key="ii" class="heatmap-grid-row">
-          <div v-for="jj in 24" :key="jj" class="heatmap-tile loading-cell">
-            <div class="heatmap-tile__label loading-cell" />
-          </div>
+      <div class="grid gap-[5px] w-full min-w-[700px]">
+        <div
+          v-for="ii in 7"
+          :key="ii"
+          class="grid gap-[5px] grid-cols-[repeat(24,_1fr)]"
+        >
+          <div
+            v-for="jj in 24"
+            :key="jj"
+            class="w-full h-8 rounded-sm bg-slate-100 dark:bg-slate-900 animate-loader-pulse"
+          />
         </div>
       </div>
-      <div class="heatmap-timeline" />
-      <div class="heatmap-markers">
-        <div v-for="ii in 24" :key="ii">{{ ii - 1 }} – {{ ii }}</div>
+      <div />
+      <div
+        class="grid grid-cols-[repeat(24,_1fr)] gap-[5px] w-full text-[8px] font-semibold h-5 text-slate-800 dark:text-slate-200"
+      >
+        <div
+          v-for="ii in 24"
+          :key="ii"
+          class="flex items-center justify-center"
+        >
+          {{ ii - 1 }} – {{ ii }}
+        </div>
       </div>
     </template>
     <template v-else>
-      <div class="heatmap-labels">
+      <div class="grid gap-[5px] flex-shrink-0">
         <div
           v-for="dateKey in processedData.keys()"
           :key="dateKey"
-          class="heatmap-axis-label"
+          class="h-8 min-w-[70px] text-slate-800 dark:text-slate-200 text-[10px] font-semibold flex flex-col items-end justify-center"
         >
           {{ getDayOfTheWeek(new Date(dateKey)) }}
-          <time>{{ formatDate(dateKey) }}</time>
+          <time class="font-normal text-slate-700 dark:text-slate-200">
+            {{ formatDate(dateKey) }}
+          </time>
         </div>
       </div>
-      <div class="heatmap-grid">
+      <div class="grid gap-[5px] w-full min-w-[700px]">
         <div
           v-for="dateKey in processedData.keys()"
           :key="dateKey"
-          class="heatmap-grid-row"
+          class="grid gap-[5px] grid-cols-[repeat(24,_1fr)]"
         >
           <div
             v-for="data in processedData.get(dateKey)"
             :key="data.timestamp"
             v-tooltip.top="getCountTooltip(data.value)"
-            class="heatmap-tile"
+            class="h-8 rounded-sm shadow-inner dark:outline dark:outline-1 shadow-black"
             :class="getHeatmapLevelClass(data.value)"
-          >
-            <div class="heatmap-tile__label" />
-          </div>
+          />
         </div>
       </div>
-      <div class="heatmap-timeline" />
-      <div class="heatmap-markers">
-        <div v-for="ii in 24" :key="ii">{{ ii - 1 }} – {{ ii }}</div>
+      <div />
+      <div
+        class="grid grid-cols-[repeat(24,_1fr)] gap-[5px] w-full text-[8px] font-semibold h-5 text-slate-800 dark:text-slate-200"
+      >
+        <div
+          v-for="ii in 24"
+          :key="ii"
+          class="flex items-center justify-center"
+        >
+          {{ ii - 1 }} – {{ ii }}
+        </div>
       </div>
     </template>
   </div>
 </template>
-<script>
-import { getQuantileIntervals } from '@chatwoot/utils';
-import format from 'date-fns/format';
-import getDay from 'date-fns/getDay';
-
-import { groupHeatmapByDay } from 'helpers/ReportsDataHelper';
-
-export default {
-  name: 'Heatmap',
-  props: {
-    heatData: {
-      type: Array,
-      default: () => [],
-    },
-    isLoading: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  computed: {
-    processedData() {
-      return groupHeatmapByDay(this.heatData);
-    },
-    quantileRange() {
-      const flattendedData = this.heatData.map(data => data.value);
-      return getQuantileIntervals(
-        flattendedData,
-        [0.2, 0.4, 0.6, 0.8, 0.9, 0.99]
-      );
-    },
-  },
-  methods: {
-    getCountTooltip(value) {
-      if (!value) {
-        return this.$t(
-          'OVERVIEW_REPORTS.CONVERSATION_HEATMAP.NO_CONVERSATIONS'
-        );
-      }
-
-      if (value === 1) {
-        return this.$t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.CONVERSATION', {
-          count: value,
-        });
-      }
-
-      return this.$t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.CONVERSATIONS', {
-        count: value,
-      });
-    },
-    formatDate(dateString) {
-      return format(new Date(dateString), 'MMM d, yyyy');
-    },
-    getDayOfTheWeek(date) {
-      const dayIndex = getDay(date);
-      const days = [
-        this.$t('DAYS_OF_WEEK.SUNDAY'),
-        this.$t('DAYS_OF_WEEK.MONDAY'),
-        this.$t('DAYS_OF_WEEK.TUESDAY'),
-        this.$t('DAYS_OF_WEEK.WEDNESDAY'),
-        this.$t('DAYS_OF_WEEK.THURSDAY'),
-        this.$t('DAYS_OF_WEEK.FRIDAY'),
-        this.$t('DAYS_OF_WEEK.SATURDAY'),
-      ];
-      return days[dayIndex];
-    },
-    getHeatmapLevelClass(value) {
-      if (!value) return '';
-
-      const level = [...this.quantileRange, Infinity].findIndex(
-        range => value <= range && value > 0
-      );
-
-      if (level > 6) {
-        return 'l6';
-      }
-
-      return `l${level}`;
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-$heatmap-colors: (
-  level-1: var(--w-50),
-  level-2: var(--w-100),
-  level-3: var(--w-300),
-  level-4: var(--w-500),
-  level-5: var(--w-700),
-  level-6: var(--w-900),
-);
-
-$heatmap-hover-border-color: (
-  level-1: var(--w-25),
-  level-2: var(--w-50),
-  level-3: var(--w-100),
-  level-4: var(--w-300),
-  level-5: var(--w-500),
-  level-6: var(--w-700),
-);
-
-$tile-height: 1.875rem;
-$tile-gap: var(--space-smaller);
-$container-gap-row: var(--space-one);
-$container-gap-column: var(--space-two);
-$marker-height: var(--space-two);
-
-@mixin heatmap-level($level) {
-  $color: map-get($heatmap-colors, 'level-#{$level}');
-  background-color: $color;
-  &:hover {
-    border: 1px solid map-get($heatmap-hover-border-color, 'level-#{$level}');
-  }
-}
-
-@media screen and (max-width: 768px) {
-  .heatmap-container {
-    overflow-y: auto;
-  }
-}
-
-.loading-cell {
-  background-color: var(--color-background-light);
-  border: 0px;
-
-  animation: loading-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
-}
-
-@keyframes loading-pulse {
-  0%,
-  100% {
-    opacity: 1;
-  }
-  50% {
-    opacity: 0;
-  }
-}
-
-.heatmap-container {
-  display: grid;
-  position: relative;
-  width: 100%;
-  gap: $container-gap-row $container-gap-column;
-  grid-template-columns: 80px 1fr;
-  min-height: calc(
-    7 * #{$tile-height} + 6 * #{$tile-gap} + #{$container-gap-row} + #{$marker-height}
-  );
-}
-
-.heatmap-labels {
-  display: grid;
-  grid-template-rows: 1fr;
-  gap: $tile-gap;
-  flex-shrink: 0;
-
-  .heatmap-axis-label {
-    height: $tile-height;
-    min-width: 70px;
-    font-size: var(--font-size-micro);
-    font-weight: var(--font-weight-bold);
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-    justify-content: center;
-    @apply text-slate-800 dark:text-slate-200;
-
-    time {
-      font-size: var(--font-size-micro);
-      font-weight: var(--font-weight-normal);
-      @apply text-slate-700 dark:text-slate-200;
-    }
-  }
-}
-
-.heatmap-grid {
-  display: grid;
-  grid-template-rows: 1fr;
-  gap: $tile-gap;
-  min-width: 700px;
-  width: 100%;
-
-  .heatmap-grid-row {
-    display: grid;
-    gap: $tile-gap;
-    grid-template-columns: repeat(24, 1fr);
-  }
-
-  .heatmap-tile {
-    width: auto;
-    height: $tile-height;
-    border-radius: var(--border-radius-normal);
-
-    &:hover {
-      box-shadow: var(--shadow-large);
-
-      transform: translateY(-2px);
-      transition:
-        transform 0.2s ease-in-out,
-        box-shadow 0.2s ease-in-out;
-    }
-
-    &:not(.l1):not(.l2):not(.l3):not(.l4):not(.l5):not(.l6) {
-      background-color: var(--color-background-light);
-      border: 1px solid var(--color-border-light);
-
-      &:hover {
-        transform: translateY(0);
-        box-shadow: none;
-        border: 1px solid var(--color-border-light);
-      }
-    }
-
-    &.l1 {
-      @include heatmap-level(1);
-    }
-    &.l2 {
-      @include heatmap-level(2);
-    }
-    &.l3 {
-      @include heatmap-level(3);
-    }
-    &.l4 {
-      @include heatmap-level(4);
-    }
-    &.l5 {
-      @include heatmap-level(5);
-    }
-    &.l6 {
-      @include heatmap-level(6);
-    }
-  }
-}
-
-.heatmap-markers {
-  display: grid;
-  grid-template-columns: repeat(24, 1fr);
-  gap: $tile-gap;
-  width: 100%;
-  font-size: var(--font-size-nano);
-  font-weight: var(--font-weight-bold);
-  height: $marker-height;
-  color: var(--color-body);
-  @apply text-slate-800 dark:text-slate-200;
-
-  div {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportFilters.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportFilters.vue
index 123a921fc1554..16fbbcf40df11 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAReportFilters.vue
@@ -1,24 +1,10 @@
 <template>
   <div class="flex flex-col flex-wrap w-full gap-3 md:flex-row">
-    <reports-filters-date-range
-      class="sm:min-w-[200px] tiny h-8"
-      @on-range-change="onDateRangeChange"
-    />
-    <woot-date-range-picker
-      v-if="isDateRangeSelected"
-      show-range
-      class="no-margin auto-width sm:min-w-[240px] small h-8"
-      :value="customDateRange"
-      :confirm-text="$t('REPORT.CUSTOM_DATE_RANGE.CONFIRM')"
-      :placeholder="$t('REPORT.CUSTOM_DATE_RANGE.PLACEHOLDER')"
-      @change="onCustomDateRangeChange"
-    />
+    <woot-date-picker @dateRangeChanged="onDateRangeChange" />
     <SLA-filter @filter-change="emitFilterChange" />
   </div>
 </template>
 <script>
-import WootDateRangePicker from 'dashboard/components/ui/DateRangePicker.vue';
-import ReportsFiltersDateRange from '../Filters/DateRange.vue';
 import SLAFilter from '../SLA/SLAFilter.vue';
 import subDays from 'date-fns/subDays';
 import { DATE_RANGE_OPTIONS } from '../../constants';
@@ -26,8 +12,6 @@ import { getUnixStartOfDay, getUnixEndOfDay } from 'helpers/DateHelper';
 
 export default {
   components: {
-    WootDateRangePicker,
-    ReportsFiltersDateRange,
     SLAFilter,
   },
 
@@ -39,25 +23,11 @@ export default {
     };
   },
   computed: {
-    isDateRangeSelected() {
-      return (
-        this.selectedDateRange.id === DATE_RANGE_OPTIONS.CUSTOM_DATE_RANGE.id
-      );
-    },
     to() {
-      if (this.isDateRangeSelected) {
-        return getUnixEndOfDay(this.customDateRange[1]);
-      }
-      return getUnixEndOfDay(new Date());
+      return getUnixEndOfDay(this.customDateRange[1]);
     },
     from() {
-      if (this.isDateRangeSelected) {
-        return getUnixStartOfDay(this.customDateRange[0]);
-      }
-
-      const { offset } = this.selectedDateRange;
-      const fromDate = subDays(new Date(), offset);
-      return getUnixStartOfDay(fromDate);
+      return getUnixStartOfDay(this.customDateRange[0]);
     },
   },
   watch: {
@@ -66,9 +36,20 @@ export default {
     },
   },
   mounted() {
-    this.emitChange();
+    this.setInitialRange();
   },
   methods: {
+    setInitialRange() {
+      const { offset } = this.selectedDateRange;
+      const fromDate = subDays(new Date(), offset);
+      const from = getUnixStartOfDay(fromDate);
+      const to = getUnixEndOfDay(new Date());
+      this.$emit('filter-change', {
+        from,
+        to,
+        ...this.selectedGroupByFilter,
+      });
+    },
     emitChange() {
       const { from, to } = this;
       this.$emit('filter-change', {
@@ -81,11 +62,7 @@ export default {
       this.selectedGroupByFilter = params;
       this.emitChange();
     },
-    onDateRangeChange(selectedRange) {
-      this.selectedDateRange = selectedRange;
-      this.emitChange();
-    },
-    onCustomDateRangeChange(value) {
+    onDateRangeChange(value) {
       this.customDateRange = value;
       this.emitChange();
     },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAViewDetails.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAViewDetails.vue
index cdeda0af2e064..be40349fe3809 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAViewDetails.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/SLA/SLAViewDetails.vue
@@ -22,14 +22,11 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import SLAPopoverCard from 'dashboard/components/widgets/conversation/components/SLAPopoverCard.vue';
 export default {
   components: {
     SLAPopoverCard,
   },
-  mixins: [clickaway],
-
   props: {
     slaEvents: {
       type: Array,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index 98b81f47c4dc1..dd5291fe8ccc5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -13,11 +13,11 @@ import integrationapps from './integrationapps/integrations.routes';
 import integrations from './integrations/integrations.routes';
 import labels from './labels/labels.routes';
 import macros from './macros/macros.routes';
-import profile from './profile/profile.routes';
 import reports from './reports/reports.routes';
 import store from '../../../store';
 import sla from './sla/sla.routes';
 import teams from './teams/teams.routes';
+import profile from './profile/profile.routes';
 
 export default {
   routes: [
@@ -46,9 +46,9 @@ export default {
     ...integrations.routes,
     ...labels.routes,
     ...macros.routes,
-    ...profile.routes,
     ...reports.routes,
     ...sla.routes,
     ...teams.routes,
+    ...profile.routes,
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAPaywallEnterprise.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAPaywallEnterprise.vue
index f5f8707c12c4e..6c69baa4c990f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAPaywallEnterprise.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAPaywallEnterprise.vue
@@ -45,7 +45,7 @@ const i18nKey = props.isOnChatwootCloud ? 'PAYWALL' : 'ENTERPRISE_PAYWALL';
           {{ $t('SLA.ENTERPRISE_PAYWALL.ASK_ADMIN') }}
         </span>
       </p>
-      <template v-if="isOnChatwootCloud">
+      <template v-if="isOnChatwootCloud || true">
         <woot-button
           color-scheme="primary"
           class="w-full mt-2 text-center rounded-xl"
@@ -55,8 +55,11 @@ const i18nKey = props.isOnChatwootCloud ? 'PAYWALL' : 'ENTERPRISE_PAYWALL';
         >
           {{ $t('SLA.PAYWALL.UPGRADE_NOW') }}
         </woot-button>
+        <span class="mt-2 text-xs tracking-tight text-center">
+          {{ $t('SLA.PAYWALL.CANCEL_ANYTIME') }}
+        </span>
       </template>
-      <template v-if="isSuperAdmin">
+      <template v-else-if="isSuperAdmin">
         <a href="/super_admin" class="block w-full">
           <woot-button
             color-scheme="primary"
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 2f8a9c1e5159d..4f5b5af6bf1e2 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -46,26 +46,8 @@ import webhooks from './modules/webhooks';
 import draftMessages from './modules/draftMessages';
 import SLAReports from './modules/SLAReports';
 
-import LogRocket from 'logrocket';
-import createPlugin from 'logrocket-vuex';
-
 const plugins = [];
 
-if (window.logRocketProjectId) {
-  LogRocket.init(window.logRocketProjectId);
-  // eslint-disable-next-line func-names
-  const logRocketPlugin = createPlugin(LogRocket, function (mutation) {
-    const eventsToIgnore = ['SET_CURRENT_USER', 'AUTHENTICATE', 'CLEAR_USER'];
-    if (eventsToIgnore.includes(mutation.type)) {
-      return null;
-    }
-
-    return mutation;
-  });
-
-  plugins.push(logRocketPlugin);
-}
-
 Vue.use(Vuex);
 export default new Vuex.Store({
   modules: {
diff --git a/app/javascript/dashboard/store/modules/bulkActions.js b/app/javascript/dashboard/store/modules/bulkActions.js
index 709f4875af761..2c34f8d5f6d57 100644
--- a/app/javascript/dashboard/store/modules/bulkActions.js
+++ b/app/javascript/dashboard/store/modules/bulkActions.js
@@ -2,6 +2,7 @@ import types from '../mutation-types';
 import BulkActionsAPI from '../../api/bulkActions';
 
 export const state = {
+  selectedConversationIds: [],
   uiFlags: {
     isUpdating: false,
   },
@@ -11,6 +12,9 @@ export const getters = {
   getUIFlags(_state) {
     return _state.uiFlags;
   },
+  getSelectedConversationIds(_state) {
+    return _state.selectedConversationIds;
+  },
 };
 
 export const actions = {
@@ -24,6 +28,15 @@ export const actions = {
       commit(types.SET_BULK_ACTIONS_FLAG, { isUpdating: false });
     }
   },
+  setSelectedConversationIds({ commit }, id) {
+    commit(types.SET_SELECTED_CONVERSATION_IDS, id);
+  },
+  removeSelectedConversationIds({ commit }, id) {
+    commit(types.REMOVE_SELECTED_CONVERSATION_IDS, id);
+  },
+  clearSelectedConversationIds({ commit }) {
+    commit(types.CLEAR_SELECTED_CONVERSATION_IDS);
+  },
 };
 
 export const mutations = {
@@ -33,6 +46,23 @@ export const mutations = {
       ...data,
     };
   },
+  [types.SET_SELECTED_CONVERSATION_IDS](_state, ids) {
+    // Check if ids is an array, if not, convert it to an array
+    const idsArray = Array.isArray(ids) ? ids : [ids];
+
+    // Concatenate the new IDs ensuring no duplicates
+    _state.selectedConversationIds = [
+      ...new Set([..._state.selectedConversationIds, ...idsArray]),
+    ];
+  },
+  [types.REMOVE_SELECTED_CONVERSATION_IDS](_state, id) {
+    _state.selectedConversationIds = _state.selectedConversationIds.filter(
+      item => item !== id
+    );
+  },
+  [types.CLEAR_SELECTED_CONVERSATION_IDS](_state) {
+    _state.selectedConversationIds = [];
+  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
index 9303b3b31663d..deb1c96d1f222 100644
--- a/app/javascript/dashboard/store/modules/contacts/actions.js
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -138,9 +138,10 @@ export const actions = {
     }
   },
 
-  export: async ({ commit }) => {
+  export: async ({ commit }, { payload, label }) => {
     try {
-      await ContactAPI.exportContacts();
+      await ContactAPI.exportContacts({ payload, label });
+
       commit(types.SET_CONTACT_UI_FLAG, { isCreating: false });
     } catch (error) {
       commit(types.SET_CONTACT_UI_FLAG, { isCreating: false });
diff --git a/app/javascript/dashboard/store/modules/specs/bulkActions/actions.spec.js b/app/javascript/dashboard/store/modules/specs/bulkActions/actions.spec.js
index 5342c46fd55a0..91190c1a27bff 100644
--- a/app/javascript/dashboard/store/modules/specs/bulkActions/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/bulkActions/actions.spec.js
@@ -25,4 +25,28 @@ describe('#actions', () => {
       ]);
     });
   });
+  describe('#setSelectedConversationIds', () => {
+    it('sends correct actions if API is success', async () => {
+      await actions.setSelectedConversationIds({ commit }, payload.ids);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_SELECTED_CONVERSATION_IDS, payload.ids],
+      ]);
+    });
+  });
+  describe('#removeSelectedConversationIds', () => {
+    it('sends correct actions if API is success', async () => {
+      await actions.removeSelectedConversationIds({ commit }, payload.ids);
+      expect(commit.mock.calls).toEqual([
+        [types.default.REMOVE_SELECTED_CONVERSATION_IDS, payload.ids],
+      ]);
+    });
+  });
+  describe('#clearSelectedConversationIds', () => {
+    it('sends correct actions if API is success', async () => {
+      await actions.clearSelectedConversationIds({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.CLEAR_SELECTED_CONVERSATION_IDS],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/bulkActions/getters.spec.js b/app/javascript/dashboard/store/modules/specs/bulkActions/getters.spec.js
index 2349e2efb28ed..189c0f552fe14 100644
--- a/app/javascript/dashboard/store/modules/specs/bulkActions/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/bulkActions/getters.spec.js
@@ -11,4 +11,10 @@ describe('#getters', () => {
       isUpdating: false,
     });
   });
+  it('getSelectedConversationIds', () => {
+    const state = {
+      selectedConversationIds: [1, 2, 3],
+    };
+    expect(getters.getSelectedConversationIds(state)).toEqual([1, 2, 3]);
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/bulkActions/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/bulkActions/mutations.spec.js
index 29278c72ef0b3..9d49391593e2e 100644
--- a/app/javascript/dashboard/store/modules/specs/bulkActions/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/bulkActions/mutations.spec.js
@@ -9,4 +9,25 @@ describe('#mutations', () => {
       expect(state.uiFlags.isUpdating).toEqual(true);
     });
   });
+  describe('#setSelectedConversationIds', () => {
+    it('set selected conversation ids', () => {
+      const state = { selectedConversationIds: [] };
+      mutations[types.SET_SELECTED_CONVERSATION_IDS](state, [1, 2, 3]);
+      expect(state.selectedConversationIds).toEqual([1, 2, 3]);
+    });
+  });
+  describe('#removeSelectedConversationIds', () => {
+    it('remove selected conversation ids', () => {
+      const state = { selectedConversationIds: [1, 2, 3] };
+      mutations[types.REMOVE_SELECTED_CONVERSATION_IDS](state, 1);
+      expect(state.selectedConversationIds).toEqual([2, 3]);
+    });
+  });
+  describe('#clearSelectedConversationIds', () => {
+    it('clear selected conversation ids', () => {
+      const state = { selectedConversationIds: [1, 2, 3] };
+      mutations[types.CLEAR_SELECTED_CONVERSATION_IDS](state);
+      expect(state.selectedConversationIds).toEqual([]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index c21fb44e25a63..40db99212ccc0 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -160,6 +160,9 @@ export default {
   SET_CONVERSATION_LABELS_UI_FLAG: 'SET_CONVERSATION_LABELS_UI_FLAG',
   SET_CONVERSATION_LABELS: 'SET_CONVERSATION_LABELS',
   SET_BULK_CONVERSATION_LABELS: 'SET_BULK_CONVERSATION_LABELS',
+  SET_SELECTED_CONVERSATION_IDS: 'SET_SELECTED_CONVERSATION_IDS',
+  CLEAR_SELECTED_CONVERSATION_IDS: 'CLEAR_SELECTED_CONVERSATION_IDS',
+  REMOVE_SELECTED_CONVERSATION_IDS: 'REMOVE_SELECTED_CONVERSATION_IDS',
 
   // Reports
   SET_ACCOUNT_REPORTS: 'SET_ACCOUNT_REPORTS',
diff --git a/app/javascript/packs/portal.js b/app/javascript/packs/portal.js
index 874d3488d175c..874fd6182c2de 100644
--- a/app/javascript/packs/portal.js
+++ b/app/javascript/packs/portal.js
@@ -5,8 +5,10 @@ import Vue from 'vue';
 import { InitializationHelpers } from '../portal/portalHelpers';
 import VueDOMPurifyHTML from 'vue-dompurify-html';
 import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
+import { directive as onClickaway } from 'vue-clickaway';
 
 Vue.use(VueDOMPurifyHTML, domPurifyConfig);
+Vue.directive('on-clickaway', onClickaway);
 
 Rails.start();
 Turbolinks.start();
diff --git a/app/javascript/packs/sdk.js b/app/javascript/packs/sdk.js
index 9bb8314ca48d2..84cf5fe2dba89 100755
--- a/app/javascript/packs/sdk.js
+++ b/app/javascript/packs/sdk.js
@@ -10,14 +10,37 @@ import {
   getUserCookieName,
   hasUserKeys,
 } from '../sdk/cookieHelpers';
-import { addClasses, removeClasses } from '../sdk/DOMHelpers';
+import {
+  addClasses,
+  removeClasses,
+  restoreWidgetInDOM,
+} from '../sdk/DOMHelpers';
 import { setCookieWithDomain } from '../sdk/cookieHelpers';
 import { SDK_SET_BUBBLE_VISIBILITY } from 'shared/constants/sharedFrameEvents';
+
 const runSDK = ({ baseUrl, websiteToken }) => {
   if (window.$chatwoot) {
     return;
   }
 
+  if (window.Turbo) {
+    // if this is a Rails Turbo app
+    document.addEventListener('turbo:before-render', event =>
+      restoreWidgetInDOM(event.detail.newBody)
+    );
+  }
+
+  if (window.Turbolinks) {
+    document.addEventListener('turbolinks:before-render', event => {
+      restoreWidgetInDOM(event.data.newBody);
+    });
+  }
+
+  // if this is an astro app
+  document.addEventListener('astro:before-swap', event =>
+    restoreWidgetInDOM(event.newDocument.body)
+  );
+
   const chatwootSettings = window.chatwootSettings || {};
   let locale = chatwootSettings.locale;
   let baseDomain = chatwootSettings.baseDomain;
diff --git a/app/javascript/packs/widget.js b/app/javascript/packs/widget.js
index e866ecbe46130..1ba477639f9b5 100644
--- a/app/javascript/packs/widget.js
+++ b/app/javascript/packs/widget.js
@@ -12,12 +12,15 @@ import {
   isPhoneNumberValidWithDialCode,
 } from 'shared/helpers/Validators';
 import router from '../widget/router';
+import { directive as onClickaway } from 'vue-clickaway';
+
 import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
 const PhoneInput = () => import('../widget/components/Form/PhoneInput');
 
 Vue.use(VueI18n);
 Vue.use(Vuelidate);
 Vue.use(VueDOMPurifyHTML, domPurifyConfig);
+Vue.directive('on-clickaway', onClickaway);
 
 const i18nConfig = new VueI18n({
   locale: 'en',
diff --git a/app/javascript/portal/application.scss b/app/javascript/portal/application.scss
index 3cdafb6ea1a23..5b4ce77dd3e63 100644
--- a/app/javascript/portal/application.scss
+++ b/app/javascript/portal/application.scss
@@ -7,14 +7,15 @@
 @import 'widget/assets/scss/buttons';
 @import 'widget/assets/scss/mixins';
 @import 'widget/assets/scss/forms';
-@import 'shared/assets/fonts/inter';
+@import 'shared/assets/fonts/InterDisplay/inter-display';
 
 html,
 body {
-  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
+  font-family: 'Inter Display', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   height: 100%;
+  letter-spacing: 0.2px;
 }
 
 
diff --git a/app/javascript/portal/components/PublicArticleSearch.vue b/app/javascript/portal/components/PublicArticleSearch.vue
index f75c9e644f601..1174c636ca77d 100644
--- a/app/javascript/portal/components/PublicArticleSearch.vue
+++ b/app/javascript/portal/components/PublicArticleSearch.vue
@@ -23,8 +23,6 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
-
 import SearchSuggestions from './SearchSuggestions.vue';
 import PublicSearchInput from './PublicSearchInput.vue';
 
@@ -35,7 +33,6 @@ export default {
     PublicSearchInput,
     SearchSuggestions,
   },
-  mixins: [clickaway],
   props: {
     value: {
       type: [String, Number],
diff --git a/app/javascript/portal/components/SearchSuggestions.vue b/app/javascript/portal/components/SearchSuggestions.vue
index effbd5eec2db2..2c9697e144f38 100644
--- a/app/javascript/portal/components/SearchSuggestions.vue
+++ b/app/javascript/portal/components/SearchSuggestions.vue
@@ -109,9 +109,10 @@ export default {
     generateArticleUrl(article) {
       return `/hc/${article.portal.slug}/articles/${article.slug}`;
     },
-    handleKeyboardEvent(e) {
-      this.processKeyDownEvent(e);
-      this.$el.scrollTop = 102 * this.selectedIndex;
+    adjustScroll() {
+      this.$nextTick(() => {
+        this.$el.scrollTop = 102 * this.selectedIndex;
+      });
     },
     prepareContent(content) {
       return this.highlightContent(
diff --git a/app/javascript/portal/components/TableOfContents.vue b/app/javascript/portal/components/TableOfContents.vue
index 81a82dfbf339b..d7b3bb021d1ed 100644
--- a/app/javascript/portal/components/TableOfContents.vue
+++ b/app/javascript/portal/components/TableOfContents.vue
@@ -12,7 +12,7 @@
             class="leading-6 border-l-2 relative -left-0.5 border-solid"
             :class="elementBorderStyles(element)"
           >
-            <p class="py-2 px-4" :class="getClassName(element)">
+            <p class="py-1 px-3" :class="getClassName(element)">
               <a
                 :href="`#${element.slug}`"
                 data-turbolinks="false"
@@ -76,7 +76,7 @@ export default {
         if (!this.h1Count && !this.h2Count) {
           return '';
         }
-        return 'ml-8';
+        return 'ml-5';
       }
 
       return '';
diff --git a/app/javascript/portal/portalHelpers.js b/app/javascript/portal/portalHelpers.js
index f0b8af986b6db..3e9690b2084ef 100644
--- a/app/javascript/portal/portalHelpers.js
+++ b/app/javascript/portal/portalHelpers.js
@@ -4,6 +4,7 @@ import Vue from 'vue';
 import PublicArticleSearch from './components/PublicArticleSearch.vue';
 import TableOfContents from './components/TableOfContents.vue';
 import { initializeTheme } from './portalThemeHelper.js';
+import { directive as onClickaway } from 'vue-clickaway';
 
 export const getHeadingsfromTheArticle = () => {
   const rows = [];
@@ -80,6 +81,9 @@ export const InitializationHelpers = {
     if (isSearchContainerAvailable) {
       new Vue({
         components: { PublicArticleSearch },
+        directives: {
+          'on-clickaway': onClickaway,
+        },
         template: '<PublicArticleSearch />',
       }).$mount('#search-wrap');
     }
diff --git a/app/javascript/sdk/DOMHelpers.js b/app/javascript/sdk/DOMHelpers.js
index 47a45cc78a8cc..f8ba55337d660 100644
--- a/app/javascript/sdk/DOMHelpers.js
+++ b/app/javascript/sdk/DOMHelpers.js
@@ -4,9 +4,28 @@ import { IFrameHelper } from './IFrameHelper';
 export const loadCSS = () => {
   const css = document.createElement('style');
   css.innerHTML = `${SDK_CSS}`;
+  css.id = 'cw-widget-styles';
   document.body.appendChild(css);
 };
 
+// This is a method specific to Turbo
+// The body replacing strategy removes Chatwoot styles
+// as well as the widget, this help us get it back
+export const restoreElement = (id, newBody) => {
+  const element = document.getElementById(id);
+  const newElement = newBody.querySelector(`#${id}`);
+
+  if (element && !newElement) {
+    newBody.appendChild(element);
+  }
+};
+
+export const restoreWidgetInDOM = newBody => {
+  restoreElement('cw-bubble-holder', newBody);
+  restoreElement('cw-widget-holder', newBody);
+  restoreElement('cw-widget-styles', newBody);
+};
+
 export const addClasses = (elm, classes) => {
   elm.classList.add(...classes.split(' '));
 };
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 2166b43042218..3687fa311725a 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -78,6 +78,7 @@ export const IFrameHelper = {
     }
 
     addClasses(widgetHolder, holderClassName);
+    widgetHolder.id = 'cw-widget-holder';
     widgetHolder.appendChild(iframe);
     body.appendChild(widgetHolder);
     IFrameHelper.initPostMessageCommunication();
diff --git a/app/javascript/sdk/bubbleHelpers.js b/app/javascript/sdk/bubbleHelpers.js
index 54401a82ca395..600c1444a5213 100644
--- a/app/javascript/sdk/bubbleHelpers.js
+++ b/app/javascript/sdk/bubbleHelpers.js
@@ -61,6 +61,7 @@ export const createBubbleHolder = hideMessageBubble => {
     addClasses(bubbleHolder, 'woot-hidden');
   }
   addClasses(bubbleHolder, 'woot--bubble-holder');
+  bubbleHolder.id = 'cw-bubble-holder';
   body.appendChild(bubbleHolder);
 };
 
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Black.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Black.woff2
new file mode 100644
index 0000000000000..8138123c13677
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Black.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-BlackItalic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-BlackItalic.woff2
new file mode 100644
index 0000000000000..735ba21f99f08
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-BlackItalic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Bold.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Bold.woff2
new file mode 100644
index 0000000000000..11c67196e1727
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Bold.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-BoldItalic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-BoldItalic.woff2
new file mode 100644
index 0000000000000..5b6a1fb006f6d
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-BoldItalic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraBold.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraBold.woff2
new file mode 100644
index 0000000000000..9058e98613463
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraBold.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraBoldItalic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraBoldItalic.woff2
new file mode 100644
index 0000000000000..4cd61c0672533
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraBoldItalic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraLight.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraLight.woff2
new file mode 100644
index 0000000000000..8621b29951017
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraLight.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraLightItalic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraLightItalic.woff2
new file mode 100644
index 0000000000000..689c8d9ca1dc8
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ExtraLightItalic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Italic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Italic.woff2
new file mode 100644
index 0000000000000..11f20bc821e4f
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Italic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Light.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Light.woff2
new file mode 100644
index 0000000000000..446301c35ebbd
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Light.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-LightItalic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-LightItalic.woff2
new file mode 100644
index 0000000000000..f688196103030
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-LightItalic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Medium.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Medium.woff2
new file mode 100644
index 0000000000000..29160b2c5deec
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Medium.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-MediumItalic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-MediumItalic.woff2
new file mode 100644
index 0000000000000..ef1bcbe3c71e2
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-MediumItalic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Regular.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Regular.woff2
new file mode 100644
index 0000000000000..a6c04f68ecab6
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Regular.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-SemiBold.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-SemiBold.woff2
new file mode 100644
index 0000000000000..2b4db239b47f7
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-SemiBold.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-SemiBoldItalic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-SemiBoldItalic.woff2
new file mode 100644
index 0000000000000..59091db3111c9
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-SemiBoldItalic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Thin.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Thin.woff2
new file mode 100644
index 0000000000000..dc0b948607430
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-Thin.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ThinItalic.woff2 b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ThinItalic.woff2
new file mode 100644
index 0000000000000..96439c0c08e6e
Binary files /dev/null and b/app/javascript/shared/assets/fonts/InterDisplay/InterDisplay-ThinItalic.woff2 differ
diff --git a/app/javascript/shared/assets/fonts/InterDisplay/inter-display.scss b/app/javascript/shared/assets/fonts/InterDisplay/inter-display.scss
new file mode 100644
index 0000000000000..d8d1b7596af4c
--- /dev/null
+++ b/app/javascript/shared/assets/fonts/InterDisplay/inter-display.scss
@@ -0,0 +1,71 @@
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-Thin.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-ExtraLight.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-Light.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-Regular.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-Medium.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-SemiBold.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-Bold.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 800;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-ExtraBold.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'InterDisplay';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('~shared/assets/fonts/InterDisplay/InterDisplay-Black.woff2') format('woff2');
+}
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index e1f5f76c4d624..60c691b7d37ab 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -58,6 +58,7 @@
     "M21 6.25A3.25 3.25 0 0 0 17.75 3H6.25A3.25 3.25 0 0 0 3 6.25v11.5A3.25 3.25 0 0 0 6.25 21h5.772a6.471 6.471 0 0 1-.709-1.5H6.25a1.75 1.75 0 0 1-1.75-1.75V8.5h15v2.813a6.471 6.471 0 0 1 1.5.709V6.25ZM6.25 4.5h11.5c.966 0 1.75.784 1.75 1.75V7h-15v-.75c0-.966.784-1.75 1.75-1.75Z",
     "M23 17.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0Zm-5.5 0h2a.5.5 0 0 1 0 1H17a.5.5 0 0 1-.5-.491v-3.01a.5.5 0 0 1 1 0V17.5Z"
   ],
+  "calendar-outline": "M17.75 3A3.25 3.25 0 0 1 21 6.25v11.5A3.25 3.25 0 0 1 17.75 21H6.25A3.25 3.25 0 0 1 3 17.75V6.25A3.25 3.25 0 0 1 6.25 3h11.5Zm1.75 5.5h-15v9.25c0 .966.784 1.75 1.75 1.75h11.5a1.75 1.75 0 0 0 1.75-1.75V8.5Zm-11.75 6a1.25 1.25 0 1 1 0 2.5a1.25 1.25 0 0 1 0-2.5Zm4.25 0a1.25 1.25 0 1 1 0 2.5a1.25 1.25 0 0 1 0-2.5Zm-4.25-4a1.25 1.25 0 1 1 0 2.5a1.25 1.25 0 0 1 0-2.5Zm4.25 0a1.25 1.25 0 1 1 0 2.5a1.25 1.25 0 0 1 0-2.5Zm4.25 0a1.25 1.25 0 1 1 0 2.5a1.25 1.25 0 0 1 0-2.5Zm1.5-6H6.25A1.75 1.75 0 0 0 4.5 6.25V7h15v-.75a1.75 1.75 0 0 0-1.75-1.75Z",
   "call-outline": "m7.056 2.418 1.167-.351a2.75 2.75 0 0 1 3.302 1.505l.902 2.006a2.75 2.75 0 0 1-.633 3.139L10.3 10.11a.25.25 0 0 0-.078.155c-.044.397.225 1.17.845 2.245.451.781.86 1.33 1.207 1.637.242.215.375.261.432.245l2.01-.615a2.75 2.75 0 0 1 3.034 1.02l1.281 1.776a2.75 2.75 0 0 1-.339 3.605l-.886.84a3.75 3.75 0 0 1-3.587.889c-2.754-.769-5.223-3.093-7.435-6.924-2.215-3.836-2.992-7.14-2.276-9.913a3.75 3.75 0 0 1 2.548-2.652Zm.433 1.437a2.25 2.25 0 0 0-1.529 1.59c-.602 2.332.087 5.261 2.123 8.788 2.033 3.522 4.222 5.582 6.54 6.23a2.25 2.25 0 0 0 2.151-.534l.887-.84a1.25 1.25 0 0 0 .154-1.639l-1.28-1.775a1.25 1.25 0 0 0-1.38-.464l-2.015.617c-1.17.348-2.232-.593-3.372-2.568C9 11.93 8.642 10.9 8.731 10.099c.047-.416.24-.8.546-1.086l1.494-1.393a1.25 1.25 0 0 0 .288-1.427l-.902-2.006a1.25 1.25 0 0 0-1.5-.684l-1.168.352Z",
   "chat-help-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10a9.96 9.96 0 0 1-4.587-1.112l-3.826 1.067a1.25 1.25 0 0 1-1.54-1.54l1.068-3.823A9.96 9.96 0 0 1 2 12C2 6.477 6.477 2 12 2Zm0 1.5A8.5 8.5 0 0 0 3.5 12c0 1.47.373 2.883 1.073 4.137l.15.27-1.112 3.984 3.987-1.112.27.15A8.5 8.5 0 1 0 12 3.5Zm0 12a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm0-8.75a2.75 2.75 0 0 1 2.75 2.75c0 1.01-.297 1.574-1.051 2.359l-.169.171c-.622.622-.78.886-.78 1.47a.75.75 0 0 1-1.5 0c0-1.01.297-1.574 1.051-2.359l.169-.171c.622-.622.78-.886.78-1.47a1.25 1.25 0 0 0-2.493-.128l-.007.128a.75.75 0 0 1-1.5 0A2.75 2.75 0 0 1 12 6.75Z",
   "chat-multiple-outline": "M9.562 3a7.5 7.5 0 0 0-6.798 10.673l-.724 2.842a1.25 1.25 0 0 0 1.504 1.524c.75-.18 1.903-.457 2.93-.702A7.5 7.5 0 1 0 9.561 3Zm-6 7.5a6 6 0 1 1 3.33 5.375l-.244-.121-.264.063c-.923.22-1.99.475-2.788.667l.69-2.708.07-.276-.13-.253a5.971 5.971 0 0 1-.664-2.747Zm11 10.5c-1.97 0-3.762-.759-5.1-2h.1c.718 0 1.415-.089 2.08-.257.865.482 1.86.757 2.92.757.96 0 1.866-.225 2.67-.625l.243-.121.264.063c.922.22 1.966.445 2.74.61-.175-.751-.414-1.756-.642-2.651l-.07-.276.13-.253a5.971 5.971 0 0 0 .665-2.747 5.995 5.995 0 0 0-2.747-5.042 8.44 8.44 0 0 0-.8-2.047 7.503 7.503 0 0 1 4.344 10.263c.253 1.008.509 2.1.671 2.803a1.244 1.244 0 0 1-1.467 1.5 132.62 132.62 0 0 1-2.913-.64 7.476 7.476 0 0 1-3.088.663Z",
@@ -272,5 +273,7 @@
   "chevrons-left-outline": ["m11 17-5-5 5-5", "m18 17-5-5 5-5"],
   "chevron-left-single-outline": "m15 18-6-6 6-6",
   "chevrons-right-outline": ["m6 17 5-5-5-5", "m13 17 5-5-5-5"],
-  "chevron-right-single-outline": "m9 18 6-6-6-6"
+  "chevron-right-single-outline": "m9 18 6-6-6-6",
+  "avatar-upload-outline": "M19.754 11a.75.75 0 0 1 .743.648l.007.102v7a3.25 3.25 0 0 1-3.065 3.246l-.185.005h-11a3.25 3.25 0 0 1-3.244-3.066l-.006-.184V11.75a.75.75 0 0 1 1.494-.102l.006.102v7a1.75 1.75 0 0 0 1.607 1.745l.143.006h11A1.75 1.75 0 0 0 19 18.894l.005-.143V11.75a.75.75 0 0 1 .75-.75ZM6.22 7.216l4.996-4.996a.75.75 0 0 1 .976-.073l.084.072l5.005 4.997a.75.75 0 0 1-.976 1.134l-.084-.073l-3.723-3.716l.001 11.694a.75.75 0 0 1-.648.743l-.102.007a.75.75 0 0 1-.743-.648L11 16.255V4.558L7.28 8.277a.75.75 0 0 1-.976.073l-.084-.073a.75.75 0 0 1-.073-.977l.073-.084l4.996-4.996L6.22 7.216Z",
+  "text-copy-outline": "M5.503 4.627L5.5 6.75v10.504a3.25 3.25 0 0 0 3.25 3.25h8.616a2.25 2.25 0 0 1-2.122 1.5H8.75A4.75 4.75 0 0 1 4 17.254V6.75c0-.98.627-1.815 1.503-2.123M17.75 2A2.25 2.25 0 0 1 20 4.25v13a2.25 2.25 0 0 1-2.25 2.25h-9a2.25 2.25 0 0 1-2.25-2.25v-13A2.25 2.25 0 0 1 8.75 2zm0 1.5h-9a.75.75 0 0 0-.75.75v13c0 .414.336.75.75.75h9a.75.75 0 0 0 .75-.75v-13a.75.75 0 0 0-.75-.75"
 }
diff --git a/app/javascript/shared/components/ui/MultiselectDropdown.vue b/app/javascript/shared/components/ui/MultiselectDropdown.vue
index 78b817ce08551..fe6a4f2f84d91 100644
--- a/app/javascript/shared/components/ui/MultiselectDropdown.vue
+++ b/app/javascript/shared/components/ui/MultiselectDropdown.vue
@@ -74,13 +74,11 @@
 <script>
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 import MultiselectDropdownItems from 'shared/components/ui/MultiselectDropdownItems.vue';
-import { mixin as clickaway } from 'vue-clickaway';
 export default {
   components: {
     Thumbnail,
     MultiselectDropdownItems,
   },
-  mixins: [clickaway],
   props: {
     options: {
       type: Array,
diff --git a/app/javascript/shared/components/ui/dropdown/DropdownMenu.vue b/app/javascript/shared/components/ui/dropdown/DropdownMenu.vue
index c2211ae2c043d..a876de4018a2b 100644
--- a/app/javascript/shared/components/ui/dropdown/DropdownMenu.vue
+++ b/app/javascript/shared/components/ui/dropdown/DropdownMenu.vue
@@ -8,16 +8,12 @@
   </ul>
 </template>
 <script>
-import eventListenerMixins from 'shared/mixins/eventListenerMixins';
-import {
-  hasPressedArrowUpKey,
-  hasPressedArrowDownKey,
-} from 'shared/helpers/KeyboardHelpers';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 export default {
   name: 'WootDropdownMenu',
   componentName: 'WootDropdownMenu',
 
-  mixins: [eventListenerMixins],
+  mixins: [keyboardEventListenerMixins],
 
   props: {
     placement: {
@@ -31,38 +27,34 @@ export default {
         'ul.dropdown li.dropdown-menu__item .button'
       );
     },
-    activeElementIndex() {
-      const menuButtons = this.dropdownMenuButtons();
+    getActiveButtonIndex(menuButtons) {
       const focusedButton = this.$refs.dropdownMenu.querySelector(
         'ul.dropdown li.dropdown-menu__item .button:focus'
       );
-      const activeIndex = [...menuButtons].indexOf(focusedButton);
-      return activeIndex;
+      return Array.from(menuButtons).indexOf(focusedButton);
     },
-    handleKeyEvents(e) {
+    getKeyboardEvents() {
       const menuButtons = this.dropdownMenuButtons();
-      const lastElementIndex = menuButtons.length - 1;
-
+      return {
+        ArrowUp: () => this.focusPreviousButton(menuButtons),
+        ArrowDown: () => this.focusNextButton(menuButtons),
+      };
+    },
+    focusPreviousButton(menuButtons) {
+      const activeIndex = this.getActiveButtonIndex(menuButtons);
+      const newIndex =
+        activeIndex >= 1 ? activeIndex - 1 : menuButtons.length - 1;
+      this.focusButton(menuButtons, newIndex);
+    },
+    focusNextButton(menuButtons) {
+      const activeIndex = this.getActiveButtonIndex(menuButtons);
+      const newIndex =
+        activeIndex === menuButtons.length - 1 ? 0 : activeIndex + 1;
+      this.focusButton(menuButtons, newIndex);
+    },
+    focusButton(menuButtons, newIndex) {
       if (menuButtons.length === 0) return;
-
-      if (hasPressedArrowUpKey(e)) {
-        const activeIndex = this.activeElementIndex();
-
-        if (activeIndex >= 1) {
-          menuButtons[activeIndex - 1].focus();
-        } else {
-          menuButtons[lastElementIndex].focus();
-        }
-      }
-      if (hasPressedArrowDownKey(e)) {
-        const activeIndex = this.activeElementIndex();
-
-        if (activeIndex === lastElementIndex) {
-          menuButtons[0].focus();
-        } else {
-          menuButtons[activeIndex + 1].focus();
-        }
-      }
+      menuButtons[newIndex].focus();
     },
   },
 };
diff --git a/app/javascript/shared/constants/messages.js b/app/javascript/shared/constants/messages.js
index b3ef11e1bba91..9451f83d31b18 100644
--- a/app/javascript/shared/constants/messages.js
+++ b/app/javascript/shared/constants/messages.js
@@ -98,6 +98,7 @@ export const CSAT_RATINGS = [
 export const AUDIO_FORMATS = {
   WEBM: 'audio/webm',
   OGG: 'audio/ogg',
+  MP3: 'audio/mp3',
   WAV: 'audio/wav',
 };
 
diff --git a/app/javascript/shared/helpers/KeyboardHelpers.js b/app/javascript/shared/helpers/KeyboardHelpers.js
index c7ebeba7d3754..8a64c8cb58687 100644
--- a/app/javascript/shared/helpers/KeyboardHelpers.js
+++ b/app/javascript/shared/helpers/KeyboardHelpers.js
@@ -1,9 +1,9 @@
 export const isEnter = e => {
-  return e.keyCode === 13;
+  return e.key === 'Enter';
 };
 
 export const isEscape = e => {
-  return e.keyCode === 27;
+  return e.key === 'Escape';
 };
 
 export const hasPressedShift = e => {
@@ -19,118 +19,7 @@ export const hasPressedEnterAndNotCmdOrShift = e => {
 };
 
 export const hasPressedCommandAndEnter = e => {
-  return e.metaKey && e.keyCode === 13;
-};
-
-export const hasPressedCommandAndForwardSlash = e => {
-  return e.metaKey && e.keyCode === 191;
-};
-
-export const hasPressedAltAndCKey = e => {
-  return e.altKey && e.keyCode === 67;
-};
-
-export const hasPressedAltAndVKey = e => {
-  return e.altKey && e.keyCode === 86;
-};
-
-export const hasPressedAltAndRKey = e => {
-  return e.altKey && e.keyCode === 82;
-};
-
-export const hasPressedAltAndSKey = e => {
-  return e.altKey && e.keyCode === 83;
-};
-
-export const hasPressedAltAndBKey = e => {
-  return e.altKey && e.keyCode === 66;
-};
-
-export const hasPressedAltAndNKey = e => {
-  return e.altKey && e.keyCode === 78;
-};
-
-export const hasPressedAltAndAKey = e => {
-  return e.altKey && e.keyCode === 65;
-};
-
-export const hasPressedAltAndPKey = e => {
-  return e.altKey && e.keyCode === 80;
-};
-
-export const hasPressedAltAndLKey = e => {
-  return e.altKey && e.keyCode === 76;
-};
-
-export const hasPressedAltAndEKey = e => {
-  return e.altKey && e.keyCode === 69;
-};
-
-export const hasPressedCommandPlusAltAndEKey = e => {
-  return e.metaKey && e.altKey && e.keyCode === 69;
-};
-
-export const hasPressedAltAndOKey = e => {
-  return e.altKey && e.keyCode === 79;
-};
-
-export const hasPressedAltAndJKey = e => {
-  return e.altKey && e.keyCode === 74;
-};
-
-export const hasPressedAltAndKKey = e => {
-  return e.altKey && e.keyCode === 75;
-};
-
-export const hasPressedAltAndMKey = e => {
-  return e.altKey && e.keyCode === 77;
-};
-
-export const hasPressedArrowUpKey = e => {
-  return e.keyCode === 38;
-};
-
-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;
-};
-
-/**
- * Returns a string representation of the hotkey pattern based on the provided event object.
- * @param {KeyboardEvent} e - The keyboard event object.
- * @returns {string} - The hotkey pattern string.
- */
-export const buildHotKeys = e => {
-  const key = e.key.toLowerCase();
-  if (['shift', 'meta', 'alt', 'control'].includes(key)) {
-    return key;
-  }
-  let hotKeyPattern = '';
-  if (e.altKey) {
-    hotKeyPattern += 'alt+';
-  }
-  if (e.ctrlKey) {
-    hotKeyPattern += 'ctrl+';
-  }
-  if (e.metaKey && !e.ctrlKey) {
-    hotKeyPattern += 'meta+';
-  }
-  if (e.shiftKey) {
-    hotKeyPattern += 'shift+';
-  }
-  hotKeyPattern += key;
-  return hotKeyPattern;
+  return hasPressedCommand(e) && isEnter(e);
 };
 
 /**
diff --git a/app/javascript/shared/helpers/specs/KeyboardHelpers.spec.js b/app/javascript/shared/helpers/specs/KeyboardHelpers.spec.js
index 2a5e416eb953c..06b490b6cf1ad 100644
--- a/app/javascript/shared/helpers/specs/KeyboardHelpers.spec.js
+++ b/app/javascript/shared/helpers/specs/KeyboardHelpers.spec.js
@@ -3,20 +3,19 @@ import {
   isEscape,
   hasPressedShift,
   hasPressedCommand,
-  buildHotKeys,
   isActiveElementTypeable,
 } from '../KeyboardHelpers';
 
 describe('#KeyboardHelpers', () => {
   describe('#isEnter', () => {
     it('return correct values', () => {
-      expect(isEnter({ keyCode: 13 })).toEqual(true);
+      expect(isEnter({ key: 'Enter' })).toEqual(true);
     });
   });
 
   describe('#isEscape', () => {
     it('return correct values', () => {
-      expect(isEscape({ keyCode: 27 })).toEqual(true);
+      expect(isEscape({ key: 'Escape' })).toEqual(true);
     });
   });
 
@@ -31,14 +30,6 @@ describe('#KeyboardHelpers', () => {
       expect(hasPressedCommand({ metaKey: true })).toEqual(true);
     });
   });
-
-  describe('#buildHotKeys', () => {
-    it('returns hot keys', () => {
-      expect(buildHotKeys({ altKey: true, key: 'alt' })).toEqual('alt');
-      expect(buildHotKeys({ ctrlKey: true, key: 'a' })).toEqual('ctrl+a');
-      expect(buildHotKeys({ metaKey: true, key: 'b' })).toEqual('meta+b');
-    });
-  });
 });
 
 describe('isActiveElementTypeable', () => {
diff --git a/app/javascript/shared/mixins/eventListenerMixins.js b/app/javascript/shared/mixins/eventListenerMixins.js
deleted file mode 100644
index 9bcff3aa39bce..0000000000000
--- a/app/javascript/shared/mixins/eventListenerMixins.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { isActiveElementTypeable, isEscape } from '../helpers/KeyboardHelpers';
-
-export default {
-  mounted() {
-    document.addEventListener('keydown', this.onKeyDownHandler);
-  },
-  beforeDestroy() {
-    document.removeEventListener('keydown', this.onKeyDownHandler);
-  },
-  methods: {
-    onKeyDownHandler(e) {
-      const isTypeable = isActiveElementTypeable(e);
-
-      if (isTypeable) {
-        if (isEscape(e)) {
-          e.target.blur();
-        }
-        return;
-      }
-
-      this.handleKeyEvents(e);
-    },
-  },
-};
diff --git a/app/javascript/shared/mixins/keyboardEventListenerMixins.js b/app/javascript/shared/mixins/keyboardEventListenerMixins.js
new file mode 100644
index 0000000000000..9f6d43333f4cd
--- /dev/null
+++ b/app/javascript/shared/mixins/keyboardEventListenerMixins.js
@@ -0,0 +1,67 @@
+import { isActiveElementTypeable, isEscape } from '../helpers/KeyboardHelpers';
+
+import { createKeybindingsHandler } from 'tinykeys';
+
+// this is a store that stores the handler globally, and only gets reset on reload
+const taggedHandlers = [];
+
+export default {
+  mounted() {
+    const events = this.getKeyboardEvents();
+    if (events) {
+      const wrappedEvents = this.wrapEventsInKeybindingsHandler(events);
+      const keydownHandler = createKeybindingsHandler(wrappedEvents);
+      this.addEventHandler(keydownHandler);
+    }
+  },
+  beforeDestroy() {
+    if (this.$el && this.$el.dataset?.keydownHandlerIndex) {
+      const handlerToRemove =
+        taggedHandlers[this.$el.dataset.keydownHandlerIndex];
+      document.removeEventListener('keydown', handlerToRemove);
+    }
+  },
+  methods: {
+    addEventHandler(keydownHandler) {
+      const indexToAppend = taggedHandlers.push(keydownHandler) - 1;
+      const root = this.$el;
+      if (root && root.dataset) {
+        // For the components with a top level v-if Vue renders it as an empty comment in the DOM
+        // so we need to check if the root element has a dataset property to ensure it is a valid element
+        document.addEventListener('keydown', keydownHandler);
+        root.dataset.keydownHandlerIndex = indexToAppend;
+      }
+    },
+    getKeyboardEvents() {
+      return null;
+    },
+    wrapEventsInKeybindingsHandler(events) {
+      const wrappedEvents = {};
+      Object.keys(events).forEach(eventName => {
+        wrappedEvents[eventName] = this.keydownWrapper(events[eventName]);
+      });
+
+      return wrappedEvents;
+    },
+    keydownWrapper(handler) {
+      return e => {
+        const actionToPerform =
+          typeof handler === 'function' ? handler : handler.action;
+        const allowOnFocusedInput =
+          typeof handler === 'function' ? false : handler.allowOnFocusedInput;
+
+        const isTypeable = isActiveElementTypeable(e);
+
+        if (isTypeable) {
+          if (isEscape(e)) {
+            e.target.blur();
+          }
+
+          if (!allowOnFocusedInput) return;
+        }
+
+        actionToPerform(e);
+      };
+    },
+  },
+};
diff --git a/app/javascript/superadmin_pages/views/playground/Index.vue b/app/javascript/superadmin_pages/views/playground/Index.vue
index 136a2b4819a39..f1fb4752a3f59 100644
--- a/app/javascript/superadmin_pages/views/playground/Index.vue
+++ b/app/javascript/superadmin_pages/views/playground/Index.vue
@@ -33,8 +33,8 @@
 </template>
 
 <script>
-import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
+import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import Header from '../../components/playground/Header.vue';
 import UserMessage from '../../components/playground/UserMessage.vue';
 import BotMessage from '../../components/playground/BotMessage.vue';
@@ -47,7 +47,7 @@ export default {
     BotMessage,
     TypingIndicator,
   },
-  mixins: [messageFormatterMixin],
+  mixins: [messageFormatterMixin, keyboardEventListenerMixins],
   props: {
     componentData: {
       type: Object,
@@ -67,17 +67,17 @@ export default {
   },
   mounted() {
     this.focusInput();
-    document.addEventListener('keydown', this.handleKeyEvents);
-  },
-  beforeDestroy() {
-    document.removeEventListener('keydown', this.handleKeyEvents);
   },
   methods: {
-    handleKeyEvents(e) {
-      const keyCode = buildHotKeys(e);
-      if (['meta+enter', 'ctrl+enter'].includes(keyCode)) {
-        this.onMessageSend();
-      }
+    getKeyboardEvents() {
+      return {
+        '$mod+Enter': {
+          action: () => {
+            this.onMessageSend();
+          },
+          allowOnFocusedInput: true,
+        },
+      };
     },
     focusInput() {
       this.$refs.messageInput.focus();
diff --git a/app/javascript/survey/i18n/locale/pt.json b/app/javascript/survey/i18n/locale/pt.json
index 11a5b68e80dfe..48bbb096880e3 100644
--- a/app/javascript/survey/i18n/locale/pt.json
+++ b/app/javascript/survey/i18n/locale/pt.json
@@ -1,18 +1,18 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Caro cliente 👋, por favor, reserve alguns instantes para compartilhar feedback sobre a conversa que teve com %{inboxName}.",
+    "DESCRIPTION": "Caro cliente 👋, por favor, reserve alguns instantes para compartilhar a sua opinião sobre a conversa que teve com %{inboxName}.",
     "RATING": {
       "LABEL": "Avalie a sua conversa",
       "SUCCESS_MESSAGE": "Obrigado pela sua Avaliação"
     },
     "FEEDBACK": {
-      "LABEL": "Você tem alguma ideia que gostaria de compartilhar?",
-      "PLACEHOLDER": "O seu feedback (opcional)",
-      "BUTTON_TEXT": "Submeter feedback"
+      "LABEL": "Tem alguma sugestão para partilhar connosco?",
+      "PLACEHOLDER": "A sua sugestão (opcional)",
+      "BUTTON_TEXT": "Submeter"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Formulário atualizado com sucesso",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      "SUCCESS_MESSAGE": "Formulário atualizado",
+      "ERROR_MESSAGE": "Não foi possível ligar ao servidor, por favor tente novamente mais tarde"
     }
   },
   "POWERED_BY": "Desenvolvido por Chatwoot"
diff --git a/app/javascript/v3/components/Form/Button.vue b/app/javascript/v3/components/Form/Button.vue
new file mode 100644
index 0000000000000..16d4273078ddb
--- /dev/null
+++ b/app/javascript/v3/components/Form/Button.vue
@@ -0,0 +1,110 @@
+<template>
+  <button
+    class="inline-flex items-center gap-1 text-sm font-medium reset-base rounded-xl w-fit"
+    :class="buttonClasses"
+    v-bind="$attrs"
+    @click="onClick"
+  >
+    <fluent-icon
+      v-if="icon && !trailingIcon"
+      size="1.16em"
+      :icon="icon"
+      class="flex-shrink-0"
+    />
+    <span
+      v-if="$slots.default"
+      class="text-sm font-medium truncate ltr:text-left rtl:text-right"
+    >
+      <slot />
+    </span>
+    <fluent-icon
+      v-if="icon && trailingIcon"
+      size="1.16em"
+      :icon="icon"
+      class="flex-shrink-0"
+    />
+  </button>
+</template>
+<script setup>
+import { computed, useAttrs } from 'vue';
+
+const props = defineProps({
+  variant: {
+    type: String,
+    default: 'solid',
+    validator: value => ['outline', 'ghost', 'solid'].includes(value),
+  },
+  size: {
+    type: String,
+    default: 'large',
+    validator: value => ['medium', 'large'].includes(value),
+  },
+  icon: {
+    type: String,
+    default: '',
+  },
+  colorScheme: {
+    type: String,
+    default: 'primary',
+    validator: value => ['primary', 'secondary', 'danger'].includes(value),
+  },
+  trailingIcon: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const attrs = useAttrs();
+
+const baseClasses = {
+  outline: 'outline outline-1 -outline-offset-1',
+  ghost: 'hover:text-600 active:text-600 focus:outline focus:outline-offset-1',
+  solid:
+    'hover:bg-700 active:bg-700 focus:outline focus:outline-offset-1 focus:outline-2',
+};
+
+const colorClass = computed(() => {
+  if (attrs.disabled) {
+    return 'bg-ash-200 text-ash-600 cursor-not-allowed';
+  }
+
+  const styleMap = {
+    primary: {
+      outline: `${baseClasses.outline} outline-primary-400 hover:text-primary-600 active:text-primary-600`,
+      ghost: `${baseClasses.ghost} focus:outline-primary-400`,
+      solid: `${baseClasses.solid} bg-primary-600 text-white focus:outline-primary-400`,
+    },
+    secondary: {
+      outline: `${baseClasses.outline} outline-ash-400 hover:text-ash-900 active:text-ash-900 `,
+      ghost: `${baseClasses.ghost} focus:outline-ash-400`,
+      solid: `${baseClasses.solid} bg-ash-100 text-ash-900 focus:outline-ash-400`,
+    },
+    danger: {
+      outline: `${baseClasses.outline} outline-ruby-400 hover:text-ruby-600 active:text-ruby-600`,
+      ghost: `${baseClasses.ghost} focus:outline-ruby-400`,
+      solid: `${baseClasses.solid} bg-ruby-600 text-white focus:outline-ruby-400`,
+    },
+  };
+
+  const schemeStyles = styleMap[props.colorScheme];
+  return schemeStyles[props.variant] || schemeStyles.solid;
+});
+
+const sizeClass = computed(() => {
+  if (props.size === 'medium') {
+    return 'h-8 px-3 py-1.5 text-sm';
+  }
+  return 'h-10 px-4 py-2.5 text';
+});
+
+const buttonClasses = computed(() => [colorClass.value, sizeClass.value]);
+
+const emit = defineEmits(['click']);
+
+const onClick = () => {
+  if (props.disabled) {
+    return;
+  }
+  emit('click');
+};
+</script>
diff --git a/app/javascript/v3/components/Form/CheckBox.vue b/app/javascript/v3/components/Form/CheckBox.vue
new file mode 100644
index 0000000000000..c70a122e6798c
--- /dev/null
+++ b/app/javascript/v3/components/Form/CheckBox.vue
@@ -0,0 +1,31 @@
+<template>
+  <input
+    :id="value"
+    v-model="checked"
+    type="checkbox"
+    :value="value"
+    class="flex-shrink-0 mt-0.5 border-ash-200 border bg-ash-50 checked:border-none checked:bg-primary-600 dark:checked:bg-primary-600 shadow-sm appearance-none rounded-[4px] w-4 h-4 focus:ring-1 after:content-[''] after:text-white checked:after:content-['✓'] after:flex after:items-center after:justify-center after:text-center after:text-xs after:font-bold after:relative"
+  />
+</template>
+
+<script setup>
+import { computed } from 'vue';
+
+const props = defineProps({
+  isChecked: {
+    type: Boolean,
+    default: false,
+  },
+  value: {
+    type: String,
+    default: null,
+  },
+});
+
+const emit = defineEmits(['input']);
+
+const checked = computed({
+  get: () => props.isChecked,
+  set: value => emit('update', props.value, value),
+});
+</script>
diff --git a/app/javascript/v3/components/Form/InitialsAvatar.vue b/app/javascript/v3/components/Form/InitialsAvatar.vue
new file mode 100644
index 0000000000000..2a489ee766fd7
--- /dev/null
+++ b/app/javascript/v3/components/Form/InitialsAvatar.vue
@@ -0,0 +1,43 @@
+<template>
+  <div
+    class="rounded-xl flex leading-[100%] font-medium items-center justify-center text-center cursor-default"
+    :class="`h-[${size}px] w-[${size}px] ${colorClass}`"
+    :style="style"
+    aria-hidden="true"
+  >
+    <slot>{{ initial }}</slot>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+import { userInitial } from 'v3/helpers/CommonHelper';
+const colors = {
+  1: 'bg-ash-200 text-ash-900',
+  2: 'bg-amber-200 text-amber-900',
+  3: 'bg-pink-100 text-pink-800',
+  4: 'bg-purple-100 text-purple-800',
+  5: 'bg-indigo-100 text-indigo-800',
+  6: 'bg-grass-100 text-grass-800',
+  7: 'bg-mint-100 text-mint-800',
+  8: 'bg-orange-100 text-orange-800',
+};
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+  size: {
+    type: Number,
+    default: 72,
+  },
+});
+const style = computed(() => ({
+  fontSize: `${Math.floor(props.size / 2.5)}px`,
+}));
+const colorClass = computed(() => {
+  return colors[(props.name.length % 8) + 1];
+});
+
+const initial = computed(() => userInitial(props.name));
+</script>
diff --git a/app/javascript/v3/components/Form/ProfileAvatar.vue b/app/javascript/v3/components/Form/ProfileAvatar.vue
new file mode 100644
index 0000000000000..fb802d35dea95
--- /dev/null
+++ b/app/javascript/v3/components/Form/ProfileAvatar.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="relative rounded-xl h-[72px] w-[72px] cursor-pointe group">
+    <img
+      v-if="shouldShowImage"
+      class="rounded-xl h-[72px] w-[72px]"
+      :alt="name"
+      :src="src"
+      draggable="false"
+      @load="onImageLoad"
+      @error="onImageLoadError"
+    />
+    <initials-avatar v-else-if="!shouldShowImage" :name="name" :size="72" />
+
+    <input
+      ref="fileInputRef"
+      type="file"
+      accept="image/png, image/jpeg, image/jpg, image/gif, image/webp"
+      hidden
+      @change="onImageUpload"
+    />
+    <div class="hidden group-hover:block">
+      <button
+        v-if="src"
+        class="absolute z-10 flex items-center justify-center w-6 h-6 p-1 border border-white rounded-full select-none dark:border-ash-75 reset-base -top-2 -right-2 bg-ash-300"
+        @click="onAvatarDelete"
+      >
+        <fluent-icon icon="dismiss" size="16" class="text-ash-900" />
+      </button>
+      <button
+        class="reset-base absolute h-[72px] w-[72px] top-0 left-0 rounded-xl select-none flex items-center justify-center bg-modal-backdrop-dark dark:bg-modal-backdrop-dark"
+        @click="openFileInput"
+      >
+        <fluent-icon icon="avatar-upload" size="32" class="text-white" />
+      </button>
+    </div>
+  </div>
+</template>
+<script setup>
+import { computed, ref } from 'vue';
+import InitialsAvatar from './InitialsAvatar.vue';
+const props = defineProps({
+  src: {
+    type: String,
+    default: '',
+  },
+  name: {
+    type: String,
+    default: '',
+  },
+});
+
+const emits = defineEmits(['change', 'delete']);
+
+const hasImageLoaded = ref(false);
+const imageLoadedError = ref(false);
+const fileInputRef = ref(null);
+
+const shouldShowImage = computed(() => props.src && !imageLoadedError.value);
+
+const onImageLoadError = () => {
+  imageLoadedError.value = true;
+};
+
+const onImageLoad = () => {
+  hasImageLoaded.value = true;
+  imageLoadedError.value = false;
+};
+
+const openFileInput = () => {
+  fileInputRef.value.click();
+};
+
+const onImageUpload = event => {
+  const [file] = event.target.files;
+  emits('change', {
+    file,
+    url: file ? URL.createObjectURL(file) : null,
+  });
+};
+
+const onAvatarDelete = () => {
+  emits('delete');
+};
+</script>
diff --git a/app/javascript/v3/components/Form/Select.vue b/app/javascript/v3/components/Form/Select.vue
index a7165b7f2a210..67a311b04caa8 100644
--- a/app/javascript/v3/components/Form/Select.vue
+++ b/app/javascript/v3/components/Form/Select.vue
@@ -11,11 +11,11 @@
       :selected="value"
       :name="name"
       :class="{
-        'text-slate-400': !value,
-        'text-slate-900 dark:text-slate-100': value,
+        'text-ash-400': !value,
+        'text-ash-900': value,
         'pl-9': icon,
       }"
-      class="block w-full px-3 py-2 pr-6 mb-0 border-0 rounded-md shadow-sm outline-none appearance-none select-caret ring-1 ring-inset placeholder:text-slate-400 focus:ring-2 focus:ring-inset focus:ring-woot-500 sm:text-sm sm:leading-6 dark:bg-slate-700 dark:ring-slate-600 dark:focus:ring-woot-500 ring-slate-200"
+      class="block w-full px-3 py-2 pr-6 mb-0 border-0 shadow-sm outline-none appearance-none rounded-xl select-caret ring-ash-200 ring-1 ring-inset placeholder:text-ash-900 focus:ring-2 focus:ring-inset focus:ring-primary-500 sm:text-sm sm:leading-6"
       @input="onInput"
     >
       <option value="" disabled selected class="hidden">
diff --git a/app/javascript/v3/components/Form/Switch.vue b/app/javascript/v3/components/Form/Switch.vue
new file mode 100644
index 0000000000000..cb9751d62beca
--- /dev/null
+++ b/app/javascript/v3/components/Form/Switch.vue
@@ -0,0 +1,35 @@
+<template>
+  <button
+    type="button"
+    class="relative flex-shrink-0 h-4 p-0 border-none shadow-inner w-7 rounded-3xl"
+    :class="
+      value ? 'bg-primary-600 shadow-primary-800' : 'shadow-ash-400 bg-ash-200'
+    "
+    role="switch"
+    :aria-checked="value.toString()"
+    @click="onClick"
+  >
+    <span
+      aria-hidden="true"
+      class="rounded-full bg-white top-0.5 absolute dark:bg-white w-3 h-3 translate-y-0 duration-200 transition-transform ease-in-out"
+      :class="
+        value
+          ? 'ltr:translate-x-0 rtl:translate-x-[12px]'
+          : 'ltr:-translate-x-[12px] rtl:translate-x-0'
+      "
+    />
+  </button>
+</template>
+
+<script>
+export default {
+  props: {
+    value: { type: Boolean, default: false },
+  },
+  methods: {
+    onClick() {
+      this.$emit('input', !this.value);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/v3/helpers/CommonHelper.js b/app/javascript/v3/helpers/CommonHelper.js
index cdd913769dfff..a4b55bdd53a00 100644
--- a/app/javascript/v3/helpers/CommonHelper.js
+++ b/app/javascript/v3/helpers/CommonHelper.js
@@ -1,3 +1,9 @@
 export const replaceRouteWithReload = url => {
   window.location = url;
 };
+
+export const userInitial = name => {
+  const parts = name.split(/[ -]/).filter(Boolean);
+  let initials = parts.map(part => part[0].toUpperCase()).join('');
+  return initials.slice(0, 2);
+};
diff --git a/app/javascript/v3/helpers/specs/CommonHelper.spec.js b/app/javascript/v3/helpers/specs/CommonHelper.spec.js
new file mode 100644
index 0000000000000..58d86006cccf8
--- /dev/null
+++ b/app/javascript/v3/helpers/specs/CommonHelper.spec.js
@@ -0,0 +1,10 @@
+import { userInitial } from '../CommonHelper';
+
+describe('#userInitial', () => {
+  it('returns the initials of the user', () => {
+    expect(userInitial('John Doe')).toEqual('JD');
+    expect(userInitial('John')).toEqual('J');
+    expect(userInitial('John-Doe')).toEqual('JD');
+    expect(userInitial('John Doe Smith')).toEqual('JD');
+  });
+});
diff --git a/app/javascript/v3/views/login/Index.vue b/app/javascript/v3/views/login/Index.vue
index 8be74e7094998..0575a2d98f6a7 100644
--- a/app/javascript/v3/views/login/Index.vue
+++ b/app/javascript/v3/views/login/Index.vue
@@ -1,21 +1,21 @@
 <template>
   <main
-    class="flex flex-col bg-woot-25 min-h-screen w-full py-20 sm:px-6 lg:px-8 dark:bg-slate-900"
+    class="flex flex-col w-full min-h-screen py-20 bg-woot-25 sm:px-6 lg:px-8 dark:bg-slate-900"
   >
     <section class="max-w-5xl mx-auto">
       <img
         :src="globalConfig.logo"
         :alt="globalConfig.installationName"
-        class="mx-auto h-8 w-auto block dark:hidden"
+        class="block w-auto h-8 mx-auto dark:hidden"
       />
       <img
         v-if="globalConfig.logoDark"
         :src="globalConfig.logoDark"
         :alt="globalConfig.installationName"
-        class="mx-auto h-8 w-auto hidden dark:block"
+        class="hidden w-auto h-8 mx-auto dark:block"
       />
       <h2
-        class="mt-6 text-center text-3xl font-medium text-slate-900 dark:text-woot-50"
+        class="mt-6 text-3xl font-medium text-center text-slate-900 dark:text-woot-50"
       >
         {{
           useInstallationName($t('LOGIN.TITLE'), globalConfig.installationName)
@@ -23,10 +23,10 @@
       </h2>
       <p
         v-if="showSignupLink"
-        class="mt-3 text-center text-sm text-slate-600 dark:text-slate-400"
+        class="mt-3 text-sm text-center text-slate-600 dark:text-slate-400"
       >
         {{ $t('COMMON.OR') }}
-        <router-link to="auth/signup" class="text-link lowercase">
+        <router-link to="auth/signup" class="lowercase text-link">
           {{ $t('LOGIN.CREATE_NEW_ACCOUNT') }}
         </router-link>
       </p>
@@ -68,7 +68,7 @@
             <p v-if="!globalConfig.disableUserProfileUpdate">
               <router-link
                 to="auth/reset/password"
-                class="text-link text-sm"
+                class="text-sm text-link"
                 tabindex="4"
               >
                 {{ $t('LOGIN.FORGOT_PASSWORD') }}
@@ -165,7 +165,7 @@ export default {
       const message = ERROR_MESSAGES[this.authError] ?? 'LOGIN.API.UNAUTH';
       this.showAlert(this.$t(message));
       // wait for idle state
-      window.requestIdleCallback(() => {
+      this.requestIdleCallbackPolyfill(() => {
         // Remove the error query param from the url
         const { query } = this.$route;
         this.$router.replace({ query: { ...query, error: undefined } });
@@ -173,6 +173,19 @@ export default {
     }
   },
   methods: {
+    // TODO: Remove this when Safari gets wider support
+    // Ref: https://caniuse.com/requestidlecallback
+    //
+    requestIdleCallbackPolyfill(callback) {
+      if (window.requestIdleCallback) {
+        window.requestIdleCallback(callback);
+      } else {
+        // Fallback for safari
+        // Using a delay of 0 allows the callback to be executed asynchronously
+        // in the next available event loop iteration, similar to requestIdleCallback
+        setTimeout(callback, 0);
+      }
+    },
     showAlert(message) {
       // Reset loading, current selected agent
       this.loginApi.showLoading = false;
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index 8ede3805661d1..e6ada591433ca 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -52,7 +52,9 @@ const sendAttachment = ({ attachment, replyTo = null }) => {
 
   formData.append('message[referer_url]', referrerURL);
   formData.append('message[timestamp]', timestamp);
-  formData.append('message[reply_to]', replyTo);
+  if (replyTo !== null) {
+    formData.append('message[reply_to]', replyTo);
+  }
   return {
     url: `/api/v1/widget/messages${window.location.search}`,
     params: formData,
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index 1d68a92637bde..7fed572e72924 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -49,7 +49,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { mixin as clickaway } from 'vue-clickaway';
 
 import ChatAttachmentButton from 'widget/components/ChatAttachment.vue';
 import ChatSendButton from 'widget/components/ChatSendButton.vue';
@@ -69,7 +68,7 @@ export default {
     FluentIcon,
     ResizableTextArea,
   },
-  mixins: [clickaway, configMixin, darkModeMixin],
+  mixins: [configMixin, darkModeMixin],
   props: {
     onSendMessage: {
       type: Function,
diff --git a/app/javascript/widget/components/Form/PhoneInput.vue b/app/javascript/widget/components/Form/PhoneInput.vue
index bd164805f33ce..c7fafa916c7f4 100644
--- a/app/javascript/widget/components/Form/PhoneInput.vue
+++ b/app/javascript/widget/components/Form/PhoneInput.vue
@@ -39,6 +39,9 @@
       v-on-clickaway="closeDropdown"
       :class="dropdownBackgroundClass"
       class="country-dropdown h-48 overflow-y-auto z-10 absolute top-12 px-0 pt-0 pl-1 pr-1 pb-1 rounded shadow-lg"
+      @keydown.up="moveSelectionUp"
+      @keydown.down="moveSelectionDown"
+      @keydown.enter="onSelect"
     >
       <div class="sticky top-0" :class="dropdownBackgroundClass">
         <input
@@ -83,10 +86,8 @@
 </template>
 
 <script>
-import { mixin as clickaway } from 'vue-clickaway';
 import countries from 'shared/constants/countries.js';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
-import mentionSelectionKeyboardMixin from 'dashboard/components/widgets/mentions/mentionSelectionKeyboardMixin.js';
 import FormulateInputMixin from '@braid/vue-formulate/src/FormulateInputMixin';
 import darkModeMixin from 'widget/mixins/darkModeMixin';
 
@@ -94,12 +95,7 @@ export default {
   components: {
     FluentIcon,
   },
-  mixins: [
-    mentionSelectionKeyboardMixin,
-    FormulateInputMixin,
-    darkModeMixin,
-    clickaway,
-  ],
+  mixins: [FormulateInputMixin, darkModeMixin],
   props: {
     placeholder: {
       type: String,
@@ -191,6 +187,14 @@ export default {
       );
     },
   },
+  watch: {
+    items(newItems) {
+      if (newItems.length < this.selectedIndex + 1) {
+        // Reset the selected index to 0 if the new items length is less than the selected index.
+        this.selectedIndex = 0;
+      }
+    },
+  },
   methods: {
     setContextValue(code) {
       // This function is used to set the context value.
@@ -220,27 +224,47 @@ export default {
     },
     dropdownItem() {
       // This function is used to get all the items in the dropdown.
+      if (!this.showDropdown) return [];
       return Array.from(
-        this.$refs.dropdown.querySelectorAll(
+        this.$refs.dropdown?.querySelectorAll(
           'div.country-dropdown div.country-dropdown--item'
         )
       );
     },
     focusedOrActiveItem(className) {
       // This function is used to get the focused or active item in the dropdown.
+      if (!this.showDropdown) return [];
       return Array.from(
-        this.$refs.dropdown.querySelectorAll(
+        this.$refs.dropdown?.querySelectorAll(
           `div.country-dropdown div.country-dropdown--item.${className}`
         )
       );
     },
-    handleKeyboardEvent(e) {
-      if (this.showDropdown) {
-        this.processKeyDownEvent(e);
+    adjustScroll() {
+      this.$nextTick(() => {
         this.scrollToFocusedOrActiveItem(this.focusedOrActiveItem('focus'));
+      });
+    },
+    adjustSelection(direction) {
+      if (!this.showDropdown) return;
+      const maxIndex = this.items.length - 1;
+      if (direction === 'up') {
+        this.selectedIndex =
+          this.selectedIndex <= 0 ? maxIndex : this.selectedIndex - 1;
+      } else if (direction === 'down') {
+        this.selectedIndex =
+          this.selectedIndex >= maxIndex ? 0 : this.selectedIndex + 1;
       }
+      this.adjustScroll();
+    },
+    moveSelectionUp() {
+      this.adjustSelection('up');
+    },
+    moveSelectionDown() {
+      this.adjustSelection('down');
     },
     onSelect() {
+      if (!this.showDropdown || this.selectedIndex === -1) return;
       this.onSelectCountry(this.items[this.selectedIndex]);
     },
     scrollToFocusedOrActiveItem(item) {
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index 6ac532ba1a81d..13cd889c8ae53 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -90,8 +90,8 @@
     }
   },
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "PLACEHOLDER": "Cerca emojis",
+    "NOT_FOUND": "Cap emoji coincideix amb la teva cerca"
   },
   "CSAT": {
     "TITLE": "Rate your conversation",
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index 4b28e1b7158a3..fc18a102bce30 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -20,23 +20,23 @@
     "IN_A_FEW_MINUTES": "Většinou odpovíme během pár minut",
     "IN_A_FEW_HOURS": "Většinou odpovíme během pár hodin",
     "IN_A_DAY": "Obvykle odpoví za den",
-    "BACK_IN": "We will be back online"
+    "BACK_IN": "Budem online zase"
   },
   "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
+    "Neděle",
+    "Pondělí",
+    "Úterý",
+    "Středa",
+    "Čtvrtek",
+    "Pátek",
+    "Sobota"
   ],
   "START_CONVERSATION": "Zahájit konverzaci",
   "END_CONVERSATION": "Ukončit konverzaci",
   "CONTINUE_CONVERSATION": "Pokračovat v konverzaci",
-  "YOU": "You",
+  "YOU": "Vy",
   "START_NEW_CONVERSATION": "Zahájit novou konverzaci",
-  "VIEW_UNREAD_MESSAGES": "You have unread messages",
+  "VIEW_UNREAD_MESSAGES": "Máte nepřečtené zprávy",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Zobrazit nové zprávy",
     "CLOSE_MESSAGES_BUTTON": "Zavřít",
@@ -68,8 +68,8 @@
         "LABEL": "Telefonní číslo",
         "PLACEHOLDER": "Zadejte prosím Vaše telefonní číslo",
         "REQUIRED_ERROR": "Telefonní číslo je vyžadováno",
-        "DIAL_CODE_VALID_ERROR": "Please select a country code",
-        "VALID_ERROR": "Please enter a valid phone number",
+        "DIAL_CODE_VALID_ERROR": "Vyberte prosím kód země",
+        "VALID_ERROR": "Zadejte prosím platné telefonní číslo",
         "DROPDOWN_EMPTY": "Žádné výsledky"
       },
       "MESSAGE": {
@@ -80,8 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Zadejte své jméno a e-mail před zahájením konverzace",
     "IS_REQUIRED": "je vyžadováno",
-    "REQUIRED": "Required",
-    "REGEX_ERROR": "Please provide a valid input"
+    "REQUIRED": "Povinné",
+    "REGEX_ERROR": "Zadejte prosím platnou hodnotu"
   },
   "FILE_SIZE_LIMIT": "Soubor překračuje limit {MAXIMUM_FILE_UPLOAD_SIZE} přílohy",
   "CHAT_FORM": {
@@ -90,8 +90,8 @@
     }
   },
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "PLACEHOLDER": "Hledat emoji",
+    "NOT_FOUND": "Žádné emoji neodpovídají vašemu hledání"
   },
   "CSAT": {
     "TITLE": "Ohodnoťte svou konverzaci",
@@ -105,14 +105,14 @@
   },
   "INTEGRATIONS": {
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the call"
+      "CLICK_HERE_TO_JOIN": "Přidejte se kliknutím sem",
+      "LEAVE_THE_ROOM": "Opustit hovor"
     }
   },
   "PORTAL": {
-    "POPULAR_ARTICLES": "Popular Articles",
-    "VIEW_ALL_ARTICLES": "View all articles",
-    "IFRAME_LOAD_ERROR": "There was an error loading the article, please refresh the page and try again."
+    "POPULAR_ARTICLES": "Populární články",
+    "VIEW_ALL_ARTICLES": "Zobrazit všechny články",
+    "IFRAME_LOAD_ERROR": "Při načítání článku došlo k chybě, obnovte stránku a zkuste to znovu."
   },
   "ATTACHMENTS": {
     "image": {
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index b6586bf11a398..36a5202bdfac1 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -81,7 +81,7 @@
     "CAMPAIGN_HEADER": "Bitte geben Sie Ihren Namen und Ihre E-Mail-Adresse an, bevor Sie die Konversation beginnen",
     "IS_REQUIRED": "erforderlich",
     "REQUIRED": "Benötigt",
-    "REGEX_ERROR": "Please provide a valid input"
+    "REGEX_ERROR": "Bitte geben Sie eine gültige Eingabe ein"
   },
   "FILE_SIZE_LIMIT": "Die Datei überschreitet das Anhangslimit von {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 940ee9b75bfe4..a7f16c0462ba6 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -81,7 +81,7 @@
     "CAMPAIGN_HEADER": "لطفا قبل از شروع گفتگو نام و ایمیل خود را وارد کنید",
     "IS_REQUIRED": "مورد نیاز است",
     "REQUIRED": "ضروری",
-    "REGEX_ERROR": "Please provide a valid input"
+    "REGEX_ERROR": "لطفا یک ورودی معتبر ارائه دهید"
   },
   "FILE_SIZE_LIMIT": "فایل ضمیمه شده بیشتر از {MAXIMUM_FILE_UPLOAD_SIZE} است",
   "CHAT_FORM": {
diff --git a/app/jobs/account/contacts_export_job.rb b/app/jobs/account/contacts_export_job.rb
index b8e9dbc96c9c5..778542b3cc92d 100644
--- a/app/jobs/account/contacts_export_job.rb
+++ b/app/jobs/account/contacts_export_job.rb
@@ -1,44 +1,62 @@
 class Account::ContactsExportJob < ApplicationJob
   queue_as :low
 
-  def perform(account_id, column_names, email_to)
-    account = Account.find(account_id)
-    headers = valid_headers(column_names)
-    generate_csv(account, headers)
-    file_url = account_contact_export_url(account)
+  def perform(account_id, user_id, column_names, params)
+    @account = Account.find(account_id)
+    @params = params
+    @account_user = @account.users.find(user_id)
 
-    AdministratorNotifications::ChannelNotificationsMailer.with(account: account).contact_export_complete(file_url, email_to)&.deliver_later
+    headers = valid_headers(column_names)
+    generate_csv(headers)
+    send_mail
   end
 
-  def generate_csv(account, headers)
+  private
+
+  def generate_csv(headers)
     csv_data = CSV.generate do |csv|
       csv << headers
-      account.contacts.each do |contact|
+      contacts.each do |contact|
         csv << headers.map { |header| contact.send(header) }
       end
     end
 
-    attach_export_file(account, csv_data)
+    attach_export_file(csv_data)
+  end
+
+  def contacts
+    if @params.present? && @params[:payload].present? && @params[:payload].any?
+      result = ::Contacts::FilterService.new(@account, @account_user, @params).perform
+      result[:contacts]
+    elsif @params[:label].present?
+      @account.contacts.resolved_contacts.tagged_with(@params[:label], any: true)
+    else
+      @account.contacts.resolved_contacts
+    end
   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
+    (column_names.presence || default_columns) & Contact.column_names
   end
 
-  def attach_export_file(account, csv_data)
+  def attach_export_file(csv_data)
     return if csv_data.blank?
 
-    account.contacts_export.attach(
+    @account.contacts_export.attach(
       io: StringIO.new(csv_data),
-      filename: "#{account.name}_#{account.id}_contacts.csv",
+      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)
+  def send_mail
+    file_url = account_contact_export_url
+    mailer = AdministratorNotifications::ChannelNotificationsMailer.with(account: @account)
+    mailer.contact_export_complete(file_url, @account_user.email)&.deliver_later
+  end
+
+  def account_contact_export_url
+    Rails.application.routes.url_helpers.rails_blob_url(@account.contacts_export)
   end
 
   def default_columns
diff --git a/app/jobs/bulk_actions_job.rb b/app/jobs/bulk_actions_job.rb
index bc68b2b3672fc..73fa1b1517808 100644
--- a/app/jobs/bulk_actions_job.rb
+++ b/app/jobs/bulk_actions_job.rb
@@ -1,4 +1,6 @@
 class BulkActionsJob < ApplicationJob
+  include DateRangeHelper
+
   queue_as :medium
   attr_accessor :records
 
@@ -23,6 +25,7 @@ def bulk_conversation_update
     params = available_params(@params)
     records.each do |conversation|
       bulk_add_labels(conversation)
+      bulk_snoozed_until(conversation)
       conversation.update(params) if params
     end
   end
@@ -43,6 +46,10 @@ def bulk_add_labels(conversation)
     conversation.add_labels(@params[:labels][:add]) if @params[:labels] && @params[:labels][:add]
   end
 
+  def bulk_snoozed_until(conversation)
+    conversation.snoozed_until = parse_date_time(@params[:snoozed_until].to_s) if @params[:snoozed_until]
+  end
+
   def remove_labels(conversation)
     return unless @params[:labels] && @params[:labels][:remove]
 
diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index c528b9d6aca48..34f79d733df51 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -3,17 +3,16 @@
 class Inboxes::FetchImapEmailsJob < MutexApplicationJob
   queue_as :scheduled_jobs
 
-  def perform(channel)
+  def perform(channel, interval = 1)
     return unless should_fetch_email?(channel)
 
     key = format(::Redis::Alfred::EMAIL_MESSAGE_MUTEX, inbox_id: channel.inbox.id)
 
     with_lock(key, 5.minutes) do
-      process_email_for_channel(channel)
+      process_email_for_channel(channel, interval)
     end
   rescue *ExceptionList::IMAP_EXCEPTIONS => e
     Rails.logger.error "Authorization error for email channel - #{channel.inbox.id} : #{e.message}"
-    channel.authorization_error!
   rescue EOFError, OpenSSL::SSL::SSLError, Net::IMAP::NoResponseError, Net::IMAP::BadResponseError, Net::IMAP::InvalidResponseError => e
     Rails.logger.error "Error for email channel - #{channel.inbox.id} : #{e.message}"
   rescue LockAcquisitionError
@@ -28,15 +27,18 @@ def should_fetch_email?(channel)
     channel.imap_enabled? && !channel.reauthorization_required?
   end
 
-  def process_email_for_channel(channel)
+  def process_email_for_channel(channel, interval)
     inbound_emails = if channel.microsoft?
-                       Imap::MicrosoftFetchEmailService.new(channel: channel).perform
+                       Imap::MicrosoftFetchEmailService.new(channel: channel, interval: interval).perform
                      else
-                       Imap::FetchEmailService.new(channel: channel).perform
+                       Imap::FetchEmailService.new(channel: channel, interval: interval).perform
                      end
     inbound_emails.map do |inbound_mail|
       process_mail(inbound_mail, channel)
     end
+  rescue OAuth2::Error => e
+    Rails.logger.error "Error for email channel - #{channel.inbox.id} : #{e.message}"
+    channel.authorization_error!
   end
 
   def process_mail(inbound_mail, channel)
diff --git a/app/listeners/action_cable_listener.rb b/app/listeners/action_cable_listener.rb
index 5aac56db3e7b4..99a8fe2af146c 100644
--- a/app/listeners/action_cable_listener.rb
+++ b/app/listeners/action_cable_listener.rb
@@ -18,7 +18,7 @@ def notification_deleted(event)
 
     notification, account, unread_count, count = extract_notification_and_account(event)
     tokens = [event.data[:notification].user.pubsub_token]
-    broadcast(account, tokens, NOTIFICATION_DELETED, { notification: notification.push_event_data, unread_count: unread_count, count: count })
+    broadcast(account, tokens, NOTIFICATION_DELETED, { notification: { id: notification.id }, unread_count: unread_count, count: count })
   end
 
   def account_cache_invalidated(event)
diff --git a/app/listeners/participation_listener.rb b/app/listeners/participation_listener.rb
new file mode 100644
index 0000000000000..b9f94e2529107
--- /dev/null
+++ b/app/listeners/participation_listener.rb
@@ -0,0 +1,15 @@
+class ParticipationListener < BaseListener
+  include Events::Types
+
+  def assignee_changed(event)
+    conversation, _account = extract_conversation_and_account(event)
+    return if conversation.assignee_id.blank?
+
+    conversation.conversation_participants.find_or_create_by!(user_id: conversation.assignee_id)
+  # We have observed race conditions triggering these errors
+  # example: Assignment happening via automation, while auto assignment is also configured.
+  rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
+    Rails.logger.warn "Failed to create conversation participant for account #{conversation.account.id} " \
+                      ": user #{conversation.assignee_id} : conversation #{conversation.id}"
+  end
+end
diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index a8308b48ad8b0..01c8219bddebf 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -12,6 +12,9 @@ def process(mail, channel)
     # prevent loop from chatwoot notification emails
     return if notification_email_from_chatwoot?
 
+    # Stop processing if email format doesn't match Chatwoot supported mail format
+    return unless email_from_valid_email?
+
     ActiveRecord::Base.transaction do
       find_or_create_contact
       find_or_create_conversation
@@ -34,6 +37,18 @@ def decorate_mail
     @processed_mail = MailPresenter.new(@inbound_mail, @account)
   end
 
+  def email_from_valid_email?
+    Rails.logger.info("Processing Email from: #{@processed_mail.original_sender} : inbox #{@inbox.id}")
+
+    # validate email with  Devise.email_regexp
+    if Devise.email_regexp.match?(@processed_mail.original_sender)
+      true
+    else
+      Rails.logger.error("Email from: #{@processed_mail.original_sender} : inbox #{@inbox.id} is invalid")
+      false
+    end
+  end
+
   def find_conversation_by_in_reply_to
     return if in_reply_to.blank?
 
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index be9340dd0f1c0..1fb93c51af064 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -81,7 +81,7 @@ def file_metadata
       height: file.metadata[:height]
     }
 
-    metadata[:data_url] = metadata[:thumb_url] = external_url if message.instagram_story_mention?
+    metadata[:data_url] = metadata[:thumb_url] = external_url if message.inbox.instagram?
     metadata
   end
 
diff --git a/app/models/channel/telegram.rb b/app/models/channel/telegram.rb
index f6b97f2d24be4..7c09fe284eded 100644
--- a/app/models/channel/telegram.rb
+++ b/app/models/channel/telegram.rb
@@ -33,9 +33,9 @@ def telegram_api_url
   end
 
   def send_message_on_telegram(message)
-    return send_message(message) if message.attachments.empty?
-
-    send_attachments(message)
+    message_id = send_message(message) if message.content.present?
+    message_id = Telegram::SendAttachmentsService.new(message: message).perform if message.attachments.present?
+    message_id
   end
 
   def get_telegram_profile_image(user_id)
@@ -56,6 +56,23 @@ def get_telegram_file_path(file_id)
     "https://api.telegram.org/file/bot#{bot_token}/#{response.parsed_response['result']['file_path']}"
   end
 
+  def process_error(message, response)
+    return unless response.parsed_response['ok'] == false
+
+    # https://github.com/TelegramBotAPI/errors/tree/master/json
+    message.external_error = "#{response.parsed_response['error_code']}, #{response.parsed_response['description']}"
+    message.status = :failed
+    message.save!
+  end
+
+  def chat_id(message)
+    message.conversation[:additional_attributes]['chat_id']
+  end
+
+  def reply_to_message_id(message)
+    message.content_attributes['in_reply_to_external_id']
+  end
+
   private
 
   def ensure_valid_bot_token
@@ -77,29 +94,12 @@ def setup_telegram_webhook
     errors.add(:bot_token, 'error setting up the webook') unless response.success?
   end
 
-  def chat_id(message)
-    message.conversation[:additional_attributes]['chat_id']
-  end
-
-  def reply_to_message_id(message)
-    message.content_attributes['in_reply_to_external_id']
-  end
-
   def send_message(message)
     response = message_request(chat_id(message), message.content, reply_markup(message), reply_to_message_id(message))
     process_error(message, response)
     response.parsed_response['result']['message_id'] if response.success?
   end
 
-  def process_error(message, response)
-    return unless response.parsed_response['ok'] == false
-
-    # https://github.com/TelegramBotAPI/errors/tree/master/json
-    message.external_error = "#{response.parsed_response['error_code']}, #{response.parsed_response['description']}"
-    message.status = :failed
-    message.save!
-  end
-
   def reply_markup(message)
     return unless message.content_type == 'input_select'
 
@@ -114,41 +114,6 @@ def reply_markup(message)
     }.to_json
   end
 
-  def send_attachments(message)
-    send_message(message) unless message.content.nil?
-
-    telegram_attachments = []
-    message.attachments.each do |attachment|
-      telegram_attachment = {}
-      telegram_attachment[:type] = attachment_type(attachment[:file_type])
-      telegram_attachment[:media] = attachment.download_url
-      telegram_attachments << telegram_attachment
-    end
-
-    response = attachments_request(chat_id(message), telegram_attachments, reply_to_message_id(message))
-    process_error(message, response)
-    response.parsed_response['result'].first['message_id'] if response.success?
-  end
-
-  def attachment_type(file_type)
-    file_type_mappings = {
-      'audio' => 'audio',
-      'image' => 'photo',
-      'file' => 'document',
-      'video' => 'video'
-    }
-    file_type_mappings[file_type]
-  end
-
-  def attachments_request(chat_id, attachments, reply_to_message_id)
-    HTTParty.post("#{telegram_api_url}/sendMediaGroup",
-                  body: {
-                    chat_id: chat_id,
-                    media: attachments.to_json,
-                    reply_to_message_id: reply_to_message_id
-                  })
-  end
-
   def convert_markdown_to_telegram_html(text)
     # ref: https://core.telegram.org/bots/api#html-style
 
diff --git a/app/models/concerns/assignment_handler.rb b/app/models/concerns/assignment_handler.rb
index cf4ef123e041a..5dc89f779fbb2 100644
--- a/app/models/concerns/assignment_handler.rb
+++ b/app/models/concerns/assignment_handler.rb
@@ -32,13 +32,12 @@ def notify_assignment_change
       ASSIGNEE_CHANGED => -> { saved_change_to_assignee_id? },
       TEAM_CHANGED => -> { saved_change_to_team_id? }
     }.each do |event, condition|
-      condition.call && dispatcher_dispatch(event)
+      condition.call && dispatcher_dispatch(event, previous_changes)
     end
   end
 
   def process_assignment_changes
     process_assignment_activities
-    process_participant_assignment
   end
 
   def process_assignment_activities
@@ -49,10 +48,4 @@ def process_assignment_activities
       create_assignee_change_activity(user_name)
     end
   end
-
-  def process_participant_assignment
-    return unless saved_change_to_assignee_id? && assignee_id.present?
-
-    conversation_participants.find_or_create_by!(user_id: assignee_id)
-  end
 end
diff --git a/app/models/concerns/auto_assignment_handler.rb b/app/models/concerns/auto_assignment_handler.rb
index 059e4db715c51..de5fdae7df4fe 100644
--- a/app/models/concerns/auto_assignment_handler.rb
+++ b/app/models/concerns/auto_assignment_handler.rb
@@ -15,7 +15,6 @@ def run_auto_assignment
     return unless should_run_auto_assignment?
 
     ::AutoAssignment::AgentAssignmentService.new(conversation: self, allowed_agent_ids: inbox.member_ids_with_assignment_capacity).perform
-    conversation_participants.find_or_create_by(user_id: assignee_id) if assignee_id.present?
   end
 
   def should_run_auto_assignment?
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 95ee69c757bc6..c79dd3e9ea5da 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -25,6 +25,7 @@
 # Indexes
 #
 #  index_contacts_on_account_id                          (account_id)
+#  index_contacts_on_account_id_and_last_activity_at     (account_id,last_activity_at DESC NULLS LAST)
 #  index_contacts_on_blocked                             (blocked)
 #  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
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 4d2ce55ba48a8..3a39b82fcbda5 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -41,7 +41,6 @@
 #  index_conversations_on_first_reply_created_at      (first_reply_created_at)
 #  index_conversations_on_id_and_account_id           (account_id,id)
 #  index_conversations_on_inbox_id                    (inbox_id)
-#  index_conversations_on_last_activity_at            (last_activity_at)
 #  index_conversations_on_priority                    (priority)
 #  index_conversations_on_status_and_account_id       (status,account_id)
 #  index_conversations_on_status_and_priority         (status,priority)
@@ -110,7 +109,7 @@ class Conversation < ApplicationRecord
 
   after_update_commit :execute_after_update_commit_callbacks
   after_create_commit :notify_conversation_creation
-  after_commit :set_display_id, unless: :display_id?
+  after_create_commit :load_attributes_created_by_db_triggers
 
   delegate :auto_resolve_duration, to: :account
 
@@ -257,8 +256,13 @@ def self_assign?(assignee_id)
     assignee_id.present? && Current.user&.id == assignee_id
   end
 
-  def set_display_id
-    reload
+  def load_attributes_created_by_db_triggers
+    # Display id is set via a trigger in the database
+    # So we need to specifically fetch it after the record is created
+    # We can't use reload because it will clear the previous changes, which we need for the dispatcher
+    obj_from_db = self.class.find(id)
+    self[:display_id] = obj_from_db[:display_id]
+    self[:uuid] = obj_from_db[:uuid]
   end
 
   def notify_status_change
@@ -310,5 +314,4 @@ def validate_referer_url
 end
 
 Conversation.include_mod_with('Concerns::Conversation')
-Conversation.include_mod_with('SentimentAnalysisHelper')
 Conversation.prepend_mod_with('Conversation')
diff --git a/app/models/message.rb b/app/models/message.rb
index 143e35041936c..6244d050ca532 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -24,6 +24,7 @@
 #
 # Indexes
 #
+#  index_messages_on_account_created_type               (account_id,created_at,message_type)
 #  index_messages_on_account_id                         (account_id)
 #  index_messages_on_account_id_and_inbox_id            (account_id,inbox_id)
 #  index_messages_on_additional_attributes_campaign_id  (((additional_attributes -> 'campaign_id'::text))) USING gin
@@ -59,6 +60,7 @@ class Message < ApplicationRecord
   }.to_json.freeze
 
   before_validation :ensure_content_type
+  before_validation :prevent_message_flooding
   before_save :ensure_processed_message_content
   before_save :ensure_in_reply_to
 
@@ -227,6 +229,18 @@ def save_story_info(story_info)
 
   private
 
+  def prevent_message_flooding
+    # Added this to cover the validation specs in messages
+    # We can revisit and see if we can remove this later
+    return if conversation.blank?
+
+    # there are cases where automations can result in message loops, we need to prevent such cases.
+    if conversation.messages.where('created_at >= ?', 1.minute.ago).count >= Limits.conversation_message_per_minute_limit
+      Rails.logger.error "Too many message: Account Id - #{account_id} : Conversation id - #{conversation_id}"
+      errors.add(:base, 'Too many messages')
+    end
+  end
+
   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)
@@ -256,7 +270,6 @@ def execute_after_create_commit_callbacks
     reopen_conversation
     notify_via_mail
     set_conversation_activity
-    update_message_sentiments
     dispatch_create_events
     send_reply
     execute_message_template_hooks
@@ -393,10 +406,6 @@ def set_conversation_activity
     conversation.update_columns(last_activity_at: created_at)
     # rubocop:enable Rails/SkipsModelValidations
   end
-
-  def update_message_sentiments
-    # override in the enterprise ::Enterprise::SentimentAnalysisJob.perform_later(self)
-  end
 end
 
 Message.prepend_mod_with('Message')
diff --git a/app/services/contacts/filter_service.rb b/app/services/contacts/filter_service.rb
index d3b24e4e2fd8e..973dc4b406b0c 100644
--- a/app/services/contacts/filter_service.rb
+++ b/app/services/contacts/filter_service.rb
@@ -1,6 +1,13 @@
 class Contacts::FilterService < FilterService
   ATTRIBUTE_MODEL = 'contact_attribute'.freeze
 
+  def initialize(account, user, params)
+    @account = account
+    # TODO: Change the order of arguments in FilterService maybe?
+    # account, user, params makes more sense
+    super(params, user)
+  end
+
   def perform
     @contacts = query_builder(@filters['contacts'])
 
@@ -21,8 +28,9 @@ def filter_values(query_hash)
     end
   end
 
+  # TODO: @account.contacts.resolved_contacts ? to stay consistant with the behavior in ui
   def base_relation
-    Current.account.contacts
+    @account.contacts
   end
 
   def filter_config
diff --git a/app/services/imap/base_fetch_email_service.rb b/app/services/imap/base_fetch_email_service.rb
index 1af3bdb5dd46b..09332092cb79e 100644
--- a/app/services/imap/base_fetch_email_service.rb
+++ b/app/services/imap/base_fetch_email_service.rb
@@ -1,7 +1,7 @@
 require 'net/imap'
 
 class Imap::BaseFetchEmailService
-  pattr_initialize [:channel!]
+  pattr_initialize [:channel!, :interval]
 
   def fetch_emails
     # Override this method
@@ -99,10 +99,10 @@ def fetch_message_ids_with_sequence
   end
 
   # Sends a SEARCH command to search the mailbox for messages that were
-  # created between yesterday and today and returns message sequence numbers.
+  # created between yesterday (or given date) and today and returns message sequence numbers.
   # Return <message set>
   def fetch_available_mail_sequence_numbers
-    imap_client.search(['SINCE', yesterday])
+    imap_client.search(['SINCE', since])
   end
 
   def build_imap_client
@@ -123,7 +123,8 @@ def build_mail_from_string(raw_email_content)
     Mail.read_from_string(raw_email_content)
   end
 
-  def yesterday
-    (Time.zone.today - 1).strftime('%d-%b-%Y')
+  def since
+    previous_day = Time.zone.today - (interval || 1).to_i
+    previous_day.strftime('%d-%b-%Y')
   end
 end
diff --git a/app/services/telegram/send_attachments_service.rb b/app/services/telegram/send_attachments_service.rb
new file mode 100644
index 0000000000000..2f69026b216c0
--- /dev/null
+++ b/app/services/telegram/send_attachments_service.rb
@@ -0,0 +1,138 @@
+# Telegram Attachment APIs: ref: https://core.telegram.org/bots/api#inputfile
+
+# Media attachments like photos, videos can be clubbed together and sent as a media group
+# Audio can be clubbed together and send as a media group, but can't be mixed with other types
+# Documents are sent individually
+
+# We are using `HTTP URL` to send media attachments, telegram will directly download the media from the URL and send it to the user.
+# But for documents, we need to send the file as a multipart request. as telegram only support pdf and zip for the download from the URL option.
+
+# ref: `In sendDocument, sending by URL will currently only work for GIF, PDF and ZIP files.`
+# ref: `https://core.telegram.org/bots/api#senddocument`
+# ref: `https://core.telegram.org/bots/api#sendmediaGroup
+
+# The service will terminate if any of the attachment requests fail when the message has multiple attachments
+# We will create multiple messages in telegram if the message has multiple attachments (if its documents or mixed media).
+class Telegram::SendAttachmentsService
+  pattr_initialize [:message!]
+
+  def perform
+    attachment_message_id = nil
+
+    group_attachments_by_type.each do |type, attachments|
+      attachment_message_id = process_attachments_by_type(type, attachments)
+      break if attachment_message_id.nil?
+    end
+
+    attachment_message_id
+  end
+
+  private
+
+  def process_attachments_by_type(type, attachments)
+    response = send_attachments(type, attachments)
+    return extract_attachment_message_id(response) if handle_response(response)
+
+    nil
+  end
+
+  def send_attachments(type, attachments)
+    if [:media, :audio].include?(type)
+      media_group_request(channel.chat_id(message), attachments, channel.reply_to_message_id(message))
+    else
+      send_individual_attachments(attachments)
+    end
+  end
+
+  def group_attachments_by_type
+    attachments_by_type = { media: [], audio: [], document: [] }
+
+    message.attachments.each do |attachment|
+      type = attachment_type(attachment[:file_type])
+      attachment_data = { type: type, media: attachment.download_url, attachment: attachment }
+      case type
+      when 'document'
+        attachments_by_type[:document] << attachment_data
+      when 'audio'
+        attachments_by_type[:audio] << attachment_data
+      when 'photo', 'video'
+        attachments_by_type[:media] << attachment_data
+      end
+    end
+
+    attachments_by_type.reject { |_, v| v.empty? }
+  end
+
+  def attachment_type(file_type)
+    { 'audio' => 'audio', 'image' => 'photo', 'file' => 'document', 'video' => 'video' }[file_type] || 'document'
+  end
+
+  def media_group_request(chat_id, attachments, reply_to_message_id)
+    HTTParty.post("#{channel.telegram_api_url}/sendMediaGroup",
+                  body: {
+                    chat_id: chat_id,
+                    media: attachments.map { |hash| hash.except(:attachment) }.to_json,
+                    reply_to_message_id: reply_to_message_id
+                  })
+  end
+
+  def send_individual_attachments(attachments)
+    response = nil
+    attachments.map do |attachment|
+      response = document_request(channel.chat_id(message), attachment, channel.reply_to_message_id(message))
+      break unless handle_response(response)
+    end
+    response
+  end
+
+  def document_request(chat_id, attachment, reply_to_message_id)
+    temp_file_path = save_attachment_to_tempfile(attachment[:attachment])
+    response = send_file(chat_id, temp_file_path, reply_to_message_id)
+    File.delete(temp_file_path)
+    response
+  end
+
+  # Telegram picks up the file name from original field name, so we need to save the file with the original name.
+  # Hence not using Tempfile here.
+  def save_attachment_to_tempfile(attachment)
+    raw_data = attachment.file.download
+    temp_dir = Rails.root.join('tmp/uploads')
+    FileUtils.mkdir_p(temp_dir)
+    temp_file_path = File.join(temp_dir, attachment.file.filename.to_s)
+    File.write(temp_file_path, raw_data, mode: 'wb')
+    temp_file_path
+  end
+
+  def send_file(chat_id, file_path, reply_to_message_id)
+    File.open(file_path, 'rb') do |file|
+      HTTParty.post("#{channel.telegram_api_url}/sendDocument",
+                    body: {
+                      chat_id: chat_id,
+                      document: file,
+                      reply_to_message_id: reply_to_message_id
+                    },
+                    multipart: true)
+    end
+  end
+
+  def handle_response(response)
+    return true if response.success?
+
+    Rails.logger.error "Message Id: #{message.id}  - Error sending attachment to telegram:  #{response.parsed_response}"
+    channel.process_error(message, response)
+    false
+  end
+
+  def extract_attachment_message_id(response)
+    return unless response.success?
+
+    result = response.parsed_response['result']
+    # response will be an array if the request for media group
+    # response will be a hash if the request for document
+    result.is_a?(Array) ? result.first['message_id'] : result['message_id']
+  end
+
+  def channel
+    @channel ||= message.inbox.channel
+  end
+end
diff --git a/app/views/api/v1/accounts/show.json.jbuilder b/app/views/api/v1/accounts/show.json.jbuilder
index 2f1bbcbc63607..cb8c27c92b59c 100644
--- a/app/views/api/v1/accounts/show.json.jbuilder
+++ b/app/views/api/v1/accounts/show.json.jbuilder
@@ -1,2 +1,3 @@
 json.partial! 'api/v1/models/account', formats: [:json], resource: @account
 json.latest_chatwoot_version @latest_chatwoot_version
+json.partial! 'enterprise/api/v1/accounts/partials/account', account: @account if ChatwootApp.enterprise?
diff --git a/app/views/api/v2/accounts/reports/agents.csv.erb b/app/views/api/v2/accounts/reports/agents.csv.erb
index dfc90f0168e38..3b5d765f17adf 100644
--- a/app/views/api/v2/accounts/reports/agents.csv.erb
+++ b/app/views/api/v2/accounts/reports/agents.csv.erb
@@ -4,7 +4,9 @@
     I18n.t('reports.agent_csv.agent_name'),
     I18n.t('reports.agent_csv.conversations_count'),
     I18n.t('reports.agent_csv.avg_first_response_time'),
-    I18n.t('reports.agent_csv.avg_resolution_time')
+    I18n.t('reports.agent_csv.avg_resolution_time'),
+    I18n.t('reports.agent_csv.avg_customer_waiting_time'),
+    I18n.t('reports.agent_csv.resolution_count')
   ]
 %>
 <%= CSVSafe.generate_line headers -%>
diff --git a/app/views/api/v2/accounts/reports/teams.csv.erb b/app/views/api/v2/accounts/reports/teams.csv.erb
index 1c2e6084a25b6..6ba4a001f040e 100644
--- a/app/views/api/v2/accounts/reports/teams.csv.erb
+++ b/app/views/api/v2/accounts/reports/teams.csv.erb
@@ -4,7 +4,9 @@
     I18n.t('reports.team_csv.team_name'),
     I18n.t('reports.team_csv.conversations_count'),
     I18n.t('reports.team_csv.avg_first_response_time'),
-    I18n.t('reports.team_csv.avg_resolution_time')
+    I18n.t('reports.team_csv.avg_resolution_time'),
+    I18n.t('reports.team_csv.avg_customer_waiting_time'),
+    I18n.t('reports.team_csv.resolution_count')
   ]
 %>
 <%= CSVSafe.generate_line headers -%>
diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index f3f0083056557..bdb05e19c2f63 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -128,7 +128,7 @@ By default, it renders:
       tocHeader: '<%= I18n.t('public_portal.toc_header') %>'
     };
   </script>
-  <% if @portal.channel_web_widget.present? %>
+  <% if @portal.channel_web_widget.present? && !@is_plain_layout_enabled %>
   <%= @portal.channel_web_widget.web_widget_script.html_safe %>
   <% end %>
 </html>
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index ed5723556a23f..2bf6da96fb29b 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -54,8 +54,7 @@
       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_FRONTEND_DSN', '') || ENV.fetch('SENTRY_DSN', '') %>'
     </script>
     <% if @global_config['ANALYTICS_TOKEN'].present? %>
     <script>
diff --git a/app/views/public/api/v1/portals/sitemap.xml.erb b/app/views/public/api/v1/portals/sitemap.xml.erb
new file mode 100644
index 0000000000000..d3e2b8301f3c1
--- /dev/null
+++ b/app/views/public/api/v1/portals/sitemap.xml.erb
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex>
+  <% @portal.articles.where(status: :published).each do |article| %>
+    <sitemap>
+      <loc><%= @help_center_url %><%= generate_article_link(@portal.slug, article.slug, false, false) %></loc>
+      <lastmod><%= article.updated_at.strftime("%Y-%m-%d") %></lastmod>
+    </sitemap>
+  <% end %>
+</sitemapindex>
\ No newline at end of file
diff --git a/config/app.yml b/config/app.yml
index c3aaff45e596d..592467ee13420 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '3.8.0'
+  version: '3.9.0'
 
 development:
   <<: *shared
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 440fc43cb32c5..4b2831ca5755a 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -149,7 +149,7 @@ def path_without_extentions
   end
 
   ## Prevent abuse of contact search api
-  throttle('/api/v1/accounts/:account_id/contacts/search', limit: 5, period: 1.minute) do |req|
+  throttle('/api/v1/accounts/:account_id/contacts/search', limit: ENV.fetch('RATE_LIMIT_CONTACT_SEARCH', '100').to_i, period: 1.minute) do |req|
     match_data = %r{/api/v1/accounts/(?<account_id>\d+)/contacts/search}.match(req.path)
     match_data[:account_id] if match_data.present?
   end
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 9db5278328735..80bfbfd6177e2 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -135,8 +135,13 @@
   description: 'The Chatwoot Inbox HMAC Key for Contact Support in Cloud'
   locked: false
 - name: CHATWOOT_CLOUD_PLANS
+  display_title: 'Cloud Plans'
   value:
   description: 'Config to store stripe plans for cloud'
+- name: CHATWOOT_CLOUD_PLAN_FEATURES
+  display_title: 'Planwise Features List'
+  value:
+  description: 'Config to features and their associated plans'
 - name: DEPLOYMENT_ENV
   value: self-hosted
   description: 'The deployment environment of the installation, to differentiate between Chatwoot cloud and self-hosted'
diff --git a/config/locales/am.yml b/config/locales/am.yml
index c296749f98a78..fb5adb95943e8 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -74,6 +74,8 @@ am:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ am:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9ccc202ba8202..77dc32cd10806 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -74,6 +74,8 @@ ar:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: عدد مرات الإغلاق
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: اسم صندوق الوارد
       inbox_type: نوع صندوق البريد
@@ -90,6 +92,8 @@ ar:
       conversations_count: عدد المحادثات
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: عدد مرات الإغلاق
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
@@ -233,7 +237,7 @@ ar:
       appearance:
         system: النظام
         light: Light
-        dark: Dark
+        dark: مظلم
       featured_articles: Featured Articles
       uncategorized: Uncategorized
     404:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 8f9dea64ae2d4..595d67e53a7c6 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -74,6 +74,8 @@ bg:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ bg:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 877ddb29d79ff..d694a616c5291 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -63,9 +63,9 @@ ca:
         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.
-      invalid_attribute: Invalid attribute key - [%{key}]. The key should be one of [%{allowed_keys}] or a custom attribute defined in the account.
-      invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
-      invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
+      invalid_attribute: 'Clau d''atribut no vàlida: [%{key}]. La clau hauria de ser una de [%{allowed_keys}] o un atribut personalitzat definit al compte.'
+      invalid_operator: Operador no vàlid. Els operadors permesos per a %{attribute_name} son [%{allowed_keys}].
+      invalid_value: Valor no vàlid. Els valors proporcionats per a %{attribute_name} no són vàlids
   reports:
     period: Període d'informes %{since} a %{until}
     utc_warning: The report generated is in UTC timezone
@@ -74,6 +74,8 @@ ca:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Total de resolucions
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ca:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Total de resolucions
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 36ad62fba923d..beb6c8e8d67fd 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -74,6 +74,8 @@ cs:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Počet rozlišení
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ cs:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Počet rozlišení
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 2ca73679ca36d..b2437c67f88ad 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -74,6 +74,8 @@ da:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Antal Afsluttede
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Indbakkens navn
       inbox_type: Indbakke type
@@ -90,6 +92,8 @@ da:
       conversations_count: Samtaler tæller
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Antal Afsluttede
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7b8140580e944..76246d5c10861 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -74,6 +74,8 @@ de:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Auflösungsanzahl
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Posteingangsname
       inbox_type: Posteingangstyp
@@ -90,6 +92,8 @@ de:
       conversations_count: Anzahl Gespräche
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Auflösungsanzahl
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Zeitzone
     sla_csv:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 5bb5db9ef2df5..21f49c7170fa2 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -74,6 +74,8 @@ el:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Αριθμός Αναλύσεων
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Όνομα Κιβωτίου
       inbox_type: Τύπος κιβωτίου εισερχόμενων
@@ -90,6 +92,8 @@ el:
       conversations_count: Αριθμός συνομιλιών
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Αριθμός Αναλύσεων
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 92c56574dab89..44c4d76cba902 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -88,6 +88,8 @@ en:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -104,6 +106,8 @@ en:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2ec08fb1de51b..8c5dab736f1da 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -74,6 +74,8 @@ es:
       conversations_count: Conversaciones asignadas
       avg_first_response_time: Promedio de tiempo de la primera respuesta
       avg_resolution_time: Tiempo promedio de resolución
+      resolution_count: Número de resoluciones
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Nombre de la bandeja de entrada
       inbox_type: Tipo de bandeja de entrada
@@ -90,6 +92,8 @@ es:
       conversations_count: Cantidad de conversaciones
       avg_first_response_time: Promedio de tiempo de la primera respuesta
       avg_resolution_time: Tiempo promedio de resolución
+      resolution_count: Número de resoluciones
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index decf5f124f12b..0c303071d5797 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -51,7 +51,7 @@ fa:
     dyte:
       invalid_message_type: "نوع پیام نامعتبر است. اقدام مجاز نیست"
     slack:
-      invalid_channel_id: "Invalid slack channel. Please try again"
+      invalid_channel_id: "کانال اسلک نامعتبر است. لطفا دوباره تلاش کنید"
     inboxes:
       imap:
         socket_error: لطفا اتصال شبکه، آدرس IMAP را بررسی کنید و دوباره امتحان کنید.
@@ -63,44 +63,48 @@ fa:
         name: نباید با نمادها شروع یا ختم شود و نباید دارای کاراکترهای < > / \ @ باشد.
     custom_filters:
       number_of_records: سررسید محدودیت. حداکثر تعداد قابل قبول فیلترها برای یک کاربر در هر اکانت 50 می باشند.
-      invalid_attribute: Invalid attribute key - [%{key}]. The key should be one of [%{allowed_keys}] or a custom attribute defined in the account.
-      invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
-      invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
+      invalid_attribute: کلید ویژگی معتبر نیست (%{key}). کلید باید یکی از %{allowed_keys} باشد یا یک ویژگی سفارشی ایجاد شده در حساب.
+      invalid_operator: این عملیات مجاز نیست. عملیات های مجاز برای %{attribute_name} شامل %{allowed_keys} می باشد.
+      invalid_value: مقدار معتبر نیست. مقادیر ارائه شده برای %{attribute_name} معتبر نیست
   reports:
     period: زمان گزارش از %{since} تا %{until}
     utc_warning: گزارش تولید شده در منطقه زمانی UTC است
     agent_csv:
       agent_name: اسم ایجنت
-      conversations_count: Assigned conversations
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      conversations_count: گفتگو‌های اختصاص داده شده
+      avg_first_response_time: میانگین زمان تا اولین پاسخ
+      avg_resolution_time: میانگین زمان حل مشکل
+      resolution_count: تعداد مسائل حل شده
+      avg_customer_waiting_time: میانگین زمان انتظار مشتری
     inbox_csv:
       inbox_name: نام صندوق ورودی
       inbox_type: نوع صندوق ورودی
       conversations_count: تعداد گفتگوها
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: میانگین زمان تا اولین پاسخ
+      avg_resolution_time: میانگین زمان حل مشکل
     label_csv:
       label_title: برچسب
       conversations_count: تعداد گفتگوها
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: میانگین زمان تا اولین پاسخ
+      avg_resolution_time: میانگین زمان حل مشکل
     team_csv:
       team_name: نام تیم
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: میانگین زمان تا اولین پاسخ
+      avg_resolution_time: میانگین زمان حل مشکل
+      resolution_count: تعداد مسائل حل شده
+      avg_customer_waiting_time: میانگین زمان انتظار مشتری
     conversation_traffic_csv:
       timezone: منطقه زمانی
     sla_csv:
-      conversation_id: Conversation ID
-      sla_policy_breached: SLA Policy
-      assignee: Assignee
+      conversation_id: شناسه گفتگو
+      sla_policy_breached: سیاست SLA
+      assignee: مسئول
       team: تیم‌
       inbox: صندوق ورودی
       labels: برچسب‌ها
-      conversation_link: Link to the Conversation
-      breached_events: Breached Events
+      conversation_link: پیوند به گفتگو
+      breached_events: رویدادهای نقض شده
     default_group_by: روز
     csat:
       headers:
@@ -114,15 +118,15 @@ fa:
         recorded_at: تاریخ ثبت شده
   notifications:
     notification_title:
-      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
-      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
-      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
-      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
-      sla_missed_first_response: "SLA target first response missed for conversation (#%{display_id})"
-      sla_missed_next_response: "SLA target next response missed for conversation (#%{display_id})"
-      sla_missed_resolution: "SLA target resolution missed for conversation (#%{display_id})"
-    attachment: "Attachment"
-    no_content: "No content"
+      conversation_creation: "یک گفتگو جدید (%{display_id}) در %{inbox_name} ایجاد شده است"
+      conversation_assignment: "یک گفتگو جدید (%{display_id}) به شما اختصاص داده شده"
+      assigned_conversation_new_message: "یک پیام جدید در گفتگوی %{display_id} ارسال شده"
+      conversation_mention: "به نام شما در گفتگو (%{display_id}) اشاره شده است"
+      sla_missed_first_response: "سیاست SLA مربوط به اولین پاسخ در گفتگوی (%{display_id}) نقض شده"
+      sla_missed_next_response: "سیاست SLA مربوط به پاسخ بعدی در گفتگوی (%{display_id}) نقض شده"
+      sla_missed_resolution: "سیاست SLA مربوط به زمان حل موضوع در گفتگوی (%{display_id}) نقض شده"
+    attachment: "پیوست"
+    no_content: "فاقد محتوا"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} در داستان به شما اشاره کرده: "
@@ -155,8 +159,8 @@ fa:
         added: "%{user_name}، %{labels} را اضافه کرد"
         removed: "%{user_name}، %{labels} را حذف کرد"
       sla:
-        added: "%{user_name} added SLA policy %{sla_name}"
-        removed: "%{user_name} removed SLA policy %{sla_name}"
+        added: "%{user_name} سیاست SLA %{sla_name} را اضافه کرد"
+        removed: "%{user_name} سیاست SLA %{sla_name} را حذف کرد"
       muted: "%{user_name} مکالمه را بی صدا کرد"
       unmuted: "%{user_name} مکالمه را از حالت بی صدا خراج کرد"
     templates:
@@ -201,10 +205,10 @@ fa:
       description: "ادغام FullContact به غنی سازی پروفایل بازدیدکنندگان کمک می کند. به محض به اشتراک گذاشتن آدرس ایمیل کاربران ، آنها را شناسایی کرده و به آنها خدمات مشتری مناسب ارائه دهید. با به اشتراک گذاشتن کلید APC FullContact ، حساب FullContact خود را به حساب خود وصل کنید."
     google_translate:
       name: "مترجم گوگل"
-      description: "با افزودن Google Translate یکپارچه سازی، ترجمه پیام ها را برای نمایندگان آسان تر کنید. Google translate به شناسایی خودکار زبان و تبدیل آن به زبان انتخاب شده توسط نماینده/مدیر حساب کمک می کند."
+      description: "با افزودن Google Translate یکپارچه سازی، ترجمه پیام ها را برای اپراتور آسان تر کنید. Google translate به شناسایی خودکار زبان و تبدیل آن به زبان انتخاب شده توسط اپراتور/مدیر حساب کمک می کند."
     openai:
       name: "OpenAI"
-      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
+      description: "با استفاده از مدل‌های GPT از OpenAI، ویژگی‌های قدرتمند هوش مصنوعی را در Chatwoot اضافه کنید."
   public_portal:
     search:
       search_placeholder: جستجوی مقاله براساس عنوان یا متن...
@@ -221,10 +225,10 @@ fa:
       article: مقاله
       articles: مقالات
       author: نویسنده
-      authors: authors
-      other: other
-      others: others
-      by: By
+      authors: نویسنده ها
+      other: دیگر
+      others: دیگران
+      by: توسط
       no_articles: هنوز هیچ مقاله‌ای در اینجا وجود ندارد
     footer:
       made_with: ساخته شده با
@@ -234,8 +238,8 @@ fa:
         system: سیستم
         light: روشن
         dark: تیره
-      featured_articles: Featured Articles
-      uncategorized: Uncategorized
+      featured_articles: مقالات برگزیده
+      uncategorized: دسته بندی نشده
     404:
       title: صفحه یافت نشد
       description: ما نتوانستیم صفحه مورد نظر شما را پیدا کنیم.
@@ -251,14 +255,14 @@ fa:
     button: باز کردن گفتگو
   time_units:
     days:
-      one: "%{count} day"
-      other: "%{count} days"
+      one: "%{count} روز"
+      other: "%{count} روز"
     hours:
-      one: "%{count} hour"
-      other: "%{count} hours"
+      one: "%{count} ساعت"
+      other: "%{count} ساعت"
     minutes:
-      one: "%{count} minute"
-      other: "%{count} minutes"
+      one: "%{count} قیقه"
+      other: "%{count} قیقه"
     seconds:
-      one: "%{count} second"
-      other: "%{count} seconds"
+      one: "%{count} ثانیه"
+      other: "%{count} ثانیه"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 02d5db4c86979..cd75e3f588006 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -74,6 +74,8 @@ fi:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Selvitysmäärä
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ fi:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Selvitysmäärä
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 58109ba197779..461a7d00143ce 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -74,6 +74,8 @@ fr:
       conversations_count: Conversations assignées
       avg_first_response_time: Temps moyen pour une première réponse
       avg_resolution_time: Temps nécessaire pour résoudre une demande (en moyenne)
+      resolution_count: Nombre de résolutions
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Nom de la boîte de réception
       inbox_type: Type de boîte de réception
@@ -90,6 +92,8 @@ fr:
       conversations_count: Nombre de conversations
       avg_first_response_time: Temps moyen pour une première réponse
       avg_resolution_time: Temps nécessaire pour résoudre une demande (en moyenne)
+      resolution_count: Nombre de résolutions
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Fuseau horaire
     sla_csv:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index dc9bab6ae4b2c..01b2fc03c4401 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -74,6 +74,8 @@ he:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: ספירת רזולוציות
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ he:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: ספירת רזולוציות
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index d4dfae64308aa..a03642b4eb434 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -74,6 +74,8 @@ hi:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ hi:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 20c340da1e711..a0380712f60a7 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -74,6 +74,8 @@ hr:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ hr:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index b185475d8b951..eba418ab7ab5b 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -74,6 +74,8 @@ hu:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Megoldások száma
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Fiók név
       inbox_type: Fiók típus
@@ -90,6 +92,8 @@ hu:
       conversations_count: Beszélgetésszám
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Megoldások száma
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Időzóna
     sla_csv:
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index c948e6a0c9d8a..3f566ce16459a 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -74,6 +74,8 @@ hy:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ hy:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index eb1e3b7d4a329..5d8c62fb36fcc 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -74,6 +74,8 @@ id:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Jumlah Terselesaikan
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Nama kotak masuk
       inbox_type: Jenis kotak masuk
@@ -90,6 +92,8 @@ id:
       conversations_count: Jumlah percakapan
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Jumlah Terselesaikan
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Zona Waktu
     sla_csv:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 25eac54a3be85..62010c6cb60b5 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -74,6 +74,8 @@ is:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ is:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 50205c6aa74d8..983e981c8782b 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -74,6 +74,8 @@ it:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Conteggio risoluzioni
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Nome casella
       inbox_type: Tipo casella
@@ -90,6 +92,8 @@ it:
       conversations_count: Numero di conversazioni
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Conteggio risoluzioni
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 6e11373cffaa9..f883e47b2f107 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -74,6 +74,8 @@ ja:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: 処理件数
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ja:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: 処理件数
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index a12f1e910f1e3..a59d1416c2669 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -74,6 +74,8 @@ ka:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ka:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 997f3d486e906..e23fb7d065aa9 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -74,6 +74,8 @@ ko:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: 해결 수
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ko:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: 해결 수
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 956ce981411bf..7b0c6e0b1cb7b 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -74,6 +74,8 @@ lt:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Sprendimų skaičius
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Gautų laiškų aplanko pavadinimas
       inbox_type: Gautų laiškų aplanko tipas
@@ -90,6 +92,8 @@ lt:
       conversations_count: Pokalbių skaičius
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Sprendimų skaičius
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Laiko zona
     sla_csv:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index a7acce339690c..72d0a228dc8a5 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -74,6 +74,8 @@ lv:
       conversations_count: Piešķirtās sarunas
       avg_first_response_time: Vidējais pirmās reakcijas laiks
       avg_resolution_time: Vidējais atrisināšanas laiks
+      resolution_count: Atrisināšanas Skaits
+      avg_customer_waiting_time: Vidējais klientu gaidīšanas laiks
     inbox_csv:
       inbox_name: Iesūtnes nosaukums
       inbox_type: Iesūtnes tips
@@ -90,6 +92,8 @@ lv:
       conversations_count: Sarunu skaits
       avg_first_response_time: Vidējais pirmās reakcijas laiks
       avg_resolution_time: Vidējais atrisināšanas laiks
+      resolution_count: Atrisināšanas Skaits
+      avg_customer_waiting_time: Vidējais klientu gaidīšanas laiks
     conversation_traffic_csv:
       timezone: Laika zona
     sla_csv:
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index acefd23a5a96f..0c1e742c9f6bd 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -74,6 +74,8 @@ ml:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: മിഴിവ് എണ്ണം
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ml:
       conversations_count: സംഭാഷണങ്ങളുടെ എണ്ണം
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: മിഴിവ് എണ്ണം
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 37a01c416e819..86b4900194377 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -74,6 +74,8 @@ ms:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ms:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index d8e2adfc20191..5fc0661bcdc36 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -74,6 +74,8 @@ ne:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ne:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6035d1ed874e3..7cf5bb26f5cb3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -74,6 +74,8 @@ nl:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Aantal Resoluties
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Naam postvak
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ nl:
       conversations_count: Aantal gesprekken
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Aantal Resoluties
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index f0a6a914b99d7..80d07a92c97d1 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -74,6 +74,8 @@
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Antall løsninger
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Antall løsninger
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3a1d5b08332c0..2701450982839 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -74,6 +74,8 @@ pl:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Liczba rozwiązań
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Nazwa skrzynki odbiorczej
       inbox_type: Typ skrzynki odbiorczej
@@ -90,6 +92,8 @@ pl:
       conversations_count: Liczba rozmów
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Liczba rozwiązań
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Strefa czasowa
     sla_csv:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 7ac2aa5ed31b9..3f3b0adc108b5 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -19,9 +19,9 @@
 pt:
   hello: "Olá, mundo"
   messages:
-    reset_password_success: Legal! Pedido de redefinição de senha bem sucedido. Verifique seu e-mail para obter instruções.
-    reset_password_failure: Uh ho! Não conseguimos encontrar nenhum usuário com o e-mail especificado.
-    inbox_deletetion_response: Seu pedido de exclusão da caixa de entrada será processado em algum momento.
+    reset_password_success: Legal! Pedido de redefinição de senha bem sucedido. Verifique o seu e-mail para obter instruções.
+    reset_password_failure: Uh ho! Não conseguimos encontrar nenhum uutilizador com o e-mail especificado.
+    inbox_deletetion_response: O seu pedido de eliminação de caixa de entrada será processado mais tarde.
   errors:
     validations:
       presence: não pode estar vazio
@@ -29,8 +29,8 @@ pt:
       invalid: Eventos inválidos
     signup:
       disposable_email: Não permitimos e-mails descartáveis
-      invalid_email: Você digitou um email inválido
-      email_already_exists: "Você já se inscreveu para uma conta com %{email}"
+      invalid_email: Digitou um email inválido
+      email_already_exists: "Já existe uma conta com o %{email}"
       invalid_params: 'Inválido, por favor, verifique os parâmetros de subscrição e tente novamente'
       failed: Falha na inscrição
     data_import:
@@ -74,6 +74,8 @@ pt:
       conversations_count: Conversas atribuídas
       avg_first_response_time: Média de tempo da primeira resposta
       avg_resolution_time: Média de tempo de resolução
+      resolution_count: Contagem de resolução
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Nome da caixa de entrada
       inbox_type: Tipo de caixa de entrada
@@ -90,17 +92,19 @@ pt:
       conversations_count: Número de conversas
       avg_first_response_time: Média de tempo da primeira resposta
       avg_resolution_time: Média de tempo de resolução
+      resolution_count: Contagem de resolução
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Fuso Horário
     sla_csv:
       conversation_id: ID da conversa
-      sla_policy_breached: SLA Policy
-      assignee: Assignee
+      sla_policy_breached: Política de SLA
+      assignee: Atribuído
       team: Equipa
       inbox: Caixa de Entrada
       labels: Etiquetas
-      conversation_link: Link to the Conversation
-      breached_events: Breached Events
+      conversation_link: Link para a Conversa
+      breached_events: Eventos não atingidos
     default_group_by: dia
     csat:
       headers:
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 61f452f8879d7..5579e3787d701 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -74,6 +74,8 @@ pt_BR:
       conversations_count: Conversas atribuídas
       avg_first_response_time: Tempo médio de primeira resposta
       avg_resolution_time: Tempo médio de resolução
+      resolution_count: Contagem de Resolução
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Nome da Caixa de Entrada
       inbox_type: Tipo da Caixa de Entrada
@@ -90,6 +92,8 @@ pt_BR:
       conversations_count: Contagem de conversas
       avg_first_response_time: Tempo médio de primeira resposta
       avg_resolution_time: Tempo médio de resolução
+      resolution_count: Contagem de Resolução
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Fuso horário
     sla_csv:
@@ -116,7 +120,7 @@ pt_BR:
     notification_title:
       conversation_creation: ""
       conversation_assignment: "Uma conversa (#%{display_id}) foi atribuída a você"
-      assigned_conversation_new_message: "Uma nova mensagem é criada na conversa (#%{display_id})"
+      assigned_conversation_new_message: "Uma nova mensagem foi criada na conversa (#%{display_id})"
       conversation_mention: "Você foi mencionado em uma conversa (#%{display_id})"
       sla_missed_first_response: "Primeira resposta da meta de SLA perdida para conversa (#%{display_id})"
       sla_missed_next_response: ""
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 60f0dcbcf0343..e6497dbef953a 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -74,6 +74,8 @@ ro:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Număr de rezoluții
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Nume Inbox
       inbox_type: Tip inbox
@@ -90,6 +92,8 @@ ro:
       conversations_count: Conversațiile contează
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Număr de rezoluții
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Fus orar
     sla_csv:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5b6f4ee70a224..0e384bee421ee 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -63,9 +63,9 @@ ru:
         name: Не должен начинаться или заканчиваться символами, и у него Не должно быть < > / \ @ символов.
     custom_filters:
       number_of_records: Достигнут лимит. Максимальное количество разрешенных пользовательских фильтров для каждого пользователя - 50.
-      invalid_attribute: Invalid attribute key - [%{key}]. The key should be one of [%{allowed_keys}] or a custom attribute defined in the account.
-      invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
-      invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
+      invalid_attribute: Недопустимый ключ атрибута - [%{key}]. Ключ должен быть одним из [%{allowed_keys}] или пользовательским атрибутом, указанным в учетной записи.
+      invalid_operator: Неверный оператор. Допустимыми операторами для %{attribute_name} являются [%{allowed_keys}].
+      invalid_value: Недопустимое значение. Значения, предоставленные для %{attribute_name} являются недопустимыми
   reports:
     period: Отчётный период с %{since} по %{until}
     utc_warning: Отчёт создан в часовом поясе UTC
@@ -74,6 +74,8 @@ ru:
       conversations_count: Назначенные диалоги
       avg_first_response_time: Среднее время первого ответа
       avg_resolution_time: Среднее время завершения
+      resolution_count: Количество завершенных
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Имя источника
       inbox_type: Тип входящего сообщения
@@ -90,17 +92,19 @@ ru:
       conversations_count: Количество бесед
       avg_first_response_time: Среднее время первого ответа
       avg_resolution_time: Среднее время завершения
+      resolution_count: Количество завершенных
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Часовой пояс
     sla_csv:
       conversation_id: ID диалога
-      sla_policy_breached: SLA Policy
-      assignee: Assignee
+      sla_policy_breached: Политика SLA
+      assignee: Назначено
       team: Команда
       inbox: Электронная почта
       labels: Категории
-      conversation_link: Link to the Conversation
-      breached_events: Breached Events
+      conversation_link: Ссылка на диалог
+      breached_events: Пропущенные события
     default_group_by: день
     csat:
       headers:
@@ -114,15 +118,15 @@ ru:
         recorded_at: Дата записи
   notifications:
     notification_title:
-      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
-      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
-      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
-      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
-      sla_missed_first_response: "SLA target first response missed for conversation (#%{display_id})"
-      sla_missed_next_response: "SLA target next response missed for conversation (#%{display_id})"
-      sla_missed_resolution: "SLA target resolution missed for conversation (#%{display_id})"
-    attachment: "Attachment"
-    no_content: "No content"
+      conversation_creation: "В %{inbox_name} создана беседа (#%{display_id})"
+      conversation_assignment: "Вам назначен диалог (#%{display_id})"
+      assigned_conversation_new_message: "Новое сообщение создано в разговоре (#%{display_id})"
+      conversation_mention: "Вас упомянули в разговоре (#%{display_id})"
+      sla_missed_first_response: "Целевой показатель SLA - пропущенный первый ответ для разговора (#%{display_id})"
+      sla_missed_next_response: "SLA целевой следующий ответ, пропущенный для разговора (#%{display_id})"
+      sla_missed_resolution: "Пропущен срок выполнения SLA для разговора (#%{display_id})"
+    attachment: "Вложение"
+    no_content: "Нет содержимого"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} упомянул Вас в истории: "
@@ -155,8 +159,8 @@ ru:
         added: "%{user_name} добавил %{labels}"
         removed: "%{user_name} удалил %{labels}"
       sla:
-        added: "%{user_name} added SLA policy %{sla_name}"
-        removed: "%{user_name} removed SLA policy %{sla_name}"
+        added: "%{user_name} добавил политику SLA %{sla_name}"
+        removed: "%{user_name} удалил политику SLA %{sla_name}"
       muted: "%{user_name} заглушил(а) этот разговор"
       unmuted: "%{user_name} включил(а) уведомления для разговора"
     templates:
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index d0fa964a110f8..0b938831dec42 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -74,6 +74,8 @@ sh:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ sh:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 41078b1f0a287..c37e472a0d3df 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -74,6 +74,8 @@ sk:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Počet vyriešených problémov
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ sk:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Počet vyriešených problémov
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1247542448042..d3f31c33f8896 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -74,6 +74,8 @@ sl:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ sl:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index fcc87044a39a4..6b84c4c243ee1 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -74,6 +74,8 @@ sq:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ sq:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 68bd6e14edf28..3f34d8cefd0e4 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -74,6 +74,8 @@ sr-Latn:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Broj rešenih
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Naziv prijemnog sandučeta
       inbox_type: Vrsta prijemnog sandučeta
@@ -90,6 +92,8 @@ sr-Latn:
       conversations_count: Broj razgovora
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Broj rešenih
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 641877571407d..d714a8e3dee4a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -74,6 +74,8 @@ sv:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Antal lösta
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ sv:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Antal lösta
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 56883ae2da204..ce5ed0773a00a 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -74,6 +74,8 @@ ta:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: தீர்மான எண்ணிக்கை
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ta:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: தீர்மான எண்ணிக்கை
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 54af8efdea2d3..2eaa9068dae8f 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -74,6 +74,8 @@ th:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: จำนวนความละเอียด
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ th:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: จำนวนความละเอียด
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index cf3acc23ce0ca..30f3798a7debc 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -74,6 +74,8 @@ tr:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Çözünürlük Sayısı
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox adı
       inbox_type: Inbox türü
@@ -90,6 +92,8 @@ tr:
       conversations_count: Konuşma sayısı
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Çözünürlük Sayısı
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Zaman dilimi
     sla_csv:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 09e668b8f7cd8..b8d87a79b6ccb 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -31,7 +31,7 @@ uk:
       disposable_email: Ми не дозволяємо використувати одноразові адреси електронної пошти
       invalid_email: Ви ввели неправильну адресу електронної пошти
       email_already_exists: "Ви вже зареєстровані з адресою %{email}"
-      invalid_params: 'Invalid, please check the signup paramters and try again'
+      invalid_params: 'Неправильно, будь ласка, перевірте параметри реєстрації та повторіть спробу'
       failed: Помилка реєстрації
     data_import:
       data_type:
@@ -51,7 +51,7 @@ uk:
     dyte:
       invalid_message_type: "Невірний тип повідомлення. Дію не дозволено"
     slack:
-      invalid_channel_id: "Invalid slack channel. Please try again"
+      invalid_channel_id: "Недійсний канал slack. Будь ласка, спробуйте ще раз"
     inboxes:
       imap:
         socket_error: Перевірте підключення до мережі, адреса IMAP і повторіть спробу.
@@ -62,44 +62,48 @@ uk:
       validations:
         name: не повинно починатись або закінчуватися символами, і він не повинен мати < > / \ @ символів.
     custom_filters:
-      number_of_records: Limit reached. The maximum number of allowed custom filters for a user per account is 50.
-      invalid_attribute: Invalid attribute key - [%{key}]. The key should be one of [%{allowed_keys}] or a custom attribute defined in the account.
-      invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
-      invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
+      number_of_records: Досягнуто ліміту. Максимальна кількість дозволених користувацьких фільтрів для користувача на рахунок становить 50.
+      invalid_attribute: Некоректний ключ атрибута - [%{key}]. Ключ повинен бути одним з [%{allowed_keys}] або налаштованим атрибутом, визначеним в обліковому записі.
+      invalid_operator: Некоректний оператор. Дозволені оператори для %{attribute_name} є [%{allowed_keys}].
+      invalid_value: Невірне значення. Надані значення для %{attribute_name} є неприпустимі
   reports:
     period: Період звіту %{since} до %{until}
     utc_warning: Звіт створено в часовій зоні UTC
     agent_csv:
       agent_name: Ім'я агента
-      conversations_count: Assigned conversations
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      conversations_count: Призначені розмови
+      avg_first_response_time: Середній час першої відповіді
+      avg_resolution_time: Середній час вирішення
+      resolution_count: Кількість вирішень
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Назва Джерела
       inbox_type: Тип Джерела
       conversations_count: '№ розмов'
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: Середній час першої відповіді
+      avg_resolution_time: Середній час вирішення
     label_csv:
       label_title: Мітка
       conversations_count: '№ розмов'
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: Середній час першої відповіді
+      avg_resolution_time: Середній час вирішення
     team_csv:
       team_name: Назва команди
       conversations_count: Кількість бесід
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: Середній час першої відповіді
+      avg_resolution_time: Середній час вирішення
+      resolution_count: Кількість вирішень
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
       conversation_id: ID бесіди
-      sla_policy_breached: SLA Policy
+      sla_policy_breached: Політика SLA
       assignee: Assignee
       team: Команда
       inbox: Вхідні
       labels: Мітки
-      conversation_link: Link to the Conversation
+      conversation_link: Посилання на бесіду
       breached_events: Breached Events
     default_group_by: день
     csat:
@@ -114,15 +118,15 @@ uk:
         recorded_at: Дата запису
   notifications:
     notification_title:
-      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
-      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
-      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
-      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
-      sla_missed_first_response: "SLA target first response missed for conversation (#%{display_id})"
-      sla_missed_next_response: "SLA target next response missed for conversation (#%{display_id})"
-      sla_missed_resolution: "SLA target resolution missed for conversation (#%{display_id})"
-    attachment: "Attachment"
-    no_content: "No content"
+      conversation_creation: "Розмова (#%{display_id}) була створена в %{inbox_name}"
+      conversation_assignment: "Розмова (#%{display_id}) була призначена вам"
+      assigned_conversation_new_message: "Нове повідомлення створено в розмові (#%{display_id})"
+      conversation_mention: "Ви були згадані в розмові (#%{display_id})"
+      sla_missed_first_response: "Перша відповідь на SLA пропущена для розмови (#%{display_id})"
+      sla_missed_next_response: "Наступна відповідь SLA пропущена для розмови (#%{display_id})"
+      sla_missed_resolution: "Дозвіл SLA пропущений для розмови (#%{display_id})"
+    attachment: "Вкладення"
+    no_content: "Немає вмісту"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} згадав вас у сторіс: "
@@ -155,8 +159,8 @@ uk:
         added: "%{user_name} додав %{labels}"
         removed: "%{user_name} видалив %{labels}"
       sla:
-        added: "%{user_name} added SLA policy %{sla_name}"
-        removed: "%{user_name} removed SLA policy %{sla_name}"
+        added: "%{user_name} додав політику SLA %{sla_name}"
+        removed: "%{user_name} видалив політику SLA %{sla_name}"
       muted: "%{user_name} включив безвучний режим"
       unmuted: "%{user_name} виключив безвучний режим"
     templates:
@@ -191,17 +195,17 @@ uk:
       name: "Slack"
       description: "Slack - це інструмент чату, який об'єднує ваші комунікації разом в одному місці. Інтегруючи Slack, ви можете отримати повідомлення про всі нові діалоги у вашому обліковому записі прямо в Slack."
     webhooks:
-      name: "Веб-хук"
-      description: "Вебхуки автоматично повідомляють про те, що відбувається у вашому обліковому записі Chatwoot. Ви можете скористатись веб-хуками для обміну подіями з вашими улюбленими додатками, такими як Slack чи Github. Натисніть на Налаштування, щоб налаштувати web-хуки."
+      name: "Веб-хуки"
+      description: "Веб-хуки автоматично повідомляють про те, що відбувається у вашому обліковому записі Chatwoot. Ви можете скористатись веб-хуками для обміну подіями з вашими улюбленими додатками, такими як Slack чи Github. Натисніть на Налаштування, щоб налаштувати веб-хуки."
     dialogflow:
       name: "Dialogflow"
-      description: "Створюйте чатів з допомогою Dialogflow та швидко під'єднайте їх до вхідних каналів. Дозвольте ботам обробляти запити перед передачею їх агенту."
+      description: "Створюйте чати з допомогою Dialogflow та швидко під'єднайте їх до вхідних каналів. Дозвольте ботам обробляти запити перед передачею їх агенту."
     fullcontact:
       name: "Fullcontact"
-      description: "Інтеграція FullContact допомагає збагачувати профілі відвідувачів. Визначте користувачів, як тільки вони поділяться адресою електронної пошти та пропонують їм адаптовану службу клієнтів. Під'єднайте ваш FullContact до вашого аккаунту, поділившись ключем FullContact API."
+      description: "Інтеграція FullContact допомагає збагачувати профілі відвідувачів. Визначайте користувачів, як тільки вони поділяться адресою електронної пошти та пропонуйте їм адаптовану службу клієнтів. Під'єднайте ваш FullContact до вашого акаунту, поділившись ключем FullContact API."
     google_translate:
       name: "Google Translate"
-      description: "Зробіть простішим життя агентів перекладаючи повідомлення за допомогою Google Translate. Google Translate сам ідентифікує та перекладає у обрану дміністратором чи агентом мову."
+      description: "Зробіть простішим життя агентів перекладаючи повідомлення за допомогою Google Translate. Google Translate сам ідентифікує та перекладає на обрану адміністратором чи агентом мову."
     openai:
       name: "OpenAI"
       description: "Інтегруйте потужні AI функції в Chatwoot, використовуючи моделі GPT з OpenAI."
@@ -234,8 +238,8 @@ uk:
         system: Системна
         light: Світла
         dark: Темна
-      featured_articles: Featured Articles
-      uncategorized: Uncategorized
+      featured_articles: Вибрані статті
+      uncategorized: Без категорії
     404:
       title: Сторінку не знайдено
       description: Ми не змогли знайти сторінку, яку Ви шукали.
@@ -251,22 +255,22 @@ uk:
     button: Відкрити розмову
   time_units:
     days:
-      one: "%{count} day"
+      one: "%{count} день(ів)"
       few: "%{count} days"
-      many: "%{count} days"
+      many: "%{count} днів"
       other: "%{count} days"
     hours:
-      one: "%{count} hour"
+      one: "%{count} годин(а)"
       few: "%{count} hours"
-      many: "%{count} hours"
+      many: "%{count} годин"
       other: "%{count} hours"
     minutes:
-      one: "%{count} minute"
+      one: "%{count} хвилин(а)"
       few: "%{count} minutes"
-      many: "%{count} minutes"
+      many: "%{count} хвилин"
       other: "%{count} minutes"
     seconds:
-      one: "%{count} second"
-      few: "%{count} seconds"
-      many: "%{count} seconds"
+      one: "%{count} секунд(a)"
+      few: "%{count} секунд"
+      many: "%{count} секунд"
       other: "%{count} seconds"
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 27605e6119bc3..634b1c93a6caf 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -74,6 +74,8 @@ ur:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ur:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index ad6bc17b0b7dc..15cf19ff4890d 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -74,6 +74,8 @@ ur:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
@@ -90,6 +92,8 @@ ur:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Resolution Count
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index a5d1fb4d0145f..189184d4d17c7 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -74,6 +74,8 @@ vi:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Số lượng giải quyết
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Tên kênh
       inbox_type: Kiểu kênh
@@ -90,6 +92,8 @@ vi:
       conversations_count: Số hội thoại
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: Số lượng giải quyết
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Múi giờ
     sla_csv:
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 8673eca3c9a6e..f576e6d50c2f3 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -74,6 +74,8 @@ zh_CN:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: 已解决的数量
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: 收件箱名称
       inbox_type: 收件箱类型
@@ -90,6 +92,8 @@ zh_CN:
       conversations_count: 对话数量
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: 已解决的数量
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: 时区
     sla_csv:
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 79940416f8642..c876d110be51d 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -42,7 +42,7 @@ zh_TW:
       export:
         success: We will notify you once contacts export file is ready to view.
       email:
-        invalid: Invalid email
+        invalid: 無效的email
       phone_number:
         invalid: should be in e164 format
     categories:
@@ -74,6 +74,8 @@ zh_TW:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: 已解決的數量
+      avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: 收件匣名稱
       inbox_type: 收件匣類型
@@ -90,6 +92,8 @@ zh_TW:
       conversations_count: 對話數量
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
+      resolution_count: 已解決的數量
+      avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Timezone
     sla_csv:
diff --git a/config/routes.rb b/config/routes.rb
index d002bd142f321..0593b9e169a2f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -95,6 +95,7 @@
               resources :labels, only: [:create, :index]
               resource :participants, only: [:show, :create, :update, :destroy]
               resource :direct_uploads, only: [:create]
+              resource :draft_messages, only: [:show, :update, :destroy]
             end
             member do
               post :mute
@@ -124,7 +125,7 @@
               get :search
               post :filter
               post :import
-              get :export
+              post :export
             end
             member do
               get :contactable_inboxes
@@ -393,6 +394,7 @@
   end
 
   get 'hc/:slug', to: 'public/api/v1/portals#show'
+  get 'hc/:slug/sitemap.xml', to: 'public/api/v1/portals#sitemap'
   get 'hc/:slug/:locale', to: 'public/api/v1/portals#show'
   get 'hc/:slug/:locale/articles', to: 'public/api/v1/portals/articles#index'
   get 'hc/:slug/:locale/categories', to: 'public/api/v1/portals/categories#index'
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 22fe007784c53..0cfcfe1ce1f21 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -28,6 +28,12 @@ environment.loaders.keys().forEach(loaderName => {
 environment.plugins.prepend('VueLoaderPlugin', new VueLoaderPlugin());
 environment.loaders.prepend('vue', vue);
 
+environment.loaders.append('mjs-comptaibility-loader', {
+  test: /\.mjs$/,
+  include: /node_modules/,
+  type: 'javascript/auto',
+});
+
 environment.loaders.append('opus-ogg', {
   test: /encoderWorker\.min\.js$/,
   loader: 'file-loader',
diff --git a/db/migrate/20240515201632_index_improvements_conversations_contacts.rb b/db/migrate/20240515201632_index_improvements_conversations_contacts.rb
new file mode 100644
index 0000000000000..f6ed8596e3bf1
--- /dev/null
+++ b/db/migrate/20240515201632_index_improvements_conversations_contacts.rb
@@ -0,0 +1,11 @@
+class IndexImprovementsConversationsContacts < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    remove_index :conversations, :last_activity_at
+    add_index :contacts, [:account_id, :last_activity_at],
+              order: { last_activity_at: 'DESC NULLS LAST' },
+              algorithm: :concurrently,
+              name: 'index_contacts_on_account_id_and_last_activity_at'
+  end
+end
diff --git a/db/migrate/20240516003531_add_index_for_message_type_account_date.rb b/db/migrate/20240516003531_add_index_for_message_type_account_date.rb
new file mode 100644
index 0000000000000..5cf5ad9d95d50
--- /dev/null
+++ b/db/migrate/20240516003531_add_index_for_message_type_account_date.rb
@@ -0,0 +1,7 @@
+class AddIndexForMessageTypeAccountDate < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :messages, [:account_id, :created_at, :message_type], name: 'index_messages_on_account_created_type', algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1282c6e5efeef..b894f98da73b1 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: 2024_04_15_210313) do
+ActiveRecord::Schema[7.0].define(version: 2024_05_16_003531) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -426,6 +426,7 @@
     t.boolean "blocked", default: false, null: false
     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", "last_activity_at"], name: "index_contacts_on_account_id_and_last_activity_at", order: { last_activity_at: "DESC NULLS LAST" }
     t.index ["account_id"], name: "index_contacts_on_account_id"
     t.index ["account_id"], name: "index_resolved_contact_account_id", where: "(((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))"
     t.index ["blocked"], name: "index_contacts_on_blocked"
@@ -483,7 +484,6 @@
     t.index ["contact_inbox_id"], name: "index_conversations_on_contact_inbox_id"
     t.index ["first_reply_created_at"], name: "index_conversations_on_first_reply_created_at"
     t.index ["inbox_id"], name: "index_conversations_on_inbox_id"
-    t.index ["last_activity_at"], name: "index_conversations_on_last_activity_at"
     t.index ["priority"], name: "index_conversations_on_priority"
     t.index ["status", "account_id"], name: "index_conversations_on_status_and_account_id"
     t.index ["status", "priority"], name: "index_conversations_on_status_and_priority"
@@ -696,6 +696,7 @@
     t.text "processed_message_content"
     t.jsonb "sentiment", default: {}
     t.index "((additional_attributes -> 'campaign_id'::text))", name: "index_messages_on_additional_attributes_campaign_id", using: :gin
+    t.index ["account_id", "created_at", "message_type"], name: "index_messages_on_account_created_type"
     t.index ["account_id", "inbox_id"], name: "index_messages_on_account_id_and_inbox_id"
     t.index ["account_id"], name: "index_messages_on_account_id"
     t.index ["content"], name: "index_messages_on_content", opclass: :gin_trgm_ops, using: :gin
diff --git a/enterprise/app/controllers/enterprise/public/api/v1/portals/articles_controller.rb b/enterprise/app/controllers/enterprise/public/api/v1/portals/articles_controller.rb
index ec305bfd1a85a..240da0dca54b8 100644
--- a/enterprise/app/controllers/enterprise/public/api/v1/portals/articles_controller.rb
+++ b/enterprise/app/controllers/enterprise/public/api/v1/portals/articles_controller.rb
@@ -3,7 +3,7 @@ module Enterprise::Public::Api::V1::Portals::ArticlesController
 
   def search_articles
     if @portal.account.feature_enabled?('help_center_embedding_search')
-      @articles = @articles.vector_search(list_params) if list_params.present?
+      @articles = @articles.vector_search(list_params) if list_params[:query].present?
     else
       super
     end
diff --git a/enterprise/app/jobs/enterprise/sentiment_analysis_job.rb b/enterprise/app/jobs/enterprise/sentiment_analysis_job.rb
deleted file mode 100644
index e85a89ed829b5..0000000000000
--- a/enterprise/app/jobs/enterprise/sentiment_analysis_job.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-class Enterprise::SentimentAnalysisJob < ApplicationJob
-  queue_as :low
-
-  def perform(message)
-    return if message.account.locale != 'en' || !valid_incoming_message?(message)
-
-    save_message_sentiment(message)
-  rescue StandardError => e
-    Rails.logger.error("Sentiment Analysis Error for message #{message.id}: #{e}")
-    ChatwootExceptionTracker.new(e, account: message.account).capture_exception
-  end
-
-  def save_message_sentiment(message)
-    # We are truncating the data here to avoind the OnnxRuntime::Error
-    # Indices element out of data bounds, idx=512 must be within the inclusive range [-512,511]
-    # While gathering the maningfull node the Array/tensor index is going out of bound
-
-    text = message.content&.truncate(2900)
-    return if model.blank?
-
-    sentiment = model.predict(text)
-    message.sentiment = sentiment.merge(value: label_val(sentiment))
-
-    message.save!
-  end
-
-  # Model initializes OnnxRuntime::Model, with given file for inference session and to create the tensor
-  def model
-    model_file = save_and_open_sentiment_file
-
-    return if File.empty?(model_file)
-
-    Informers::SentimentAnalysis.new(model_file)
-  end
-
-  def label_val(sentiment)
-    sentiment[:label] == 'positive' ? 1 : -1
-  end
-
-  def valid_incoming_message?(message)
-    message.incoming? && message.content.present? && !message.private?
-  end
-
-  # returns the sentiment file from vendor folder else download it to the path from AWS-S3
-  def save_and_open_sentiment_file
-    model_path = ENV.fetch('SENTIMENT_FILE_PATH', nil)
-
-    sentiment_file = Rails.root.join('vendor/db/sentiment-analysis.onnx')
-
-    return sentiment_file if File.exist?(sentiment_file)
-
-    source_file = Down.download(model_path) # Download file from AWS-S3
-    File.rename(source_file, sentiment_file) # Change the file path
-
-    sentiment_file
-  end
-end
diff --git a/enterprise/app/models/enterprise/account.rb b/enterprise/app/models/enterprise/account.rb
index 2089247a6ea05..bc07e11712c74 100644
--- a/enterprise/app/models/enterprise/account.rb
+++ b/enterprise/app/models/enterprise/account.rb
@@ -6,8 +6,19 @@ def usage_limits
     }
   end
 
+  def subscribed_features
+    plan_features = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLAN_FEATURES')&.value
+    return [] if plan_features.blank?
+
+    plan_features[plan_name]
+  end
+
   private
 
+  def plan_name
+    custom_attributes['plan_name']
+  end
+
   def agent_limits
     subscribed_quantity = custom_attributes['subscribed_quantity']
     subscribed_quantity || get_limits(:agents)
diff --git a/enterprise/app/models/enterprise/concerns/article.rb b/enterprise/app/models/enterprise/concerns/article.rb
index e230a3a2863da..799584568e713 100644
--- a/enterprise/app/models/enterprise/concerns/article.rb
+++ b/enterprise/app/models/enterprise/concerns/article.rb
@@ -66,7 +66,7 @@ def generate_article_search_terms
       { role: 'user', content: "title: #{title} \n description: #{description} \n content: #{content}" }
     ]
     headers = { 'Content-Type' => 'application/json', 'Authorization' => "Bearer #{ENV.fetch('OPENAI_API_KEY', nil)}" }
-    body = { model: 'gpt-4-turbo', messages: messages, response_format: { type: 'json_object' } }.to_json
+    body = { model: 'gpt-4o', messages: messages, response_format: { type: 'json_object' } }.to_json
     Rails.logger.info "Requesting Chat GPT with body: #{body}"
     response = HTTParty.post('https://api.openai.com/v1/chat/completions', headers: headers, body: body)
     Rails.logger.info "Chat GPT response: #{response.body}"
diff --git a/enterprise/app/models/enterprise/message.rb b/enterprise/app/models/enterprise/message.rb
deleted file mode 100644
index 11c7044e517dc..0000000000000
--- a/enterprise/app/models/enterprise/message.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Enterprise::Message
-  def update_message_sentiments
-    ::Enterprise::SentimentAnalysisJob.perform_later(self) if ENV.fetch('SENTIMENT_FILE_PATH', nil).present?
-  end
-end
diff --git a/enterprise/app/models/enterprise/sentiment_analysis_helper.rb b/enterprise/app/models/enterprise/sentiment_analysis_helper.rb
deleted file mode 100644
index 6c26d5c07b87d..0000000000000
--- a/enterprise/app/models/enterprise/sentiment_analysis_helper.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-module Enterprise::SentimentAnalysisHelper
-  extend ActiveSupport::Concern
-
-  included do
-    def opening_sentiments
-      records = incoming_messages.first(average_message_count)
-      average_sentiment(records)
-    end
-
-    def closing_sentiments
-      return unless resolved?
-
-      records = incoming_messages.last(average_message_count)
-      average_sentiment(records)
-    end
-
-    def average_sentiment(records)
-      {
-        label: average_sentiment_label(records),
-        score: average_sentiment_score(records)
-      }
-    end
-
-    private
-
-    def average_sentiment_label(records)
-      value = records.pluck(:sentiment).sum { |a| a['value'].to_i }
-      value.negative? ? 'negative' : 'positive'
-    end
-
-    def average_sentiment_score(records)
-      total = records.pluck(:sentiment).sum { |a| a['score'].to_f }
-      total / average_message_count
-    end
-
-    def average_message_count
-      # incoming_messages.count >= 10 ? 5 : ((incoming_messages.count / 2) - 1)
-      5
-    end
-
-    def incoming_messages
-      messages.incoming.where(private: false)
-    end
-  end
-end
diff --git a/enterprise/app/services/internal/reconcile_plan_config_service.rb b/enterprise/app/services/internal/reconcile_plan_config_service.rb
index 04414ea684be1..3dcb4ba125cc7 100644
--- a/enterprise/app/services/internal/reconcile_plan_config_service.rb
+++ b/enterprise/app/services/internal/reconcile_plan_config_service.rb
@@ -5,8 +5,7 @@ def perform
 
     create_premium_config_reset_warning if premium_config_reset_required?
 
-    # We will have this enabled in the future
-    # reconcile_premium_config
+    reconcile_premium_config
     reconcile_premium_features
   end
 
diff --git a/enterprise/app/views/enterprise/api/v1/accounts/partials/_account.json.jbuilder b/enterprise/app/views/enterprise/api/v1/accounts/partials/_account.json.jbuilder
new file mode 100644
index 0000000000000..bbb49621d9455
--- /dev/null
+++ b/enterprise/app/views/enterprise/api/v1/accounts/partials/_account.json.jbuilder
@@ -0,0 +1 @@
+json.subscribed_features @account.subscribed_features
diff --git a/enterprise/lib/chat_gpt.rb b/enterprise/lib/chat_gpt.rb
index d13ec118fc16b..44afbd6419cd4 100644
--- a/enterprise/lib/chat_gpt.rb
+++ b/enterprise/lib/chat_gpt.rb
@@ -4,7 +4,7 @@ def self.base_uri
   end
 
   def initialize(context_sections = '')
-    @model = 'gpt-4-0125-preview'
+    @model = 'gpt-4o'
     @messages = [system_message(context_sections)]
   end
 
diff --git a/lib/chatwoot_app.rb b/lib/chatwoot_app.rb
index 842ecc479a27f..37c90c19d7093 100644
--- a/lib/chatwoot_app.rb
+++ b/lib/chatwoot_app.rb
@@ -21,6 +21,10 @@ def self.custom?
     @custom ||= root.join('custom').exist?
   end
 
+  def self.help_center_root
+    ENV.fetch('HELPCENTER_URL', nil) || ENV.fetch('FRONTEND_URL', nil)
+  end
+
   def self.extensions
     if custom?
       %w[enterprise custom]
diff --git a/lib/custom_markdown_renderer.rb b/lib/custom_markdown_renderer.rb
index 3b262b69f241f..0cab0cdf93f90 100644
--- a/lib/custom_markdown_renderer.rb
+++ b/lib/custom_markdown_renderer.rb
@@ -1,5 +1,6 @@
 class CustomMarkdownRenderer < CommonMarker::HtmlRenderer
   YOUTUBE_REGEX = %r{https?://(?:www\.)?(?:youtube\.com/watch\?v=|youtu\.be/)([^&/]+)}
+  LOOM_REGEX = %r{https?://(?:www\.)?loom\.com/share/([^&/]+)}
   VIMEO_REGEX = %r{https?://(?:www\.)?vimeo\.com/(\d+)}
   MP4_REGEX = %r{https?://(?:www\.)?.+\.(mp4)}
 
@@ -41,23 +42,19 @@ def node_empty?(node)
 
   def render_embedded_content(node)
     link_url = node.url
-
-    youtube_match = link_url.match(YOUTUBE_REGEX)
-    if youtube_match
-      out(make_youtube_embed(youtube_match))
-      return true
-    end
-
-    vimeo_match = link_url.match(VIMEO_REGEX)
-    if vimeo_match
-      out(make_vimeo_embed(vimeo_match))
-      return true
-    end
-
-    mp4_match = link_url.match(MP4_REGEX)
-    if mp4_match
-      out(make_video_embed(link_url))
-      return true
+    embedding_methods = {
+      YOUTUBE_REGEX => :make_youtube_embed,
+      VIMEO_REGEX => :make_vimeo_embed,
+      MP4_REGEX => :make_video_embed,
+      LOOM_REGEX => :make_loom_embed
+    }
+
+    embedding_methods.each do |regex, method|
+      match = link_url.match(regex)
+      if match
+        out(send(method, match))
+        return true
+      end
     end
 
     false
@@ -76,28 +73,40 @@ def parse_sup(content)
   def make_youtube_embed(youtube_match)
     video_id = youtube_match[1]
     %(
-      <iframe
-        width="560"
-        height="315"
+      <div style="position: relative; padding-bottom: 62.5%; height: 0;">
+       <iframe
         src="https://www.youtube.com/embed/#{video_id}"
         frameborder="0"
+        style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"
         allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-        allowfullscreen
-      ></iframe>
+        allowfullscreen></iframe>
+      </div>
+    )
+  end
+
+  def make_loom_embed(loom_match)
+    video_id = loom_match[1]
+    %(
+      <div style="position: relative; padding-bottom: 62.5%; height: 0;">
+        <iframe
+         src="https://www.loom.com/embed/#{video_id}"
+         frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen
+         style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
+      </div>
     )
   end
 
   def make_vimeo_embed(vimeo_match)
     video_id = vimeo_match[1]
     %(
-      <iframe
+      <div style="position: relative; padding-bottom: 62.5%; height: 0;">
+       <iframe
         src="https://player.vimeo.com/video/#{video_id}"
-        width="640"
-        height="360"
         frameborder="0"
         allow="autoplay; fullscreen; picture-in-picture"
         allowfullscreen
-      ></iframe>
+        style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
+       </div>
     )
   end
 
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 50a69e02b170c..aa9d3ad5bca09 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -58,10 +58,12 @@ def format_message_content
   end
 
   def message_text
-    if message.content.present?
-      message.content.gsub(MENTION_REGEX, '\1')
+    content = message.processed_message_content || message.content
+
+    if content.present?
+      content.gsub(MENTION_REGEX, '\1')
     else
-      message.content
+      content
     end
   end
 
diff --git a/lib/limits.rb b/lib/limits.rb
index 720f302a8cea8..b6b449d0d7a05 100644
--- a/lib/limits.rb
+++ b/lib/limits.rb
@@ -4,4 +4,8 @@ module Limits
   URL_LENGTH_LIMIT = 2048 # https://stackoverflow.com/questions/417142
   OUT_OF_OFFICE_MESSAGE_MAX_LENGTH = 10_000
   GREETING_MESSAGE_MAX_LENGTH = 10_000
+
+  def self.conversation_message_per_minute_limit
+    ENV.fetch('CONVERSATION_MESSAGE_PER_MINUTE_LIMIT', '200').to_i
+  end
 end
diff --git a/lib/online_status_tracker.rb b/lib/online_status_tracker.rb
index 40ec7071bbb44..bc2ed1dbc85c7 100644
--- a/lib/online_status_tracker.rb
+++ b/lib/online_status_tracker.rb
@@ -57,7 +57,13 @@ def self.get_available_users(account_id)
     return {} if user_ids.blank?
 
     user_availabilities = ::Redis::Alfred.hmget(status_key(account_id), user_ids)
-    user_ids.map.with_index { |id, index| [id, (user_availabilities[index] || 'online')] }.to_h
+    user_ids.map.with_index { |id, index| [id, (user_availabilities[index] || get_availability_from_db(account_id, id))] }.to_h
+  end
+
+  def self.get_availability_from_db(account_id, user_id)
+    availability = Account.find(account_id).account_users.find_by(user_id: user_id).availability
+    set_status(account_id, user_id, availability)
+    availability
   end
 
   def self.get_available_user_ids(account_id)
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index f4a1520b114d8..3e49d87a79cf4 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -8,6 +8,7 @@ module Redis::RedisKeys
   CONVERSATION_MAILER_KEY = 'CONVERSATION::%<conversation_id>d'.freeze
   # Whether a conversation is muted ?
   CONVERSATION_MUTE_KEY = 'CONVERSATION::%<id>d::MUTED'.freeze
+  CONVERSATION_DRAFT_MESSAGE = 'CONVERSATION::%<id>d::DRAFT_MESSAGE'.freeze
 
   ## User Keys
   # SSO Auth Tokens
diff --git a/lib/tasks/ip_lookup.rake b/lib/tasks/ip_lookup.rake
index d0db9dbc5a503..3225caffa6d1d 100644
--- a/lib/tasks/ip_lookup.rake
+++ b/lib/tasks/ip_lookup.rake
@@ -13,7 +13,7 @@ namespace :ip_lookup do
     Rails.logger.info '[rake ip_lookup:setup] Fetch GeoLite2-City database'
 
     begin
-      base_url = 'https://download.maxmind.com/app/geoip_download'
+      base_url = ENV.fetch('IP_LOOKUP_BASE_URL', 'https://download.maxmind.com/app/geoip_download')
       source_file = Down.download(
         "#{base_url}?edition_id=GeoLite2-City&suffix=tar.gz&license_key=#{ip_lookup_api_key}"
       )
diff --git a/lib/tasks/sidekiq_tasks.rake b/lib/tasks/sidekiq_tasks.rake
new file mode 100644
index 0000000000000..a984b6d68f1c5
--- /dev/null
+++ b/lib/tasks/sidekiq_tasks.rake
@@ -0,0 +1,17 @@
+namespace :sidekiq do
+  desc "Clear ActionCableJobs from sidekiq's critical queue"
+  task clear_action_cable_broadcast_jobs: :environment do
+    queue_name = 'critical'
+    queue = Sidekiq::Queue.new(queue_name)
+    jobs_cleared = 0
+
+    queue.each do |job|
+      if job['wrapped'] == 'ActionCableBroadcastJob'
+        job.delete
+        jobs_cleared += 1
+      end
+    end
+
+    puts "Cleared #{jobs_cleared} ActionCableBroadcastJob(s) from the #{queue_name} queue."
+  end
+end
diff --git a/package.json b/package.json
index fcc31a8a437cf..1063ddf166df2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",
@@ -22,7 +22,7 @@
   "size-limit": [
     {
       "path": "public/packs/js/widget-*.js",
-      "limit": "281 KB"
+      "limit": "300 KB"
     },
     {
       "path": "public/packs/js/sdk.js",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@braid/vue-formulate": "^2.5.2",
     "@chatwoot/prosemirror-schema": "1.0.5",
-    "@chatwoot/utils": "^0.0.23",
+    "@chatwoot/utils": "^0.0.25",
     "@hcaptcha/vue-hcaptcha": "^0.3.2",
     "@june-so/analytics-next": "^2.0.0",
     "@radix-ui/colors": "^1.0.1",
@@ -44,6 +44,8 @@
     "@sentry/vue": "^6.19.7",
     "@sindresorhus/slugify": "1.1.0",
     "@tailwindcss/typography": "^0.5.9",
+    "@vuelidate/core": "^2.0.3",
+    "@vuelidate/validators": "^2.0.4",
     "activestorage": "^5.2.6",
     "autoprefixer": "^10.4.14",
     "axios": "^1.6.0",
@@ -60,9 +62,8 @@
     "idb": "^7.1.1",
     "ionicons": "~2.0.1",
     "js-cookie": "^3.0.5",
+    "lamejs": "1.2.0",
     "libphonenumber-js": "^1.10.24",
-    "logrocket": "^3.0.1",
-    "logrocket-vuex": "^0.0.3",
     "markdown-it": "^13.0.2",
     "markdown-it-link-attributes": "^4.0.1",
     "md5": "^2.3.0",
@@ -72,6 +73,7 @@
     "postcss-loader": "^4.2.0",
     "semver": "7.5.3",
     "tailwindcss": "^3.3.2",
+    "tinykeys": "^2.1.0",
     "turbolinks": "^5.2.0",
     "url-loader": "^2.0.0",
     "urlpattern-polyfill": "^6.0.2",
diff --git a/public/assets/images/dashboard/profile/hot-key-ctrl-enter-dark.svg b/public/assets/images/dashboard/profile/hot-key-ctrl-enter-dark.svg
new file mode 100644
index 0000000000000..7912fbedc3569
--- /dev/null
+++ b/public/assets/images/dashboard/profile/hot-key-ctrl-enter-dark.svg
@@ -0,0 +1,25 @@
+<svg width="318" height="100" viewBox="0 0 318 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="318" height="100" rx="8" fill="url(#paint0_linear_487_4427)"/>
+<g filter="url(#filter0_d_487_4427)">
+<rect x="198" y="56" width="104" height="28" rx="6" fill="#4B7DFB"/>
+<path d="M215.793 67.5653C215.748 67.1619 215.56 66.8494 215.23 66.6278C214.901 66.4034 214.486 66.2912 213.986 66.2912C213.628 66.2912 213.319 66.348 213.057 66.4616C212.796 66.5724 212.593 66.7259 212.448 66.9219C212.306 67.1151 212.235 67.3352 212.235 67.5824C212.235 67.7898 212.283 67.9687 212.38 68.1193C212.479 68.2699 212.608 68.3963 212.767 68.4986C212.929 68.598 213.103 68.6818 213.287 68.75C213.472 68.8153 213.65 68.8693 213.82 68.9119L214.672 69.1335C214.951 69.2017 215.236 69.294 215.529 69.4105C215.821 69.527 216.093 69.6804 216.343 69.8707C216.593 70.0611 216.794 70.2969 216.948 70.5781C217.104 70.8594 217.182 71.196 217.182 71.5881C217.182 72.0824 217.054 72.5213 216.799 72.9048C216.546 73.2884 216.178 73.5909 215.695 73.8125C215.215 74.0341 214.634 74.1449 213.952 74.1449C213.299 74.1449 212.733 74.0412 212.256 73.8338C211.779 73.6264 211.405 73.3324 211.135 72.9517C210.865 72.5682 210.716 72.1136 210.688 71.5881H212.009C212.034 71.9034 212.137 72.1662 212.316 72.3764C212.498 72.5838 212.729 72.7386 213.01 72.8409C213.294 72.9403 213.605 72.9901 213.944 72.9901C214.316 72.9901 214.647 72.9318 214.936 72.8153C215.229 72.696 215.459 72.5312 215.627 72.321C215.794 72.108 215.878 71.8594 215.878 71.5753C215.878 71.3168 215.804 71.1051 215.657 70.9403C215.512 70.7756 215.314 70.6392 215.064 70.5312C214.817 70.4233 214.537 70.3281 214.225 70.2457L213.194 69.9645C212.495 69.7741 211.941 69.4943 211.532 69.125C211.125 68.7557 210.922 68.267 210.922 67.6591C210.922 67.1562 211.059 66.7173 211.331 66.3423C211.604 65.9673 211.973 65.6761 212.439 65.4688C212.905 65.2585 213.431 65.1534 214.016 65.1534C214.607 65.1534 215.128 65.2571 215.58 65.4645C216.034 65.6719 216.392 65.9574 216.654 66.321C216.915 66.6818 217.051 67.0966 217.063 67.5653H215.793ZM221.474 74.1321C220.83 74.1321 220.274 73.9943 219.808 73.7188C219.345 73.4403 218.987 73.0497 218.734 72.5469C218.484 72.0412 218.359 71.4489 218.359 70.7699C218.359 70.0994 218.484 69.5085 218.734 68.9972C218.987 68.4858 219.339 68.0866 219.791 67.7997C220.246 67.5128 220.777 67.3693 221.385 67.3693C221.754 67.3693 222.112 67.4304 222.459 67.5526C222.805 67.6747 223.116 67.8665 223.392 68.1278C223.668 68.3892 223.885 68.7287 224.044 69.1463C224.203 69.5611 224.283 70.0653 224.283 70.6591V71.1108H219.08V70.1562H223.034C223.034 69.821 222.966 69.5241 222.83 69.2656C222.693 69.0043 222.501 68.7983 222.254 68.6477C222.01 68.4972 221.723 68.4219 221.393 68.4219C221.036 68.4219 220.723 68.5099 220.456 68.6861C220.192 68.8594 219.987 69.0866 219.842 69.3679C219.7 69.6463 219.629 69.9489 219.629 70.2756V71.0213C219.629 71.4588 219.706 71.831 219.859 72.1378C220.016 72.4446 220.233 72.679 220.511 72.8409C220.79 73 221.115 73.0795 221.487 73.0795C221.729 73.0795 221.949 73.0455 222.148 72.9773C222.347 72.9062 222.518 72.8011 222.663 72.6619C222.808 72.5227 222.919 72.3509 222.996 72.1463L224.202 72.3636C224.105 72.7187 223.932 73.0298 223.682 73.2969C223.435 73.5611 223.124 73.767 222.749 73.9148C222.376 74.0597 221.952 74.1321 221.474 74.1321ZM226.971 70.1136V74H225.696V67.4545H226.919V68.5199H227C227.151 68.1733 227.387 67.8949 227.708 67.6847C228.032 67.4744 228.439 67.3693 228.931 67.3693C229.377 67.3693 229.767 67.4631 230.103 67.6506C230.438 67.8352 230.698 68.1108 230.882 68.4773C231.067 68.8437 231.159 69.2969 231.159 69.8366V74H229.885V69.9901C229.885 69.5156 229.762 69.1449 229.515 68.8778C229.267 68.608 228.928 68.473 228.496 68.473C228.201 68.473 227.938 68.5369 227.708 68.6648C227.48 68.7926 227.3 68.9801 227.167 69.2273C227.036 69.4716 226.971 69.767 226.971 70.1136ZM235.319 74.1278C234.79 74.1278 234.319 73.9929 233.904 73.723C233.492 73.4503 233.168 73.0625 232.932 72.5597C232.699 72.054 232.583 71.4474 232.583 70.7401C232.583 70.0327 232.701 69.4276 232.936 68.9247C233.175 68.4219 233.502 68.0369 233.917 67.7699C234.331 67.5028 234.801 67.3693 235.327 67.3693C235.733 67.3693 236.06 67.4375 236.307 67.5739C236.557 67.7074 236.75 67.8636 236.887 68.0426C237.026 68.2216 237.134 68.3793 237.211 68.5156H237.287V65.2727H238.561V74H237.317V72.9815H237.211C237.134 73.1207 237.023 73.2798 236.878 73.4588C236.736 73.6378 236.54 73.794 236.29 73.9276C236.04 74.0611 235.716 74.1278 235.319 74.1278ZM235.6 73.0412C235.966 73.0412 236.276 72.9446 236.529 72.7514C236.784 72.5554 236.978 72.2841 237.108 71.9375C237.242 71.5909 237.309 71.1875 237.309 70.7273C237.309 70.2727 237.243 69.875 237.113 69.5341C236.982 69.1932 236.79 68.9276 236.537 68.7372C236.284 68.5469 235.972 68.4517 235.6 68.4517C235.216 68.4517 234.897 68.5511 234.641 68.75C234.385 68.9489 234.192 69.2202 234.061 69.5639C233.934 69.9077 233.87 70.2955 233.87 70.7273C233.87 71.1648 233.935 71.5582 234.066 71.9077C234.196 72.2571 234.39 72.5341 234.645 72.7386C234.904 72.9403 235.222 73.0412 235.6 73.0412ZM243.926 70.3778C243.926 69.3097 244.067 68.3267 244.348 67.429C244.63 66.5312 245.04 65.7031 245.58 64.9446H246.748C246.537 65.2259 246.341 65.571 246.159 65.9801C245.978 66.3892 245.819 66.8381 245.682 67.3267C245.546 67.8125 245.439 68.3168 245.363 68.8395C245.286 69.3594 245.248 69.8722 245.248 70.3778C245.248 71.054 245.314 71.7386 245.448 72.4318C245.581 73.125 245.762 73.7685 245.989 74.3622C246.216 74.956 246.469 75.4403 246.748 75.8153H245.58C245.04 75.0568 244.63 74.2287 244.348 73.331C244.067 72.4332 243.926 71.4489 243.926 70.3778ZM250.511 74.196C250.165 74.196 249.847 74.1108 249.557 73.9403C249.267 73.767 249.037 73.5369 248.866 73.25C248.696 72.9602 248.611 72.642 248.611 72.2955C248.611 71.946 248.696 71.6278 248.866 71.3409C249.037 71.0511 249.267 70.8196 249.557 70.6463C249.847 70.473 250.165 70.3864 250.511 70.3864H251.449V68.8778H250.511C250.165 68.8778 249.847 68.7926 249.557 68.6222C249.267 68.4517 249.037 68.223 248.866 67.9361C248.696 67.6463 248.611 67.3267 248.611 66.9773C248.611 66.6278 248.696 66.3097 248.866 66.0227C249.037 65.7358 249.267 65.5071 249.557 65.3366C249.847 65.1634 250.165 65.0767 250.511 65.0767C250.861 65.0767 251.179 65.1634 251.466 65.3366C251.756 65.5071 251.986 65.7358 252.156 66.0227C252.33 66.3097 252.416 66.6278 252.416 66.9773V67.9062H253.929V66.9773C253.929 66.6278 254.014 66.3097 254.185 66.0227C254.355 65.7358 254.584 65.5071 254.871 65.3366C255.161 65.1634 255.48 65.0767 255.83 65.0767C256.179 65.0767 256.497 65.1634 256.784 65.3366C257.071 65.5071 257.3 65.7358 257.47 66.0227C257.641 66.3097 257.726 66.6278 257.726 66.9773C257.726 67.3267 257.641 67.6463 257.47 67.9361C257.3 68.223 257.071 68.4517 256.784 68.6222C256.497 68.7926 256.179 68.8778 255.83 68.8778H254.896V70.3864H255.83C256.179 70.3864 256.497 70.473 256.784 70.6463C257.071 70.8196 257.3 71.0511 257.47 71.3409C257.641 71.6278 257.726 71.946 257.726 72.2955C257.726 72.642 257.641 72.9602 257.47 73.25C257.3 73.5369 257.071 73.767 256.784 73.9403C256.497 74.1108 256.179 74.196 255.83 74.196C255.48 74.196 255.161 74.1108 254.871 73.9403C254.584 73.767 254.355 73.5369 254.185 73.25C254.014 72.9602 253.929 72.642 253.929 72.2955V71.358H252.416V72.2955C252.416 72.642 252.33 72.9602 252.156 73.25C251.986 73.5369 251.756 73.767 251.466 73.9403C251.179 74.1108 250.861 74.196 250.511 74.196ZM250.511 73.2244C250.685 73.2244 250.841 73.1832 250.98 73.1009C251.122 73.0185 251.236 72.9062 251.321 72.7642C251.406 72.6222 251.449 72.4659 251.449 72.2955V71.358H250.511C250.341 71.358 250.185 71.4006 250.043 71.4858C249.901 71.5682 249.787 71.6804 249.702 71.8224C249.619 71.9645 249.578 72.1222 249.578 72.2955C249.578 72.4659 249.619 72.6222 249.702 72.7642C249.787 72.9062 249.901 73.0185 250.043 73.1009C250.185 73.1832 250.341 73.2244 250.511 73.2244ZM250.511 67.9062H251.449V66.9773C251.449 66.804 251.406 66.6477 251.321 66.5085C251.236 66.3665 251.122 66.2543 250.98 66.1719C250.841 66.0895 250.685 66.0483 250.511 66.0483C250.341 66.0483 250.185 66.0895 250.043 66.1719C249.901 66.2543 249.787 66.3665 249.702 66.5085C249.619 66.6477 249.578 66.804 249.578 66.9773C249.578 67.1506 249.619 67.3082 249.702 67.4503C249.787 67.5895 249.901 67.7003 250.043 67.7827C250.185 67.8651 250.341 67.9062 250.511 67.9062ZM254.896 67.9062H255.83C256.003 67.9062 256.159 67.8651 256.298 67.7827C256.438 67.7003 256.548 67.5895 256.631 67.4503C256.716 67.3082 256.759 67.1506 256.759 66.9773C256.759 66.804 256.716 66.6477 256.631 66.5085C256.548 66.3665 256.438 66.2543 256.298 66.1719C256.159 66.0895 256.003 66.0483 255.83 66.0483C255.656 66.0483 255.499 66.0895 255.357 66.1719C255.214 66.2543 255.102 66.3665 255.02 66.5085C254.938 66.6477 254.896 66.804 254.896 66.9773V67.9062ZM255.83 73.2244C256.003 73.2244 256.159 73.1832 256.298 73.1009C256.438 73.0185 256.548 72.9062 256.631 72.7642C256.716 72.6222 256.759 72.4659 256.759 72.2955C256.759 72.1222 256.716 71.9645 256.631 71.8224C256.548 71.6804 256.438 71.5682 256.298 71.4858C256.159 71.4006 256.003 71.358 255.83 71.358H254.896V72.2955C254.896 72.4659 254.938 72.6222 255.02 72.7642C255.102 72.9062 255.214 73.0185 255.357 73.1009C255.499 73.1832 255.656 73.2244 255.83 73.2244ZM252.416 70.3864H253.929V68.8778H252.416V70.3864ZM265.703 73.446V67.6847H266.849V73.446H265.703ZM263.398 71.1364V69.9901H269.159V71.1364H263.398ZM277.301 72.8324L274.634 70.1818L277.301 67.5312V72.8324ZM276.471 70.7273V69.6364H284.167V70.7273H276.471ZM283.105 70.7273V65.2727H284.192V70.7273H283.105ZM288.697 70.3778C288.697 71.4489 288.557 72.4332 288.276 73.331C287.994 74.2287 287.584 75.0568 287.044 75.8153H285.876C286.087 75.5341 286.283 75.1889 286.464 74.7798C286.646 74.3707 286.805 73.9233 286.942 73.4375C287.078 72.9489 287.185 72.4432 287.261 71.9205C287.338 71.3977 287.376 70.8835 287.376 70.3778C287.376 69.7045 287.31 69.0213 287.176 68.3281C287.043 67.6349 286.862 66.9915 286.635 66.3977C286.408 65.804 286.155 65.3196 285.876 64.9446H287.044C287.584 65.7031 287.994 66.5312 288.276 67.429C288.557 68.3267 288.697 69.3097 288.697 70.3778Z" fill="white"/>
+</g>
+<rect x="8" y="10" width="202" height="12" rx="6" fill="#383942"/>
+<rect x="8" y="30" width="137" height="12" rx="6" fill="#383942"/>
+<defs>
+<filter id="filter0_d_487_4427" x="197.167" y="55.5833" width="105.667" height="29.6667" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.416667"/>
+<feGaussianBlur stdDeviation="0.416667"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.214953 0 0 0 0 0.364486 0 0 0 0 0.985047 0 0 0 0.08 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_487_4427"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_487_4427" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_487_4427" x1="0" y1="50" x2="318" y2="50" gradientUnits="userSpaceOnUse">
+<stop offset="0.39" stop-color="#2A2B31"/>
+<stop offset="1" stop-color="#242F45"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/public/assets/images/dashboard/profile/hot-key-ctrl-enter.svg b/public/assets/images/dashboard/profile/hot-key-ctrl-enter.svg
new file mode 100644
index 0000000000000..3a8693bc37212
--- /dev/null
+++ b/public/assets/images/dashboard/profile/hot-key-ctrl-enter.svg
@@ -0,0 +1,25 @@
+<svg width="318" height="100" viewBox="0 0 318 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="318" height="100" rx="8" fill="url(#paint0_linear_487_6953)"/>
+<g filter="url(#filter0_d_487_6953)">
+<rect x="198" y="56" width="104" height="28" rx="6" fill="#4B7DFB"/>
+<path d="M215.793 67.5653C215.748 67.1619 215.56 66.8494 215.23 66.6278C214.901 66.4034 214.486 66.2912 213.986 66.2912C213.628 66.2912 213.319 66.348 213.057 66.4616C212.796 66.5724 212.593 66.7259 212.448 66.9219C212.306 67.1151 212.235 67.3352 212.235 67.5824C212.235 67.7898 212.283 67.9687 212.38 68.1193C212.479 68.2699 212.608 68.3963 212.767 68.4986C212.929 68.598 213.103 68.6818 213.287 68.75C213.472 68.8153 213.65 68.8693 213.82 68.9119L214.672 69.1335C214.951 69.2017 215.236 69.294 215.529 69.4105C215.821 69.527 216.093 69.6804 216.343 69.8707C216.593 70.0611 216.794 70.2969 216.948 70.5781C217.104 70.8594 217.182 71.196 217.182 71.5881C217.182 72.0824 217.054 72.5213 216.799 72.9048C216.546 73.2884 216.178 73.5909 215.695 73.8125C215.215 74.0341 214.634 74.1449 213.952 74.1449C213.299 74.1449 212.733 74.0412 212.256 73.8338C211.779 73.6264 211.405 73.3324 211.135 72.9517C210.865 72.5682 210.716 72.1136 210.688 71.5881H212.009C212.034 71.9034 212.137 72.1662 212.316 72.3764C212.498 72.5838 212.729 72.7386 213.01 72.8409C213.294 72.9403 213.605 72.9901 213.944 72.9901C214.316 72.9901 214.647 72.9318 214.936 72.8153C215.229 72.696 215.459 72.5312 215.627 72.321C215.794 72.108 215.878 71.8594 215.878 71.5753C215.878 71.3168 215.804 71.1051 215.657 70.9403C215.512 70.7756 215.314 70.6392 215.064 70.5312C214.817 70.4233 214.537 70.3281 214.225 70.2457L213.194 69.9645C212.495 69.7741 211.941 69.4943 211.532 69.125C211.125 68.7557 210.922 68.267 210.922 67.6591C210.922 67.1562 211.059 66.7173 211.331 66.3423C211.604 65.9673 211.973 65.6761 212.439 65.4688C212.905 65.2585 213.431 65.1534 214.016 65.1534C214.607 65.1534 215.128 65.2571 215.58 65.4645C216.034 65.6719 216.392 65.9574 216.654 66.321C216.915 66.6818 217.051 67.0966 217.063 67.5653H215.793ZM221.474 74.1321C220.83 74.1321 220.274 73.9943 219.808 73.7188C219.345 73.4403 218.987 73.0497 218.734 72.5469C218.484 72.0412 218.359 71.4489 218.359 70.7699C218.359 70.0994 218.484 69.5085 218.734 68.9972C218.987 68.4858 219.339 68.0866 219.791 67.7997C220.246 67.5128 220.777 67.3693 221.385 67.3693C221.754 67.3693 222.112 67.4304 222.459 67.5526C222.805 67.6747 223.116 67.8665 223.392 68.1278C223.668 68.3892 223.885 68.7287 224.044 69.1463C224.203 69.5611 224.283 70.0653 224.283 70.6591V71.1108H219.08V70.1562H223.034C223.034 69.821 222.966 69.5241 222.83 69.2656C222.693 69.0043 222.501 68.7983 222.254 68.6477C222.01 68.4972 221.723 68.4219 221.393 68.4219C221.036 68.4219 220.723 68.5099 220.456 68.6861C220.192 68.8594 219.987 69.0866 219.842 69.3679C219.7 69.6463 219.629 69.9489 219.629 70.2756V71.0213C219.629 71.4588 219.706 71.831 219.859 72.1378C220.016 72.4446 220.233 72.679 220.511 72.8409C220.79 73 221.115 73.0795 221.487 73.0795C221.729 73.0795 221.949 73.0455 222.148 72.9773C222.347 72.9062 222.518 72.8011 222.663 72.6619C222.808 72.5227 222.919 72.3509 222.996 72.1463L224.202 72.3636C224.105 72.7187 223.932 73.0298 223.682 73.2969C223.435 73.5611 223.124 73.767 222.749 73.9148C222.376 74.0597 221.952 74.1321 221.474 74.1321ZM226.971 70.1136V74H225.696V67.4545H226.919V68.5199H227C227.151 68.1733 227.387 67.8949 227.708 67.6847C228.032 67.4744 228.439 67.3693 228.931 67.3693C229.377 67.3693 229.767 67.4631 230.103 67.6506C230.438 67.8352 230.698 68.1108 230.882 68.4773C231.067 68.8437 231.159 69.2969 231.159 69.8366V74H229.885V69.9901C229.885 69.5156 229.762 69.1449 229.515 68.8778C229.267 68.608 228.928 68.473 228.496 68.473C228.201 68.473 227.938 68.5369 227.708 68.6648C227.48 68.7926 227.3 68.9801 227.167 69.2273C227.036 69.4716 226.971 69.767 226.971 70.1136ZM235.319 74.1278C234.79 74.1278 234.319 73.9929 233.904 73.723C233.492 73.4503 233.168 73.0625 232.932 72.5597C232.699 72.054 232.583 71.4474 232.583 70.7401C232.583 70.0327 232.701 69.4276 232.936 68.9247C233.175 68.4219 233.502 68.0369 233.917 67.7699C234.331 67.5028 234.801 67.3693 235.327 67.3693C235.733 67.3693 236.06 67.4375 236.307 67.5739C236.557 67.7074 236.75 67.8636 236.887 68.0426C237.026 68.2216 237.134 68.3793 237.211 68.5156H237.287V65.2727H238.561V74H237.317V72.9815H237.211C237.134 73.1207 237.023 73.2798 236.878 73.4588C236.736 73.6378 236.54 73.794 236.29 73.9276C236.04 74.0611 235.716 74.1278 235.319 74.1278ZM235.6 73.0412C235.966 73.0412 236.276 72.9446 236.529 72.7514C236.784 72.5554 236.978 72.2841 237.108 71.9375C237.242 71.5909 237.309 71.1875 237.309 70.7273C237.309 70.2727 237.243 69.875 237.113 69.5341C236.982 69.1932 236.79 68.9276 236.537 68.7372C236.284 68.5469 235.972 68.4517 235.6 68.4517C235.216 68.4517 234.897 68.5511 234.641 68.75C234.385 68.9489 234.192 69.2202 234.061 69.5639C233.934 69.9077 233.87 70.2955 233.87 70.7273C233.87 71.1648 233.935 71.5582 234.066 71.9077C234.196 72.2571 234.39 72.5341 234.645 72.7386C234.904 72.9403 235.222 73.0412 235.6 73.0412ZM243.926 70.3778C243.926 69.3097 244.067 68.3267 244.348 67.429C244.63 66.5312 245.04 65.7031 245.58 64.9446H246.748C246.537 65.2259 246.341 65.571 246.159 65.9801C245.978 66.3892 245.819 66.8381 245.682 67.3267C245.546 67.8125 245.439 68.3168 245.363 68.8395C245.286 69.3594 245.248 69.8722 245.248 70.3778C245.248 71.054 245.314 71.7386 245.448 72.4318C245.581 73.125 245.762 73.7685 245.989 74.3622C246.216 74.956 246.469 75.4403 246.748 75.8153H245.58C245.04 75.0568 244.63 74.2287 244.348 73.331C244.067 72.4332 243.926 71.4489 243.926 70.3778ZM250.511 74.196C250.165 74.196 249.847 74.1108 249.557 73.9403C249.267 73.767 249.037 73.5369 248.866 73.25C248.696 72.9602 248.611 72.642 248.611 72.2955C248.611 71.946 248.696 71.6278 248.866 71.3409C249.037 71.0511 249.267 70.8196 249.557 70.6463C249.847 70.473 250.165 70.3864 250.511 70.3864H251.449V68.8778H250.511C250.165 68.8778 249.847 68.7926 249.557 68.6222C249.267 68.4517 249.037 68.223 248.866 67.9361C248.696 67.6463 248.611 67.3267 248.611 66.9773C248.611 66.6278 248.696 66.3097 248.866 66.0227C249.037 65.7358 249.267 65.5071 249.557 65.3366C249.847 65.1634 250.165 65.0767 250.511 65.0767C250.861 65.0767 251.179 65.1634 251.466 65.3366C251.756 65.5071 251.986 65.7358 252.156 66.0227C252.33 66.3097 252.416 66.6278 252.416 66.9773V67.9062H253.929V66.9773C253.929 66.6278 254.014 66.3097 254.185 66.0227C254.355 65.7358 254.584 65.5071 254.871 65.3366C255.161 65.1634 255.48 65.0767 255.83 65.0767C256.179 65.0767 256.497 65.1634 256.784 65.3366C257.071 65.5071 257.3 65.7358 257.47 66.0227C257.641 66.3097 257.726 66.6278 257.726 66.9773C257.726 67.3267 257.641 67.6463 257.47 67.9361C257.3 68.223 257.071 68.4517 256.784 68.6222C256.497 68.7926 256.179 68.8778 255.83 68.8778H254.896V70.3864H255.83C256.179 70.3864 256.497 70.473 256.784 70.6463C257.071 70.8196 257.3 71.0511 257.47 71.3409C257.641 71.6278 257.726 71.946 257.726 72.2955C257.726 72.642 257.641 72.9602 257.47 73.25C257.3 73.5369 257.071 73.767 256.784 73.9403C256.497 74.1108 256.179 74.196 255.83 74.196C255.48 74.196 255.161 74.1108 254.871 73.9403C254.584 73.767 254.355 73.5369 254.185 73.25C254.014 72.9602 253.929 72.642 253.929 72.2955V71.358H252.416V72.2955C252.416 72.642 252.33 72.9602 252.156 73.25C251.986 73.5369 251.756 73.767 251.466 73.9403C251.179 74.1108 250.861 74.196 250.511 74.196ZM250.511 73.2244C250.685 73.2244 250.841 73.1832 250.98 73.1009C251.122 73.0185 251.236 72.9062 251.321 72.7642C251.406 72.6222 251.449 72.4659 251.449 72.2955V71.358H250.511C250.341 71.358 250.185 71.4006 250.043 71.4858C249.901 71.5682 249.787 71.6804 249.702 71.8224C249.619 71.9645 249.578 72.1222 249.578 72.2955C249.578 72.4659 249.619 72.6222 249.702 72.7642C249.787 72.9062 249.901 73.0185 250.043 73.1009C250.185 73.1832 250.341 73.2244 250.511 73.2244ZM250.511 67.9062H251.449V66.9773C251.449 66.804 251.406 66.6477 251.321 66.5085C251.236 66.3665 251.122 66.2543 250.98 66.1719C250.841 66.0895 250.685 66.0483 250.511 66.0483C250.341 66.0483 250.185 66.0895 250.043 66.1719C249.901 66.2543 249.787 66.3665 249.702 66.5085C249.619 66.6477 249.578 66.804 249.578 66.9773C249.578 67.1506 249.619 67.3082 249.702 67.4503C249.787 67.5895 249.901 67.7003 250.043 67.7827C250.185 67.8651 250.341 67.9062 250.511 67.9062ZM254.896 67.9062H255.83C256.003 67.9062 256.159 67.8651 256.298 67.7827C256.438 67.7003 256.548 67.5895 256.631 67.4503C256.716 67.3082 256.759 67.1506 256.759 66.9773C256.759 66.804 256.716 66.6477 256.631 66.5085C256.548 66.3665 256.438 66.2543 256.298 66.1719C256.159 66.0895 256.003 66.0483 255.83 66.0483C255.656 66.0483 255.499 66.0895 255.357 66.1719C255.214 66.2543 255.102 66.3665 255.02 66.5085C254.938 66.6477 254.896 66.804 254.896 66.9773V67.9062ZM255.83 73.2244C256.003 73.2244 256.159 73.1832 256.298 73.1009C256.438 73.0185 256.548 72.9062 256.631 72.7642C256.716 72.6222 256.759 72.4659 256.759 72.2955C256.759 72.1222 256.716 71.9645 256.631 71.8224C256.548 71.6804 256.438 71.5682 256.298 71.4858C256.159 71.4006 256.003 71.358 255.83 71.358H254.896V72.2955C254.896 72.4659 254.938 72.6222 255.02 72.7642C255.102 72.9062 255.214 73.0185 255.357 73.1009C255.499 73.1832 255.656 73.2244 255.83 73.2244ZM252.416 70.3864H253.929V68.8778H252.416V70.3864ZM265.703 73.446V67.6847H266.849V73.446H265.703ZM263.398 71.1364V69.9901H269.159V71.1364H263.398ZM277.301 72.8324L274.634 70.1818L277.301 67.5312V72.8324ZM276.471 70.7273V69.6364H284.167V70.7273H276.471ZM283.105 70.7273V65.2727H284.192V70.7273H283.105ZM288.697 70.3778C288.697 71.4489 288.557 72.4332 288.276 73.331C287.994 74.2287 287.584 75.0568 287.044 75.8153H285.876C286.087 75.5341 286.283 75.1889 286.464 74.7798C286.646 74.3707 286.805 73.9233 286.942 73.4375C287.078 72.9489 287.185 72.4432 287.261 71.9205C287.338 71.3977 287.376 70.8835 287.376 70.3778C287.376 69.7045 287.31 69.0213 287.176 68.3281C287.043 67.6349 286.862 66.9915 286.635 66.3977C286.408 65.804 286.155 65.3196 285.876 64.9446H287.044C287.584 65.7031 287.994 66.5312 288.276 67.429C288.557 68.3267 288.697 69.3097 288.697 70.3778Z" fill="white"/>
+</g>
+<rect x="8" y="10" width="202" height="12" rx="6" fill="#FDFDFD"/>
+<rect x="8" y="30" width="137" height="12" rx="6" fill="#FDFDFD"/>
+<defs>
+<filter id="filter0_d_487_6953" x="197.167" y="55.5833" width="105.667" height="29.6667" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.416667"/>
+<feGaussianBlur stdDeviation="0.416667"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.214953 0 0 0 0 0.364486 0 0 0 0 0.985047 0 0 0 0.08 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_487_6953"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_487_6953" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_487_6953" x1="0" y1="50" x2="318" y2="50" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ECEEF2"/>
+<stop offset="1" stop-color="#E7F2FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/public/assets/images/dashboard/profile/hot-key-enter-dark.svg b/public/assets/images/dashboard/profile/hot-key-enter-dark.svg
new file mode 100644
index 0000000000000..b2edd60f8ce9c
--- /dev/null
+++ b/public/assets/images/dashboard/profile/hot-key-enter-dark.svg
@@ -0,0 +1,25 @@
+<svg width="318" height="100" viewBox="0 0 318 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="318" height="100" rx="8" fill="url(#paint0_linear_487_4414)"/>
+<g filter="url(#filter0_d_487_4414)">
+<rect x="224" y="56" width="78" height="28" rx="6" fill="#4B7DFB"/>
+<path d="M241.9 67.5653C241.855 67.1619 241.667 66.8494 241.338 66.6278C241.008 66.4034 240.594 66.2912 240.094 66.2912C239.736 66.2912 239.426 66.348 239.165 66.4616C238.903 66.5724 238.7 66.7259 238.555 66.9219C238.413 67.1151 238.342 67.3352 238.342 67.5824C238.342 67.7898 238.39 67.9687 238.487 68.1193C238.586 68.2699 238.716 68.3963 238.875 68.4986C239.037 68.598 239.21 68.6818 239.395 68.75C239.579 68.8153 239.757 68.8693 239.927 68.9119L240.78 69.1335C241.058 69.2017 241.344 69.294 241.636 69.4105C241.929 69.527 242.2 69.6804 242.45 69.8707C242.7 70.0611 242.902 70.2969 243.055 70.5781C243.211 70.8594 243.29 71.196 243.29 71.5881C243.29 72.0824 243.162 72.5213 242.906 72.9048C242.653 73.2884 242.285 73.5909 241.802 73.8125C241.322 74.0341 240.741 74.1449 240.059 74.1449C239.406 74.1449 238.841 74.0412 238.363 73.8338C237.886 73.6264 237.513 73.3324 237.243 72.9517C236.973 72.5682 236.824 72.1136 236.795 71.5881H238.116C238.142 71.9034 238.244 72.1662 238.423 72.3764C238.605 72.5838 238.836 72.7386 239.118 72.8409C239.402 72.9403 239.713 72.9901 240.051 72.9901C240.423 72.9901 240.754 72.9318 241.044 72.8153C241.336 72.696 241.567 72.5312 241.734 72.321C241.902 72.108 241.986 71.8594 241.986 71.5753C241.986 71.3168 241.912 71.1051 241.764 70.9403C241.619 70.7756 241.422 70.6392 241.172 70.5312C240.925 70.4233 240.645 70.3281 240.332 70.2457L239.301 69.9645C238.602 69.7741 238.048 69.4943 237.639 69.125C237.233 68.7557 237.03 68.267 237.03 67.6591C237.03 67.1562 237.166 66.7173 237.439 66.3423C237.711 65.9673 238.081 65.6761 238.547 65.4688C239.013 65.2585 239.538 65.1534 240.123 65.1534C240.714 65.1534 241.236 65.2571 241.687 65.4645C242.142 65.6719 242.5 65.9574 242.761 66.321C243.023 66.6818 243.159 67.0966 243.17 67.5653H241.9ZM247.582 74.1321C246.937 74.1321 246.382 73.9943 245.916 73.7188C245.453 73.4403 245.095 73.0497 244.842 72.5469C244.592 72.0412 244.467 71.4489 244.467 70.7699C244.467 70.0994 244.592 69.5085 244.842 68.9972C245.095 68.4858 245.447 68.0866 245.899 67.7997C246.353 67.5128 246.884 67.3693 247.492 67.3693C247.862 67.3693 248.22 67.4304 248.566 67.5526C248.913 67.6747 249.224 67.8665 249.499 68.1278C249.775 68.3892 249.992 68.7287 250.151 69.1463C250.311 69.5611 250.39 70.0653 250.39 70.6591V71.1108H245.187V70.1562H249.142C249.142 69.821 249.073 69.5241 248.937 69.2656C248.801 69.0043 248.609 68.7983 248.362 68.6477C248.117 68.4972 247.83 68.4219 247.501 68.4219C247.143 68.4219 246.83 68.5099 246.563 68.6861C246.299 68.8594 246.095 69.0866 245.95 69.3679C245.808 69.6463 245.737 69.9489 245.737 70.2756V71.0213C245.737 71.4588 245.813 71.831 245.967 72.1378C246.123 72.4446 246.34 72.679 246.619 72.8409C246.897 73 247.222 73.0795 247.595 73.0795C247.836 73.0795 248.056 73.0455 248.255 72.9773C248.454 72.9062 248.626 72.8011 248.771 72.6619C248.916 72.5227 249.026 72.3509 249.103 72.1463L250.309 72.3636C250.213 72.7187 250.039 73.0298 249.789 73.2969C249.542 73.5611 249.231 73.767 248.856 73.9148C248.484 74.0597 248.059 74.1321 247.582 74.1321ZM253.078 70.1136V74H251.804V67.4545H253.027V68.5199H253.108C253.258 68.1733 253.494 67.8949 253.815 67.6847C254.139 67.4744 254.547 67.3693 255.038 67.3693C255.484 67.3693 255.875 67.4631 256.21 67.6506C256.545 67.8352 256.805 68.1108 256.99 68.4773C257.175 68.8437 257.267 69.2969 257.267 69.8366V74H255.993V69.9901C255.993 69.5156 255.869 69.1449 255.622 68.8778C255.375 68.608 255.035 68.473 254.604 68.473C254.308 68.473 254.045 68.5369 253.815 68.6648C253.588 68.7926 253.407 68.9801 253.274 69.2273C253.143 69.4716 253.078 69.767 253.078 70.1136ZM261.426 74.1278C260.898 74.1278 260.426 73.9929 260.011 73.723C259.599 73.4503 259.275 73.0625 259.04 72.5597C258.807 72.054 258.69 71.4474 258.69 70.7401C258.69 70.0327 258.808 69.4276 259.044 68.9247C259.282 68.4219 259.609 68.0369 260.024 67.7699C260.439 67.5028 260.909 67.3693 261.434 67.3693C261.841 67.3693 262.167 67.4375 262.415 67.5739C262.665 67.7074 262.858 67.8636 262.994 68.0426C263.133 68.2216 263.241 68.3793 263.318 68.5156H263.395V65.2727H264.669V74H263.425V72.9815H263.318C263.241 73.1207 263.131 73.2798 262.986 73.4588C262.844 73.6378 262.648 73.794 262.398 73.9276C262.148 74.0611 261.824 74.1278 261.426 74.1278ZM261.707 73.0412C262.074 73.0412 262.383 72.9446 262.636 72.7514C262.892 72.5554 263.085 72.2841 263.216 71.9375C263.349 71.5909 263.416 71.1875 263.416 70.7273C263.416 70.2727 263.351 69.875 263.22 69.5341C263.089 69.1932 262.898 68.9276 262.645 68.7372C262.392 68.5469 262.079 68.4517 261.707 68.4517C261.324 68.4517 261.004 68.5511 260.748 68.75C260.493 68.9489 260.3 69.2202 260.169 69.5639C260.041 69.9077 259.977 70.2955 259.977 70.7273C259.977 71.1648 260.042 71.5582 260.173 71.9077C260.304 72.2571 260.497 72.5341 260.753 72.7386C261.011 72.9403 261.329 73.0412 261.707 73.0412ZM270.034 70.3778C270.034 69.3097 270.175 68.3267 270.456 67.429C270.737 66.5312 271.148 65.7031 271.687 64.9446H272.855C272.645 65.2259 272.449 65.571 272.267 65.9801C272.085 66.3892 271.926 66.8381 271.79 67.3267C271.653 67.8125 271.547 68.3168 271.47 68.8395C271.393 69.3594 271.355 69.8722 271.355 70.3778C271.355 71.054 271.422 71.7386 271.555 72.4318C271.689 73.125 271.869 73.7685 272.096 74.3622C272.324 74.956 272.577 75.4403 272.855 75.8153H271.687C271.148 75.0568 270.737 74.2287 270.456 73.331C270.175 72.4332 270.034 71.4489 270.034 70.3778ZM277.194 72.8324L274.526 70.1818L277.194 67.5312V72.8324ZM276.363 70.7273V69.6364H284.059V70.7273H276.363ZM282.998 70.7273V65.2727H284.085V70.7273H282.998ZM288.59 70.3778C288.59 71.4489 288.449 72.4332 288.168 73.331C287.887 74.2287 287.476 75.0568 286.937 75.8153H285.769C285.979 75.5341 286.175 75.1889 286.357 74.7798C286.539 74.3707 286.698 73.9233 286.834 73.4375C286.971 72.9489 287.077 72.4432 287.154 71.9205C287.231 71.3977 287.269 70.8835 287.269 70.3778C287.269 69.7045 287.202 69.0213 287.069 68.3281C286.935 67.6349 286.755 66.9915 286.528 66.3977C286.3 65.804 286.047 65.3196 285.769 64.9446H286.937C287.476 65.7031 287.887 66.5312 288.168 67.429C288.449 68.3267 288.59 69.3097 288.59 70.3778Z" fill="white"/>
+</g>
+<rect x="8" y="10" width="202" height="12" rx="6" fill="#383942"/>
+<rect x="8" y="30" width="137" height="12" rx="6" fill="#383942"/>
+<defs>
+<filter id="filter0_d_487_4414" x="223.167" y="55.5833" width="79.6667" height="29.6667" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.416667"/>
+<feGaussianBlur stdDeviation="0.416667"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.214953 0 0 0 0 0.364486 0 0 0 0 0.985047 0 0 0 0.08 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_487_4414"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_487_4414" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_487_4414" x1="0" y1="50" x2="318" y2="50" gradientUnits="userSpaceOnUse">
+<stop offset="0.39" stop-color="#2A2B31"/>
+<stop offset="1" stop-color="#242F45"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/public/assets/images/dashboard/profile/hot-key-enter.svg b/public/assets/images/dashboard/profile/hot-key-enter.svg
new file mode 100644
index 0000000000000..1dcd4449a5e86
--- /dev/null
+++ b/public/assets/images/dashboard/profile/hot-key-enter.svg
@@ -0,0 +1,25 @@
+<svg width="318" height="100" viewBox="0 0 318 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="318" height="100" rx="8" fill="url(#paint0_linear_487_6940)"/>
+<g filter="url(#filter0_d_487_6940)">
+<rect x="224" y="56" width="78" height="28" rx="6" fill="#4B7DFB"/>
+<path d="M241.9 67.5653C241.855 67.1619 241.667 66.8494 241.338 66.6278C241.008 66.4034 240.594 66.2912 240.094 66.2912C239.736 66.2912 239.426 66.348 239.165 66.4616C238.903 66.5724 238.7 66.7259 238.555 66.9219C238.413 67.1151 238.342 67.3352 238.342 67.5824C238.342 67.7898 238.39 67.9687 238.487 68.1193C238.586 68.2699 238.716 68.3963 238.875 68.4986C239.037 68.598 239.21 68.6818 239.395 68.75C239.579 68.8153 239.757 68.8693 239.927 68.9119L240.78 69.1335C241.058 69.2017 241.344 69.294 241.636 69.4105C241.929 69.527 242.2 69.6804 242.45 69.8707C242.7 70.0611 242.902 70.2969 243.055 70.5781C243.211 70.8594 243.29 71.196 243.29 71.5881C243.29 72.0824 243.162 72.5213 242.906 72.9048C242.653 73.2884 242.285 73.5909 241.802 73.8125C241.322 74.0341 240.741 74.1449 240.059 74.1449C239.406 74.1449 238.841 74.0412 238.363 73.8338C237.886 73.6264 237.513 73.3324 237.243 72.9517C236.973 72.5682 236.824 72.1136 236.795 71.5881H238.116C238.142 71.9034 238.244 72.1662 238.423 72.3764C238.605 72.5838 238.836 72.7386 239.118 72.8409C239.402 72.9403 239.713 72.9901 240.051 72.9901C240.423 72.9901 240.754 72.9318 241.044 72.8153C241.336 72.696 241.567 72.5312 241.734 72.321C241.902 72.108 241.986 71.8594 241.986 71.5753C241.986 71.3168 241.912 71.1051 241.764 70.9403C241.619 70.7756 241.422 70.6392 241.172 70.5312C240.925 70.4233 240.645 70.3281 240.332 70.2457L239.301 69.9645C238.602 69.7741 238.048 69.4943 237.639 69.125C237.233 68.7557 237.03 68.267 237.03 67.6591C237.03 67.1562 237.166 66.7173 237.439 66.3423C237.711 65.9673 238.081 65.6761 238.547 65.4688C239.013 65.2585 239.538 65.1534 240.123 65.1534C240.714 65.1534 241.236 65.2571 241.687 65.4645C242.142 65.6719 242.5 65.9574 242.761 66.321C243.023 66.6818 243.159 67.0966 243.17 67.5653H241.9ZM247.582 74.1321C246.937 74.1321 246.382 73.9943 245.916 73.7188C245.453 73.4403 245.095 73.0497 244.842 72.5469C244.592 72.0412 244.467 71.4489 244.467 70.7699C244.467 70.0994 244.592 69.5085 244.842 68.9972C245.095 68.4858 245.447 68.0866 245.899 67.7997C246.353 67.5128 246.884 67.3693 247.492 67.3693C247.862 67.3693 248.22 67.4304 248.566 67.5526C248.913 67.6747 249.224 67.8665 249.499 68.1278C249.775 68.3892 249.992 68.7287 250.151 69.1463C250.311 69.5611 250.39 70.0653 250.39 70.6591V71.1108H245.187V70.1562H249.142C249.142 69.821 249.073 69.5241 248.937 69.2656C248.801 69.0043 248.609 68.7983 248.362 68.6477C248.117 68.4972 247.83 68.4219 247.501 68.4219C247.143 68.4219 246.83 68.5099 246.563 68.6861C246.299 68.8594 246.095 69.0866 245.95 69.3679C245.808 69.6463 245.737 69.9489 245.737 70.2756V71.0213C245.737 71.4588 245.813 71.831 245.967 72.1378C246.123 72.4446 246.34 72.679 246.619 72.8409C246.897 73 247.222 73.0795 247.595 73.0795C247.836 73.0795 248.056 73.0455 248.255 72.9773C248.454 72.9062 248.626 72.8011 248.771 72.6619C248.916 72.5227 249.026 72.3509 249.103 72.1463L250.309 72.3636C250.213 72.7187 250.039 73.0298 249.789 73.2969C249.542 73.5611 249.231 73.767 248.856 73.9148C248.484 74.0597 248.059 74.1321 247.582 74.1321ZM253.078 70.1136V74H251.804V67.4545H253.027V68.5199H253.108C253.258 68.1733 253.494 67.8949 253.815 67.6847C254.139 67.4744 254.547 67.3693 255.038 67.3693C255.484 67.3693 255.875 67.4631 256.21 67.6506C256.545 67.8352 256.805 68.1108 256.99 68.4773C257.175 68.8437 257.267 69.2969 257.267 69.8366V74H255.993V69.9901C255.993 69.5156 255.869 69.1449 255.622 68.8778C255.375 68.608 255.035 68.473 254.604 68.473C254.308 68.473 254.045 68.5369 253.815 68.6648C253.588 68.7926 253.407 68.9801 253.274 69.2273C253.143 69.4716 253.078 69.767 253.078 70.1136ZM261.426 74.1278C260.898 74.1278 260.426 73.9929 260.011 73.723C259.599 73.4503 259.275 73.0625 259.04 72.5597C258.807 72.054 258.69 71.4474 258.69 70.7401C258.69 70.0327 258.808 69.4276 259.044 68.9247C259.282 68.4219 259.609 68.0369 260.024 67.7699C260.439 67.5028 260.909 67.3693 261.434 67.3693C261.841 67.3693 262.167 67.4375 262.415 67.5739C262.665 67.7074 262.858 67.8636 262.994 68.0426C263.133 68.2216 263.241 68.3793 263.318 68.5156H263.395V65.2727H264.669V74H263.425V72.9815H263.318C263.241 73.1207 263.131 73.2798 262.986 73.4588C262.844 73.6378 262.648 73.794 262.398 73.9276C262.148 74.0611 261.824 74.1278 261.426 74.1278ZM261.707 73.0412C262.074 73.0412 262.383 72.9446 262.636 72.7514C262.892 72.5554 263.085 72.2841 263.216 71.9375C263.349 71.5909 263.416 71.1875 263.416 70.7273C263.416 70.2727 263.351 69.875 263.22 69.5341C263.089 69.1932 262.898 68.9276 262.645 68.7372C262.392 68.5469 262.079 68.4517 261.707 68.4517C261.324 68.4517 261.004 68.5511 260.748 68.75C260.493 68.9489 260.3 69.2202 260.169 69.5639C260.041 69.9077 259.977 70.2955 259.977 70.7273C259.977 71.1648 260.042 71.5582 260.173 71.9077C260.304 72.2571 260.497 72.5341 260.753 72.7386C261.011 72.9403 261.329 73.0412 261.707 73.0412ZM270.034 70.3778C270.034 69.3097 270.175 68.3267 270.456 67.429C270.737 66.5312 271.148 65.7031 271.687 64.9446H272.855C272.645 65.2259 272.449 65.571 272.267 65.9801C272.085 66.3892 271.926 66.8381 271.79 67.3267C271.653 67.8125 271.547 68.3168 271.47 68.8395C271.393 69.3594 271.355 69.8722 271.355 70.3778C271.355 71.054 271.422 71.7386 271.555 72.4318C271.689 73.125 271.869 73.7685 272.096 74.3622C272.324 74.956 272.577 75.4403 272.855 75.8153H271.687C271.148 75.0568 270.737 74.2287 270.456 73.331C270.175 72.4332 270.034 71.4489 270.034 70.3778ZM277.194 72.8324L274.526 70.1818L277.194 67.5312V72.8324ZM276.363 70.7273V69.6364H284.059V70.7273H276.363ZM282.998 70.7273V65.2727H284.085V70.7273H282.998ZM288.59 70.3778C288.59 71.4489 288.449 72.4332 288.168 73.331C287.887 74.2287 287.476 75.0568 286.937 75.8153H285.769C285.979 75.5341 286.175 75.1889 286.357 74.7798C286.539 74.3707 286.698 73.9233 286.834 73.4375C286.971 72.9489 287.077 72.4432 287.154 71.9205C287.231 71.3977 287.269 70.8835 287.269 70.3778C287.269 69.7045 287.202 69.0213 287.069 68.3281C286.935 67.6349 286.755 66.9915 286.528 66.3977C286.3 65.804 286.047 65.3196 285.769 64.9446H286.937C287.476 65.7031 287.887 66.5312 288.168 67.429C288.449 68.3267 288.59 69.3097 288.59 70.3778Z" fill="white"/>
+</g>
+<rect x="8" y="10" width="202" height="12" rx="6" fill="#FDFDFD"/>
+<rect x="8" y="30" width="137" height="12" rx="6" fill="#FDFDFD"/>
+<defs>
+<filter id="filter0_d_487_6940" x="223.167" y="55.5833" width="79.6667" height="29.6667" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.416667"/>
+<feGaussianBlur stdDeviation="0.416667"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.214953 0 0 0 0 0.364486 0 0 0 0 0.985047 0 0 0 0.08 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_487_6940"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_487_6940" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_487_6940" x1="0" y1="50" x2="318" y2="50" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ECEEF2"/>
+<stop offset="1" stop-color="#E7F2FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 37e64357ffc8c..97eddc1712eed 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -2,6 +2,16 @@
 
 RSpec.describe 'Contacts API', type: :request do
   let(:account) { create(:account) }
+  let(:email_filter) do
+    {
+      attribute_key: 'email',
+      filter_operator: 'contains',
+      values: 'looped',
+      query_operator: 'and',
+      attribute_model: 'standard',
+      custom_attribute_type: ''
+    }
+  end
 
   describe 'GET /api/v1/accounts/{account.id}/contacts' do
     context 'when it is an unauthenticated user' do
@@ -87,6 +97,8 @@
 
         expect(response).to have_http_status(:success)
         response_body = response.parsed_body
+        # TODO: this spec has been flaky for a while, so adding a debug statement to see the response
+        Rails.logger.info(response_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)
@@ -175,7 +187,7 @@
   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"
+        post "/api/v1/accounts/#{account.id}/contacts/export"
 
         expect(response).to have_http_status(:unauthorized)
       end
@@ -185,9 +197,9 @@
       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
+        post "/api/v1/accounts/#{account.id}/contacts/export",
+             headers: agent.create_new_auth_token,
+             as: :json
 
         expect(response).to have_http_status(:unauthorized)
       end
@@ -197,21 +209,35 @@
       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, admin.email).once
+        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, admin.id, nil, { :payload => nil, :label => nil }).once
 
-        get "/api/v1/accounts/#{account.id}/contacts/export",
-            headers: admin.create_new_auth_token,
-            params: { column_names: nil }
+        post "/api/v1/accounts/#{account.id}/contacts/export",
+             headers: admin.create_new_auth_token
 
         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], admin.email).once
+        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, admin.id, %w[phone_number email],
+                                                                           { :payload => nil, :label => nil }).once
 
-        get "/api/v1/accounts/#{account.id}/contacts/export",
-            headers: admin.create_new_auth_token,
-            params: { column_names: %w[phone_number email] }
+        post "/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
+
+      it 'enqueues a contact export job with payload' do
+        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, admin.id, nil,
+                                                                           {
+                                                                             :payload => [ActionController::Parameters.new(email_filter).permit!],
+                                                                             :label => nil
+                                                                           }).once
+
+        post "/api/v1/accounts/#{account.id}/contacts/export",
+             headers: admin.create_new_auth_token,
+             params: { payload: [email_filter] }
 
         expect(response).to have_http_status(:success)
       end
diff --git a/spec/controllers/api/v1/accounts/conversations/draft_messages_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/draft_messages_controller_spec.rb
new file mode 100644
index 0000000000000..b663da73f0792
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/conversations/draft_messages_controller_spec.rb
@@ -0,0 +1,62 @@
+require 'rails_helper'
+
+RSpec.describe 'Conversation Draft Messages API', type: :request do
+  let(:account) { create(:account) }
+
+  describe 'POST /api/v1/accounts/{account.id}/conversations/<id>/draft_messages' do
+    let(:conversation) { create(:conversation, account: account) }
+    let(:cache_key) { format(Redis::Alfred::CONVERSATION_DRAFT_MESSAGE, id: conversation.id) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get api_v1_account_conversation_draft_messages_url(account_id: account.id, conversation_id: conversation.display_id)
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user with access to the inbox' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:message) { Faker::Lorem.paragraph }
+
+      before do
+        create(:inbox_member, inbox: conversation.inbox, user: agent)
+      end
+
+      it 'saves the draft message for the conversation' do
+        params = { draft_message: { message: message } }
+
+        patch api_v1_account_conversation_draft_messages_url(account_id: account.id, conversation_id: conversation.display_id),
+              params: params,
+              headers: agent.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(Redis::Alfred.get(cache_key)).to eq(params[:draft_message][:message])
+      end
+
+      it 'gets the draft message for the conversation' do
+        Redis::Alfred.set(cache_key, message)
+
+        get api_v1_account_conversation_draft_messages_url(account_id: account.id, conversation_id: conversation.display_id),
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include(message)
+      end
+
+      it 'removes the draft messages for the conversation' do
+        Redis::Alfred.set(cache_key, message)
+        expect(Redis::Alfred.get(cache_key)).to eq(message)
+
+        delete api_v1_account_conversation_draft_messages_url(account_id: account.id, conversation_id: conversation.display_id),
+               headers: agent.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(Redis::Alfred.get(cache_key)).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/controllers/public/api/v1/portals_controller_spec.rb b/spec/controllers/public/api/v1/portals_controller_spec.rb
index 2541906f1c65b..004d013eac072 100644
--- a/spec/controllers/public/api/v1/portals_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals_controller_spec.rb
@@ -1,12 +1,15 @@
 require 'rails_helper'
 
-RSpec.describe 'Public Portals API', type: :request do
+RSpec.describe Public::Api::V1::PortalsController, type: :request do
   let!(:account) { create(:account) }
+  let!(:agent) { create(:user, account: account, role: :agent) }
   let!(:portal) { create(:portal, slug: 'test-portal', account_id: account.id, custom_domain: 'www.example.com') }
 
   before do
     create(:portal, slug: 'test-portal-1', account_id: account.id)
     create(:portal, slug: 'test-portal-2', account_id: account.id)
+    create_list(:article, 3, account: account, author: agent, portal: portal, status: :published)
+    create_list(:article, 2, account: account, author: agent, portal: portal, status: :draft)
   end
 
   describe 'GET /public/api/v1/portals/{portal_slug}' do
@@ -28,4 +31,28 @@
       Please send us an email at support@chatwoot.com with the custom domain name and account API key"
     end
   end
+
+  describe 'GET /public/api/v1/portals/{portal_slug}/sitemap' do
+    context 'when custom_domain is present' do
+      it 'gets a valid sitemap' do
+        get "/hc/#{portal.slug}/sitemap.xml"
+        expect(response).to have_http_status(:success)
+        expect(response.body).to match(/<sitemap/)
+        expect(Nokogiri::XML(response.body).errors).to be_empty
+      end
+
+      it 'has valid sitemap links' do
+        get "/hc/#{portal.slug}/sitemap.xml"
+        expect(response).to have_http_status(:success)
+        parsed_xml = Nokogiri::XML(response.body)
+        links = parsed_xml.css('loc')
+
+        links.each do |link|
+          expect(link.text).to match(%r{https://www\.example\.com/hc/test-portal/articles/\d+})
+        end
+
+        expect(links.length).to eq 3
+      end
+    end
+  end
 end
diff --git a/spec/enterprise/jobs/enterprise/sentiment_analysis_job_spec.rb b/spec/enterprise/jobs/enterprise/sentiment_analysis_job_spec.rb
deleted file mode 100644
index bb2a893952ed1..0000000000000
--- a/spec/enterprise/jobs/enterprise/sentiment_analysis_job_spec.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Enterprise::SentimentAnalysisJob do
-  context 'when account locale set to english language' do
-    let(:account) { create(:account, locale: 'en') }
-    let(:message) { build(:message, content_type: nil, account: account) }
-
-    context 'when update the message sentiments' do
-      let(:model_path) { Rails.root.join('vendor/db/sentiment-analysis.onnx') }
-      let(:model) { double }
-
-      before do
-        allow(Informers::SentimentAnalysis).to receive(:new).with(model_path).and_return(model)
-        allow(model).to receive(:predict).and_return({ label: 'positive', score: '0.6' })
-      end
-
-      it 'with incoming message' do
-        with_modified_env SENTIMENT_FILE_PATH: 'sentiment-analysis.onnx' do
-          message.update(message_type: :incoming)
-
-          described_class.perform_now(message)
-
-          expect(message.sentiment).not_to be_empty
-        end
-      end
-
-      it 'update sentiment label for positive message' do
-        with_modified_env SENTIMENT_FILE_PATH: 'sentiment-analysis.onnx' do
-          message.update(message_type: :incoming, content: 'I like your product')
-
-          described_class.perform_now(message)
-
-          expect(message.sentiment).not_to be_empty
-          expect(message.sentiment['label']).to eq('positive')
-          expect(message.sentiment['value']).to eq(1)
-        end
-      end
-
-      it 'update sentiment label for negative message' do
-        with_modified_env SENTIMENT_FILE_PATH: 'sentiment-analysis.onnx' do
-          message.update(message_type: :incoming, content: 'I did not like your product')
-          allow(model).to receive(:predict).and_return({ label: 'negative', score: '0.6' })
-
-          described_class.perform_now(message)
-
-          expect(message.sentiment).not_to be_empty
-          expect(message.sentiment['label']).to eq('negative')
-          expect(message.sentiment['value']).to eq(-1)
-        end
-      end
-    end
-
-    context 'with download sentiment files' do
-      let(:model_path) { nil }
-      let(:model) { double }
-
-      before do
-        allow(Informers::SentimentAnalysis).to receive(:new).with(model_path).and_return(model)
-        allow(model).to receive(:predict).and_return({ label: 'positive', score: '0.6' })
-      end
-
-      it 'fetch saved file in the server' do
-        with_modified_env SENTIMENT_FILE_PATH: 'sentiment-analysis.onnx' do
-          message.update(message_type: :incoming, content: 'I did not like your product')
-
-          described_class.new(message).save_and_open_sentiment_file
-
-          sentiment_file = Rails.root.join('vendor/db/sentiment-analysis.onnx')
-          expect(File).to exist(sentiment_file)
-        end
-      end
-
-      it 'fetch file from the storage' do
-        with_modified_env SENTIMENT_FILE_PATH: 'sentiment-analysis.onnx' do
-          message.update(message_type: :incoming, content: 'I did not like your product')
-          allow(File).to receive(:exist?).and_return(false)
-          allow(Down).to receive(:download).and_return('./sentiment-analysis.onnx')
-          allow(File).to receive(:rename).and_return(100)
-
-          described_class.new(message).save_and_open_sentiment_file
-
-          sentiment_file = Rails.root.join('vendor/db/sentiment-analysis.onnx')
-          expect(sentiment_file).to be_present
-        end
-      end
-    end
-
-    context 'when does not update the message sentiments' do
-      it 'with outgoing message' do
-        message.update(message_type: :outgoing)
-
-        described_class.perform_now(message)
-
-        expect(message.sentiment).to be_empty
-      end
-
-      it 'with private message' do
-        message.update(private: true)
-
-        described_class.perform_now(message)
-
-        expect(message.sentiment).to be_empty
-      end
-    end
-  end
-
-  context 'when account locale is not set to english language' do
-    let(:account) { create(:account, locale: 'es') }
-    let(:message) { build(:message, content_type: nil, account: account) }
-
-    it 'does not update the message sentiments' do
-      described_class.perform_now(message)
-
-      expect(message.sentiment).to be_empty
-    end
-  end
-end
diff --git a/spec/enterprise/models/account_spec.rb b/spec/enterprise/models/account_spec.rb
index 87e4ac5c273e1..67397a066ea50 100644
--- a/spec/enterprise/models/account_spec.rb
+++ b/spec/enterprise/models/account_spec.rb
@@ -91,4 +91,45 @@
       )
     end
   end
+
+  describe 'subscribed_features' do
+    let(:account) { create(:account) }
+    let(:plan_features) do
+      {
+        'hacker' => %w[feature1 feature2],
+        'startups' => %w[feature1 feature2 feature3 feature4]
+      }
+    end
+
+    before do
+      InstallationConfig.where(name: 'CHATWOOT_CLOUD_PLAN_FEATURES').first_or_create(value: plan_features)
+    end
+
+    context 'when plan_name is hacker' do
+      it 'returns the features for the hacker plan' do
+        account.custom_attributes = { 'plan_name': 'hacker' }
+        account.save!
+
+        expect(account.subscribed_features).to eq(%w[feature1 feature2])
+      end
+    end
+
+    context 'when plan_name is startups' do
+      it 'returns the features for the startups plan' do
+        account.custom_attributes = { 'plan_name': 'startups' }
+        account.save!
+
+        expect(account.subscribed_features).to eq(%w[feature1 feature2 feature3 feature4])
+      end
+    end
+
+    context 'when plan_features is blank' do
+      it 'returns an empty array' do
+        account.custom_attributes = {}
+        account.save!
+
+        expect(account.subscribed_features).to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/enterprise/models/conversation_spec.rb b/spec/enterprise/models/conversation_spec.rb
index e9fe811ca9f81..9585274ddacb6 100644
--- a/spec/enterprise/models/conversation_spec.rb
+++ b/spec/enterprise/models/conversation_spec.rb
@@ -36,36 +36,6 @@
     # end
   end
 
-  describe 'conversation sentiments' do
-    include ActiveJob::TestHelper
-
-    let(:conversation) { create(:conversation, additional_attributes: { referer: 'https://www.chatwoot.com/' }) }
-
-    before do
-      10.times do
-        message = create(:message, conversation_id: conversation.id, account_id: conversation.account_id, message_type: 'incoming')
-        message.update(sentiment: { 'label': 'positive', score: '0.4' })
-      end
-    end
-
-    it 'returns opening sentiments' do
-      sentiments = conversation.opening_sentiments
-      expect(sentiments[:label]).to eq('positive')
-    end
-
-    it 'returns closing sentiments if conversation is not resolved' do
-      sentiments = conversation.closing_sentiments
-      expect(sentiments).to be_nil
-    end
-
-    it 'returns closing sentiments if it is resolved' do
-      conversation.resolved!
-
-      sentiments = conversation.closing_sentiments
-      expect(sentiments[:label]).to eq('positive')
-    end
-  end
-
   describe 'sla_policy' do
     let(:account) { create(:account) }
     let(:conversation) { create(:conversation, account: account) }
diff --git a/spec/enterprise/models/message_spec.rb b/spec/enterprise/models/message_spec.rb
deleted file mode 100644
index 5fd4231637714..0000000000000
--- a/spec/enterprise/models/message_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-require Rails.root.join 'spec/models/concerns/liquidable_shared.rb'
-
-RSpec.describe Message do
-  context 'with sentiment analysis' do
-    let(:message) { build(:message, message_type: :incoming, content_type: nil, account: create(:account)) }
-
-    it 'calls SentimentAnalysisJob' do
-      with_modified_env SENTIMENT_FILE_PATH: 'sentiment-analysis.onnx' do
-        allow(Enterprise::SentimentAnalysisJob).to receive(:perform_later).and_return(:perform_later).with(message)
-
-        message.save!
-
-        expect(Enterprise::SentimentAnalysisJob).to have_received(:perform_later)
-      end
-    end
-  end
-end
diff --git a/spec/enterprise/services/internal/reconcile_plan_config_service_spec.rb b/spec/enterprise/services/internal/reconcile_plan_config_service_spec.rb
index ee8b255573b5a..f3ae7f051c86b 100644
--- a/spec/enterprise/services/internal/reconcile_plan_config_service_spec.rb
+++ b/spec/enterprise/services/internal/reconcile_plan_config_service_spec.rb
@@ -34,15 +34,13 @@
         expect(Redis::Alfred.get(Redis::Alfred::CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING)).to be_nil
       end
 
-      # To be enabled in the future when method is uncommented
-
-      # it 'updates the premium configs to default' do
-      #   create(:installation_config, name: 'INSTALLATION_NAME', value: 'custom-name')
-      #   create(:installation_config, name: 'LOGO', value: '/custom-path/logo.svg')
-      #   service.perform
-      #   expect(InstallationConfig.find_by(name: 'INSTALLATION_NAME').value).to eq('Chatwoot')
-      #   expect(InstallationConfig.find_by(name: 'LOGO').value).to eq('/brand-assets/logo.svg')
-      # end
+      it 'updates the premium configs to default' do
+        create(:installation_config, name: 'INSTALLATION_NAME', value: 'custom-name')
+        create(:installation_config, name: 'LOGO', value: '/custom-path/logo.svg')
+        service.perform
+        expect(InstallationConfig.find_by(name: 'INSTALLATION_NAME').value).to eq('Chatwoot')
+        expect(InstallationConfig.find_by(name: 'LOGO').value).to eq('/brand-assets/logo.svg')
+      end
     end
 
     context 'when pricing plan is not community' do
diff --git a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
index f6cd657be611c..71afd21254a02 100644
--- a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
+++ b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
@@ -21,7 +21,7 @@
 
   describe '#perform - SLA misses' do
     context 'when first response SLA is missed' do
-      before { sla_policy.update(first_response_time_threshold: 1.hour) }
+      before { applied_sla.sla_policy.update(first_response_time_threshold: 1.hour) }
 
       it 'updates the SLA status to missed and logs a warning' do
         allow(Rails.logger).to receive(:warn)
@@ -42,7 +42,7 @@
 
     context 'when next response SLA is missed' do
       before do
-        sla_policy.update(next_response_time_threshold: 1.hour)
+        applied_sla.sla_policy.update(next_response_time_threshold: 1.hour)
         conversation.update(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
       end
 
@@ -64,7 +64,7 @@
     end
 
     context 'when resolution time SLA is missed' do
-      before { sla_policy.update(resolution_time_threshold: 1.hour) }
+      before { applied_sla.sla_policy.update(resolution_time_threshold: 1.hour) }
 
       it 'updates the SLA status to missed and logs a warning' do
         allow(Rails.logger).to receive(:warn)
@@ -89,7 +89,7 @@
     context 'when resolved conversation with resolution time SLA is missed' do
       before do
         conversation.resolved!
-        sla_policy.update(resolution_time_threshold: 1.hour)
+        applied_sla.sla_policy.update(resolution_time_threshold: 1.hour)
       end
 
       it 'does not update the SLA status to missed' do
@@ -100,7 +100,7 @@
 
     context 'when multiple SLAs are missed' do
       before do
-        sla_policy.update(first_response_time_threshold: 1.hour, next_response_time_threshold: 1.hour, resolution_time_threshold: 1.hour)
+        applied_sla.sla_policy.update(first_response_time_threshold: 1.hour, next_response_time_threshold: 1.hour, resolution_time_threshold: 1.hour)
         conversation.update(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
       end
 
@@ -119,7 +119,7 @@
   describe '#perform - SLA hits' do
     context 'when first response SLA is hit' do
       before do
-        sla_policy.update(first_response_time_threshold: 6.hours)
+        applied_sla.sla_policy.update(first_response_time_threshold: 6.hours)
         conversation.update(first_reply_created_at: 30.minutes.ago)
       end
 
@@ -142,7 +142,7 @@
 
     context 'when next response SLA is hit' do
       before do
-        sla_policy.update(next_response_time_threshold: 6.hours)
+        applied_sla.sla_policy.update(next_response_time_threshold: 6.hours)
         conversation.update(first_reply_created_at: 30.minutes.ago, waiting_since: nil)
       end
 
@@ -164,7 +164,7 @@
 
     context 'when resolution time SLA is hit' do
       before do
-        sla_policy.update(resolution_time_threshold: 8.hours)
+        applied_sla.sla_policy.update(resolution_time_threshold: 8.hours)
         conversation.resolved!
       end
 
@@ -182,7 +182,7 @@
   describe 'SLA evaluation with frt hit, multiple nrt misses and rt miss' do
     before do
       # Setup SLA Policy thresholds
-      sla_policy.update(
+      applied_sla.sla_policy.update(
         first_response_time_threshold: 2.hours, # Hit frt
         next_response_time_threshold: 1.hour, # Miss nrt multiple times
         resolution_time_threshold: 4.hours # Miss rt
diff --git a/spec/jobs/account/contacts_export_job_spec.rb b/spec/jobs/account/contacts_export_job_spec.rb
index b395967b41732..9fe10bb961d41 100644
--- a/spec/jobs/account/contacts_export_job_spec.rb
+++ b/spec/jobs/account/contacts_export_job_spec.rb
@@ -3,7 +3,43 @@
 RSpec.describe Account::ContactsExportJob do
   subject(:job) { described_class.perform_later }
 
-  let!(:account) { create(:account) }
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account, email: 'account-user-test@test.com') }
+  let(:label) { create(:label, title: 'spec-billing', maccount: account) }
+
+  let(:email_filter) do
+    {
+      :attribute_key => 'email',
+      :filter_operator => 'contains',
+      :values => 'looped',
+      :query_operator => 'and',
+      :attribute_model => 'standard',
+      :custom_attribute_type => ''
+    }
+  end
+
+  let(:city_filter) do
+    {
+      :attribute_key => 'country_code',
+      :filter_operator => 'equal_to',
+      :values => ['India'],
+      :query_operator => 'and',
+      :attribute_model => 'standard',
+      :custom_attribute_type => ''
+    }
+  end
+
+  let(:single_filter) do
+    {
+      :payload => [email_filter.merge(:query_operator => nil)]
+    }
+  end
+
+  let(:multiple_filters) do
+    {
+      :payload => [city_filter, email_filter.merge(:query_operator => nil)]
+    }
+  end
 
   it 'enqueues the job' do
     expect { job }.to have_enqueued_job(described_class)
@@ -13,8 +49,11 @@
   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)
+      4.times do |i|
+        create(:contact, account: account, email: "looped-#{i + 3}@text.example.com")
+      end
+      4.times do |i|
+        create(:contact, account: account, additional_attributes: { :country_code => 'India' }, email: "looped-#{i + 10}@text.example.com")
       end
       create(:contact, account: account, phone_number: '+910808080808', email: 'test2@text.example')
     end
@@ -24,17 +63,17 @@
       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, [], 'test@test.com')
+      described_class.perform_now(account.id, user.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, 'test@test.com')
+      expect(mailer).to have_received(:contact_export_complete).with(file_url, user.email)
     end
 
     it 'generates valid data export file' do
-      described_class.perform_now(account.id, [], 'test@test.com')
+      described_class.perform_now(account.id, user.id, %w[id name email phone_number column_not_present], {})
 
       csv_data = CSV.parse(account.contacts_export.download, headers: true)
       emails = csv_data.pluck('email')
@@ -45,5 +84,46 @@
       expect(emails).to include('test1@text.example', 'test2@text.example')
       expect(phone_numbers).to include('+910808080818', '+910808080808')
     end
+
+    it 'returns all resolved contacts as results when filter is not prvoided' do
+      create(:contact, account: account, email: nil, phone_number: nil)
+      described_class.perform_now(account.id, user.id, %w[id name email column_not_present], {})
+      csv_data = CSV.parse(account.contacts_export.download, headers: true)
+      expect(csv_data.length).to eq(account.contacts.resolved_contacts.count)
+    end
+
+    it 'returns resolved contacts filtered if labels are provided' do
+      # Adding label to a resolved contact
+      Contact.last.add_labels(['spec-billing'])
+      contact = create(:contact, account: account, email: nil, phone_number: nil)
+      contact.add_labels(['spec-billing'])
+      described_class.perform_now(account.id, user.id, [], { :payload => nil, :label => 'spec-billing' })
+      csv_data = CSV.parse(account.contacts_export.download, headers: true)
+      # since there is only 1 resolved contact with 'spec-billing' label
+      expect(csv_data.length).to eq(1)
+    end
+
+    # TODO: This returns unresolved contacts as well since filter service returns the same
+    # Change this when we make changes to filter service and ensure only resolved contacts are returned
+    it 'returns filtered data which inclues unresolved contacts when filter is provided' do
+      create(:contact, account: account, email: nil, phone_number: nil, additional_attributes: { :country_code => 'India' })
+      described_class.perform_now(account.id, user.id, [], { :payload => [city_filter.merge(:query_operator => nil)] }.with_indifferent_access)
+      csv_data = CSV.parse(account.contacts_export.download, headers: true)
+      expect(csv_data.length).to eq(5)
+    end
+
+    it 'returns filtered data when multiple filters are provided' do
+      described_class.perform_now(account.id, user.id, [], multiple_filters.with_indifferent_access)
+      csv_data = CSV.parse(account.contacts_export.download, headers: true)
+      # since there are only 4 contacts with 'looped' in email and 'India' as country_code
+      expect(csv_data.length).to eq(4)
+    end
+
+    it 'returns filtered data when a single filter is provided' do
+      described_class.perform_now(account.id, user.id, [], single_filter.with_indifferent_access)
+      csv_data = CSV.parse(account.contacts_export.download, headers: true)
+      # since there are only 8 contacts with 'looped' in email
+      expect(csv_data.length).to eq(8)
+    end
   end
 end
diff --git a/spec/jobs/bulk_actions_job_spec.rb b/spec/jobs/bulk_actions_job_spec.rb
index f227a7f3c1068..3b0ff8133be99 100644
--- a/spec/jobs/bulk_actions_job_spec.rb
+++ b/spec/jobs/bulk_actions_job_spec.rb
@@ -65,5 +65,21 @@
       expect(Conversation.second.assignee_id).to eq(agent.id)
       expect(Conversation.third.assignee_id).to eq(agent.id)
     end
+
+    it 'bulk updates the snoozed_until' do
+      params = {
+        type: 'Conversation',
+        fields: { status: 'snoozed', snoozed_until: Time.zone.now },
+        ids: Conversation.first(3).pluck(:display_id)
+      }
+
+      expect(Conversation.first.snoozed_until).to be_nil
+
+      described_class.perform_now(account: account, params: params, user: agent)
+
+      expect(Conversation.first.snoozed_until).to be_present
+      expect(Conversation.second.snoozed_until).to be_present
+      expect(Conversation.third.snoozed_until).to be_present
+    end
   end
 end
diff --git a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
index f40e391517a78..5054a519cfbda 100644
--- a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
@@ -41,18 +41,27 @@
     context 'when the channel is regular imap' do
       it 'calls the imap fetch service' do
         fetch_service = double
-        allow(Imap::FetchEmailService).to receive(:new).with(channel: imap_email_channel).and_return(fetch_service)
+        allow(Imap::FetchEmailService).to receive(:new).with(channel: imap_email_channel, interval: 1).and_return(fetch_service)
         allow(fetch_service).to receive(:perform).and_return([])
 
         described_class.perform_now(imap_email_channel)
         expect(fetch_service).to have_received(:perform)
       end
+
+      it 'calls the imap fetch service with the correct interval' do
+        fetch_service = double
+        allow(Imap::FetchEmailService).to receive(:new).with(channel: imap_email_channel, interval: 4).and_return(fetch_service)
+        allow(fetch_service).to receive(:perform).and_return([])
+
+        described_class.perform_now(imap_email_channel, 4)
+        expect(fetch_service).to have_received(:perform)
+      end
     end
 
     context 'when the channel is Microsoft' do
       it 'calls the Microsoft fetch service' do
         fetch_service = double
-        allow(Imap::MicrosoftFetchEmailService).to receive(:new).with(channel: microsoft_imap_email_channel).and_return(fetch_service)
+        allow(Imap::MicrosoftFetchEmailService).to receive(:new).with(channel: microsoft_imap_email_channel, interval: 1).and_return(fetch_service)
         allow(fetch_service).to receive(:perform).and_return([])
 
         described_class.perform_now(microsoft_imap_email_channel)
@@ -60,13 +69,21 @@
       end
     end
 
-    context 'when IMAP connection errors out' do
-      it 'mark the connection for authorization required' do
-        allow(Imap::FetchEmailService).to receive(:new).with(channel: imap_email_channel).and_raise(Errno::ECONNREFUSED)
+    context 'when IMAP OAuth errors out' do
+      it 'marks the connection as requiring authorization' do
+        error_response = double
+        oauth_error = OAuth2::Error.new(error_response)
+
+        allow(Imap::MicrosoftFetchEmailService).to receive(:new)
+          .with(channel: microsoft_imap_email_channel, interval: 1)
+          .and_raise(oauth_error)
+
         allow(Redis::Alfred).to receive(:incr)
 
-        expect(Redis::Alfred).to receive(:incr).with("AUTHORIZATION_ERROR_COUNT:channel_email:#{imap_email_channel.id}")
-        described_class.perform_now(imap_email_channel)
+        expect(Redis::Alfred).to receive(:incr)
+          .with("AUTHORIZATION_ERROR_COUNT:channel_email:#{microsoft_imap_email_channel.id}")
+
+        described_class.perform_now(microsoft_imap_email_channel)
       end
     end
 
@@ -80,14 +97,14 @@
         allow(Imap::ImapMailbox).to receive(:new).and_return(mailbox)
         allow(ChatwootExceptionTracker).to receive(:new).and_return(exception_tracker)
 
-        allow(Imap::FetchEmailService).to receive(:new).with(channel: imap_email_channel).and_return(fetch_service)
+        allow(Imap::FetchEmailService).to receive(:new).with(channel: imap_email_channel, interval: 1).and_return(fetch_service)
         allow(fetch_service).to receive(:perform).and_return([inbound_mail])
       end
 
       it 'calls the mailbox to create emails' do
         allow(mailbox).to receive(:process)
 
-        expect(Imap::FetchEmailService).to receive(:new).with(channel: imap_email_channel).and_return(fetch_service)
+        expect(Imap::FetchEmailService).to receive(:new).with(channel: imap_email_channel, interval: 1).and_return(fetch_service)
         expect(fetch_service).to receive(:perform).and_return([inbound_mail])
         expect(mailbox).to receive(:process).with(inbound_mail, imap_email_channel)
 
diff --git a/spec/lib/custom_markdown_renderer_spec.rb b/spec/lib/custom_markdown_renderer_spec.rb
index a4b0cae482740..74c6d43981a9c 100644
--- a/spec/lib/custom_markdown_renderer_spec.rb
+++ b/spec/lib/custom_markdown_renderer_spec.rb
@@ -68,6 +68,20 @@ def render_markdown_link(link)
       end
     end
 
+    context 'when link is a Loom URL' do
+      let(:loom_url) { 'https://www.loom.com/share/VIDEO_ID' }
+
+      it 'renders an iframe with Loom embed code' do
+        output = render_markdown_link(loom_url)
+        expect(output).to include(`
+          <iframe
+            width="640"
+            height="360"
+            src="https://www.loom.com/embed/VIDEO_ID"
+        `)
+      end
+    end
+
     context 'when link is a Vimeo URL' do
       let(:vimeo_url) { 'https://vimeo.com/1234567' }
 
diff --git a/spec/lib/online_status_tracker_spec.rb b/spec/lib/online_status_tracker_spec.rb
index c2f69ffaca031..d88298485a752 100644
--- a/spec/lib/online_status_tracker_spec.rb
+++ b/spec/lib/online_status_tracker_spec.rb
@@ -9,10 +9,11 @@
   context 'when get_available_users' do
     before do
       described_class.update_presence(account.id, 'User', user1.id)
+      described_class.update_presence(account.id, 'User', user2.id)
     end
 
     it 'returns only the online user ids with presence' do
-      expect(described_class.get_available_users(account.id).keys).to contain_exactly(user1.id.to_s)
+      expect(described_class.get_available_users(account.id).keys).to contain_exactly(user1.id.to_s, user2.id.to_s)
       expect(described_class.get_available_users(account.id).values).not_to include(user3.id)
     end
 
@@ -20,6 +21,17 @@
       user2.account_users.first.update(auto_offline: false)
       expect(described_class.get_available_users(account.id).keys).to contain_exactly(user1.id.to_s, user2.id.to_s)
     end
+
+    it 'returns the availability from the db if it is not present in redis and set it in redis' do
+      user2.account_users.find_by(account_id: account.id).update!(availability: 'offline')
+      # clear the redis cache to ensure values are fetched from db
+      Redis::Alfred.delete(format(Redis::Alfred::ONLINE_STATUS, account_id: account.id))
+      expect(described_class.get_available_users(account.id)[user1.id.to_s]).to eq('online')
+      expect(described_class.get_available_users(account.id)[user2.id.to_s]).to eq('offline')
+      # ensure online status is also set
+      expect(Redis::Alfred.hmget(format(Redis::Alfred::ONLINE_STATUS, account_id: account.id),
+                                 [user1.id.to_s, user2.id.to_s])).to eq(%w[online offline])
+    end
   end
 
   context 'when get_available_contacts' do
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index 5802ce00adc32..b353f330d5dd2 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -142,7 +142,9 @@
         'notification.deleted',
         {
           account_id: notification.account_id,
-          notification: notification.push_event_data,
+          notification: {
+            id: notification.id
+          },
           unread_count: 1,
           count: 1
         }
diff --git a/spec/listeners/participation_listener_spec.rb b/spec/listeners/participation_listener_spec.rb
new file mode 100644
index 0000000000000..9ed70fc3367f6
--- /dev/null
+++ b/spec/listeners/participation_listener_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+describe ParticipationListener do
+  let(:listener) { described_class.instance }
+  let!(:account) { create(:account) }
+  let!(:admin) { create(:user, account: account, role: :administrator) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:agent) { create(:user, account: account, role: :agent) }
+  let!(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: agent) }
+
+  before do
+    create(:inbox_member, inbox: inbox, user: agent)
+  end
+
+  describe '#assignee_changed' do
+    let(:event_name) { :assignee_changed }
+    let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation) }
+
+    it 'adds the assignee as a participant to the conversation' do
+      expect(conversation.conversation_participants.map(&:user_id)).not_to include(admin.id)
+      listener.assignee_changed(event)
+      expect(conversation.conversation_participants.map(&:user_id)).to include(agent.id)
+    end
+
+    it 'does not fail if the conversation participant already exists' do
+      conversation.conversation_participants.create!(user: agent)
+      expect { listener.assignee_changed(event) }.not_to raise_error
+    end
+
+    it 'logs a debug message if participant save fails due to a race condition' do
+      allow(Rails.logger).to receive(:warn)
+      allow(conversation).to receive(:conversation_participants).and_return(double)
+      allow(conversation.conversation_participants).to receive(:find_or_create_by!).and_raise(ActiveRecord::RecordNotUnique)
+      expect { listener.assignee_changed(event) }.not_to raise_error
+      expect(Rails.logger).to have_received(:warn).with('Failed to create conversation participant for account ' \
+                                                        "#{account.id} : user #{agent.id} : conversation #{conversation.id}")
+    end
+  end
+end
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index 42942a5488fe1..5f2886b3db2bb 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -54,6 +54,16 @@
       end
     end
 
+    context 'when a new email with invalid from' do
+      let(:inbound_mail) { create_inbound_email_from_mail(from: 'invalidemail', to: 'imap@gmail.com', subject: 'Hello!') }
+
+      it 'does not create a new conversation' do
+        allow(Rails.logger).to receive(:error)
+        class_instance.process(inbound_mail.mail, channel)
+        expect(Rails.logger).to have_received(:error).with("Email from: invalidemail : inbox #{inbox.id} is invalid")
+      end
+    end
+
     context 'when a reply for existing email conversation' do
       let(:prev_conversation) { create(:conversation, account: account, inbox: channel.inbox, assignee: agent) }
       let(:reply_mail) do
diff --git a/spec/models/channel/telegram_spec.rb b/spec/models/channel/telegram_spec.rb
index 2cc9279773875..17aa848f6a42f 100644
--- a/spec/models/channel/telegram_spec.rb
+++ b/spec/models/channel/telegram_spec.rb
@@ -137,68 +137,20 @@
     end
   end
 
-  context 'when a empty message and valid attachments' do
+  context 'when message contains attachments' do
     let(:message) do
       create(:message, message_type: :outgoing, content: nil,
                        conversation: create(:conversation, inbox: telegram_channel.inbox, additional_attributes: { 'chat_id' => '123' }))
     end
 
-    it 'send image' do
-      telegram_attachment_response = double
+    it 'calls send attachment service' do
+      telegram_attachment_service = double
       attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
       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' }] })
-      allow(telegram_channel).to receive(:attachments_request).and_return(telegram_attachment_response)
+      allow(Telegram::SendAttachmentsService).to receive(:new).with(message: message).and_return(telegram_attachment_service)
+      allow(telegram_attachment_service).to receive(:perform).and_return('telegram_456')
       expect(telegram_channel.send_message_on_telegram(message)).to eq('telegram_456')
     end
-
-    it 'send document' do
-      telegram_attachment_response = double
-      attachment = message.attachments.new(account_id: message.account_id, file_type: :file)
-      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)
-      allow(telegram_attachment_response).to receive(:parsed_response).and_return({ 'result' => [{ 'message_id' => 'telegram_456' }] })
-      allow(telegram_channel).to receive(:attachments_request).and_return(telegram_attachment_response)
-      expect(telegram_channel.send_message_on_telegram(message)).to eq('telegram_456')
-    end
-
-    it 'send image failed' do
-      telegram_attachment_response = double
-      attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-      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(false)
-      allow(telegram_attachment_response).to receive(:parsed_response).and_return({ 'ok' => false, 'error_code' => '400',
-                                                                                    'description' => 'Bad Request: invalid file id' })
-      allow(telegram_channel).to receive(:attachments_request).and_return(telegram_attachment_response)
-      telegram_channel.send_message_on_telegram(message)
-      expect(message.reload.status).to eq('failed')
-      expect(message.reload.external_error).to eq('400, Bad Request: invalid file id')
-    end
-  end
-
-  context 'when a valid message and valid attachment' do
-    it 'send both message and attachment' do
-      message = create(:message, message_type: :outgoing, content: 'test',
-                                 conversation: create(:conversation, inbox: telegram_channel.inbox, additional_attributes: { 'chat_id' => '123' }))
-
-      telegram_message_response = double
-      telegram_attachment_response = double
-      attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-      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' } })
-      allow(telegram_attachment_response).to receive(:success?).and_return(true)
-      allow(telegram_attachment_response).to receive(:parsed_response).and_return({ 'result' => [{ 'message_id' => 'telegram_789' }] })
-
-      allow(telegram_channel).to receive(:message_request).and_return(telegram_message_response)
-      allow(telegram_channel).to receive(:attachments_request).and_return(telegram_attachment_response)
-      expect(telegram_channel.send_message_on_telegram(message)).to eq('telegram_789')
-    end
   end
 end
diff --git a/spec/models/concerns/auto_assignment_handler_shared.rb b/spec/models/concerns/auto_assignment_handler_shared.rb
index cef1e17ee580d..90c9c9d209b21 100644
--- a/spec/models/concerns/auto_assignment_handler_shared.rb
+++ b/spec/models/concerns/auto_assignment_handler_shared.rb
@@ -26,10 +26,6 @@
       expect(conversation.reload.assignee).to eq(agent)
     end
 
-    it 'adds assignee to conversation participants' do
-      expect(conversation.conversation_participants.map(&:user)).to include(agent)
-    end
-
     it 'will not auto assign agent if enable_auto_assignment is false' do
       inbox.update(enable_auto_assignment: false)
 
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 2f79b08f2c818..0ca7303ef0a20 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -156,7 +156,7 @@
                                                                  changed_attributes: nil, performed_by: nil)
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::ASSIGNEE_CHANGED, kind_of(Time), conversation: conversation, notifiable_assignee_change: true,
-                                                                changed_attributes: nil, performed_by: nil)
+                                                                changed_attributes: changed_attributes, performed_by: nil)
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::CONVERSATION_UPDATED, kind_of(Time), conversation: conversation, notifiable_assignee_change: true,
                                                                     changed_attributes: changed_attributes, performed_by: nil)
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 9f8ea00a168e9..4c66e37ee6421 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -11,7 +11,7 @@
   end
 
   describe 'length validations' do
-    let(:message) { create(:message) }
+    let!(:message) { create(:message) }
 
     context 'when it validates name length' do
       it 'valid when within limit' do
@@ -27,6 +27,17 @@
         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
+
+      it 'adds error in case of message flooding' do
+        with_modified_env 'CONVERSATION_MESSAGE_PER_MINUTE_LIMIT': '2' do
+          conversation = message.conversation
+          create(:message, conversation: conversation)
+          conv_new_message = build(:message, conversation: message.conversation)
+
+          expect(conv_new_message.valid?).to be false
+          expect(conv_new_message.errors[:base]).to eq(['Too many messages'])
+        end
+      end
     end
   end
 
@@ -96,7 +107,11 @@
   end
 
   describe 'message create event' do
-    let(:conversation) { create(:conversation) }
+    let!(:conversation) { create(:conversation) }
+
+    before do
+      conversation.reload
+    end
 
     it 'updates the conversation first reply created at if it is the first outgoing message' do
       expect(conversation.first_reply_created_at).to be_nil
diff --git a/spec/services/contacts/filter_service_spec.rb b/spec/services/contacts/filter_service_spec.rb
index a373cf81ed067..483555a0c2001 100644
--- a/spec/services/contacts/filter_service_spec.rb
+++ b/spec/services/contacts/filter_service_spec.rb
@@ -16,7 +16,6 @@
     create(:inbox_member, user: second_user, inbox: inbox)
     create(:conversation, account: account, inbox: inbox, assignee: first_user, contact: en_contact)
     create(:conversation, account: account, inbox: inbox, contact: el_contact)
-    Current.account = account
 
     create(:custom_attribute_definition,
            attribute_key: 'contact_additional_information',
@@ -59,7 +58,7 @@
           }.with_indifferent_access
         ]
 
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:count]).to be 1
         expect(result[:contacts].length).to be 1
         expect(result[:contacts].first.name).to eq(en_contact.name)
@@ -71,7 +70,7 @@
         blocked_contact = create(:contact, account: account, blocked: true)
         params = { payload: [{ attribute_key: 'blocked', filter_operator: 'equal_to', values: ['true'],
                                query_operator: nil }.with_indifferent_access] }
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:count]).to be 1
         expect(result[:contacts].first.id).to eq(blocked_contact.id)
       end
@@ -79,7 +78,7 @@
       it 'filter contacts by not_blocked' do
         params = { payload: [{ attribute_key: 'blocked', filter_operator: 'equal_to', values: [false],
                                query_operator: nil }.with_indifferent_access] }
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         # existing contacts are not blocked
         expect(result[:count]).to be 3
       end
@@ -96,7 +95,7 @@
           }.with_indifferent_access
         ]
 
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:contacts].length).to be 2
         expect(result[:contacts].first.label_list).to include('support')
         expect(result[:contacts].last.label_list).to include('support')
@@ -112,7 +111,7 @@
           }.with_indifferent_access
         ]
 
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:contacts].length).to be 1
         expect(result[:contacts].first.id).to eq el_contact.id
       end
@@ -127,7 +126,7 @@
           }.with_indifferent_access
         ]
 
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:contacts].length).to be 2
         expect(result[:contacts].first.label_list).to include('support')
         expect(result[:contacts].last.label_list).to include('support')
@@ -143,7 +142,7 @@
           }.with_indifferent_access
         ]
 
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:contacts].length).to be 1
         expect(result[:contacts].first.id).to eq el_contact.id
       end
@@ -180,7 +179,7 @@
           'test custom data'
         ).count
 
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:contacts].length).to be expected_count
         expect(result[:contacts].first.id).to eq(el_contact.id)
       end
@@ -197,7 +196,7 @@
 
         expected_count = Contact.where('last_activity_at < ?', (Time.zone.today - 2.days)).count
 
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:contacts].length).to be expected_count
         expect(result[:contacts].pluck(:id)).to include(el_contact.id)
         expect(result[:contacts].pluck(:id)).to include(cs_contact.id)
@@ -219,7 +218,7 @@
 
       it 'filter contacts by additional_attributes' do
         params[:payload] = payload
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:count]).to be 1
         expect(result[:contacts].first.id).to eq(en_contact.id)
       end
@@ -247,7 +246,7 @@
             query_operator: nil
           }.with_indifferent_access
         ]
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:contacts].length).to be 1
         expect(result[:contacts].first.id).to eq(cs_contact.id)
       end
@@ -273,7 +272,7 @@
             query_operator: nil
           }.with_indifferent_access
         ]
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expect(result[:contacts].length).to be 1
         expect(result[:contacts].first.id).to eq(el_contact.id)
       end
@@ -294,7 +293,7 @@
             query_operator: nil
           }.with_indifferent_access
         ]
-        result = filter_service.new(params, first_user).perform
+        result = filter_service.new(account, first_user, params).perform
         expected_count = Contact.where("created_at < ? AND custom_attributes->>'customer_type' = ?", Date.tomorrow, 'platinum').count
 
         expect(result[:contacts].length).to be expected_count
diff --git a/spec/services/imap/microsoft_fetch_email_service_spec.rb b/spec/services/imap/microsoft_fetch_email_service_spec.rb
index 3a13ce0c6b338..a4a0a62d1626a 100644
--- a/spec/services/imap/microsoft_fetch_email_service_spec.rb
+++ b/spec/services/imap/microsoft_fetch_email_service_spec.rb
@@ -50,5 +50,31 @@
         end
       end
     end
+
+    context 'when the interval is passed during an IMAP Sync' do
+      it 'fetches the emails based on the interval specified in the job' do
+        travel_to '26.10.2020 10:00'.to_datetime do
+          email_object = create_inbound_email_from_fixture('only_text.eml')
+          email_header = Net::IMAP::FetchData.new(1, 'BODY[HEADER]' => eml_content_with_message_id)
+          imap_fetch_mail = Net::IMAP::FetchData.new(1, 'RFC822' => eml_content_with_message_id)
+
+          allow(imap).to receive(:search).with(%w[SINCE 18-Oct-2020]).and_return([1])
+          allow(imap).to receive(:fetch).with([1], 'BODY.PEEK[HEADER]').and_return([email_header])
+          allow(imap).to receive(:fetch).with(1, 'RFC822').and_return([imap_fetch_mail])
+          allow(imap).to receive(:logout)
+
+          result = described_class.new(channel: microsoft_channel, interval: 8).perform
+
+          expect(refresh_token_service).to have_received(:access_token)
+
+          expect(result.length).to eq 1
+          expect(result[0].message_id).to eq email_object.message_id
+          expect(imap).to have_received(:search).with(%w[SINCE 18-Oct-2020])
+          expect(imap).to have_received(:fetch).with([1], 'BODY.PEEK[HEADER]')
+          expect(imap).to have_received(:fetch).with(1, 'RFC822')
+          expect(logger).to have_received(:info).with("[IMAP::FETCH_EMAIL_SERVICE] Fetching mails from #{microsoft_channel.email}, found 1.")
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/telegram/send_attachments_service_spec.rb b/spec/services/telegram/send_attachments_service_spec.rb
new file mode 100644
index 0000000000000..2159acdddba70
--- /dev/null
+++ b/spec/services/telegram/send_attachments_service_spec.rb
@@ -0,0 +1,114 @@
+require 'rails_helper'
+
+RSpec.describe Telegram::SendAttachmentsService do
+  describe '#perform' do
+    let(:channel) { create(:channel_telegram) }
+    let(:message) { build(:message, conversation: create(:conversation, inbox: channel.inbox)) }
+    let(:service) { described_class.new(message: message) }
+    let(:telegram_api_url) { channel.telegram_api_url }
+
+    before do
+      allow(channel).to receive(:chat_id).and_return('chat123')
+
+      stub_request(:post, "#{telegram_api_url}/sendMediaGroup")
+        .to_return(status: 200, body: { ok: true, result: [{ message_id: 'media' }] }.to_json, headers: { 'Content-Type' => 'application/json' })
+
+      stub_request(:post, "#{telegram_api_url}/sendDocument")
+        .to_return(status: 200, body: { ok: true, result: { message_id: 'document' } }.to_json, headers: { 'Content-Type' => 'application/json' })
+    end
+
+    it 'sends all types of attachments in seperate groups and returns the last successful message ID from the batch' do
+      attach_files(message)
+      result = service.perform
+      expect(result).to eq('document')
+      # videos and images are sent in a media group
+      # audio is sent in another group
+      expect(a_request(:post, "#{telegram_api_url}/sendMediaGroup")).to have_been_made.times(2)
+      expect(a_request(:post, "#{telegram_api_url}/sendDocument")).to have_been_made.once
+    end
+
+    context 'when all attachments are documents' do
+      before do
+        2.times { attach_file_to_message(message, 'file', 'sample.pdf', 'application/pdf') }
+        message.save!
+      end
+
+      it 'sends documents individually and returns the message ID of the first successful document' do
+        result = service.perform
+        expect(result).to eq('document')
+        expect(a_request(:post, "#{telegram_api_url}/sendDocument")).to have_been_made.times(2)
+      end
+    end
+
+    context 'when all attachments are photo and video' do
+      before do
+        2.times { attach_file_to_message(message, 'image', 'sample.png', 'image/png') }
+        attach_file_to_message(message, 'video', 'sample.mp4', 'video/mp4')
+        message.save!
+      end
+
+      it 'sends in a single media group and returns the message ID' do
+        result = service.perform
+        expect(result).to eq('media')
+        expect(a_request(:post, "#{telegram_api_url}/sendMediaGroup")).to have_been_made.once
+      end
+    end
+
+    context 'when all attachments are audio' do
+      before do
+        2.times { attach_file_to_message(message, 'audio', 'sample.mp3', 'audio/mpeg') }
+        message.save!
+      end
+
+      it 'sends audio messages in single media group and returns the message ID' do
+        result = service.perform
+        expect(result).to eq('media')
+        expect(a_request(:post, "#{telegram_api_url}/sendMediaGroup")).to have_been_made.once
+      end
+    end
+
+    context 'when all attachments are photos, videos, and audio' do
+      before do
+        attach_file_to_message(message, 'image', 'sample.png', 'image/png')
+        attach_file_to_message(message, 'video', 'sample.mp4', 'video/mp4')
+        attach_file_to_message(message, 'audio', 'sample.mp3', 'audio/mpeg')
+        message.save!
+      end
+
+      it 'sends photos and videos in a media group and audio in a separate group' do
+        result = service.perform
+        expect(result).to eq('media')
+        expect(a_request(:post, "#{telegram_api_url}/sendMediaGroup")).to have_been_made.times(2)
+      end
+    end
+
+    context 'when an attachment fails to send' do
+      before do
+        stub_request(:post, "#{telegram_api_url}/sendDocument")
+          .to_return(status: 500, body: { ok: false,
+                                          description: 'Internal server error' }.to_json, headers: { 'Content-Type' => 'application/json' })
+      end
+
+      it 'logs an error, stops processing, and returns nil' do
+        attach_files(message)
+        expect(Rails.logger).to receive(:error).at_least(:once)
+        result = service.perform
+        expect(result).to be_nil
+        expect(a_request(:post, "#{telegram_api_url}/sendDocument")).to have_been_made.once
+      end
+    end
+
+    def attach_files(message)
+      attach_file_to_message(message, 'file', 'sample.pdf', 'application/pdf')
+      attach_file_to_message(message, 'image', 'sample.png', 'image/png')
+      attach_file_to_message(message, 'video', 'sample.mp4', 'video/mp4')
+      attach_file_to_message(message, 'audio', 'sample.mp3', 'audio/mpeg')
+      message.save!
+    end
+
+    def attach_file_to_message(message, type, filename, content_type)
+      attachment = message.attachments.new(account_id: message.account_id, file_type: type)
+      attachment.file.attach(io: Rails.root.join("spec/assets/#{filename}").open, filename: filename, content_type: content_type)
+    end
+  end
+end
diff --git a/tailwind.config.js b/tailwind.config.js
index a34650fb586ad..9e551985b38f9 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,17 +1,5 @@
-const {
-  blue,
-  blueDark,
-  green,
-  greenDark,
-  yellow,
-  yellowDark,
-  slate,
-  slateDark,
-  red,
-  redDark,
-  violet,
-  violetDark,
-} = require('@radix-ui/colors');
+const { slateDark } = require('@radix-ui/colors');
+import { colors } from './theme/colors';
 const defaultTheme = require('tailwindcss/defaultTheme');
 module.exports = {
   darkMode: 'class',
@@ -41,94 +29,7 @@ module.exports = {
       'modal-backdrop-light': 'rgba(0, 0, 0, 0.4)',
       'modal-backdrop-dark': 'rgba(0, 0, 0, 0.6)',
       current: 'currentColor',
-      woot: {
-        25: blue.blue2,
-        50: blue.blue3,
-        75: blue.blue4,
-        100: blue.blue5,
-        200: blue.blue7,
-        300: blue.blue8,
-        400: blueDark.blue11,
-        500: blueDark.blue10,
-        600: blueDark.blue9,
-        700: blueDark.blue8,
-        800: blueDark.blue6,
-        900: blueDark.blue2,
-      },
-      green: {
-        50: greenDark.green12,
-        100: green.green6,
-        200: green.green7,
-        300: green.green8,
-        400: greenDark.green10,
-        500: greenDark.green9,
-        600: green.green10,
-        700: green.green11,
-        800: greenDark.green7,
-        900: greenDark.green6,
-      },
-      yellow: {
-        50: yellow.yellow2,
-        100: yellow.yellow3,
-        200: yellow.yellow5,
-        300: yellowDark.yellow10,
-        400: yellowDark.yellow9,
-        500: yellowDark.yellow11,
-        600: yellow.yellow8,
-        700: yellowDark.yellow7,
-        800: yellowDark.yellow2,
-        900: yellowDark.yellow1,
-      },
-      slate: {
-        25: slate.slate2,
-        50: slate.slate3,
-        75: slate.slate4,
-        100: slate.slate5,
-        200: slate.slate7,
-        300: slate.slate8,
-        400: slateDark.slate11,
-        500: slateDark.slate10,
-        600: slate.slate11,
-        700: slateDark.slate8,
-        800: slateDark.slate4,
-        900: slateDark.slate1,
-      },
-      black: {
-        50: slate.slate2,
-        100: slateDark.slate12,
-        200: slate.slate7,
-        300: slate.slate8,
-        400: slateDark.slate11,
-        500: slate.slate9,
-        600: slateDark.slate9,
-        700: slateDark.slate8,
-        800: slateDark.slate7,
-        900: slateDark.slate2,
-      },
-      red: {
-        50: redDark.red12,
-        100: red.red6,
-        200: red.red8,
-        300: redDark.red11,
-        400: redDark.red10,
-        500: red.red9,
-        600: red.red10,
-        700: red.red11,
-        800: redDark.red8,
-        900: red.red12,
-      },
-      violet: {
-        50: violet.violet1,
-        100: violetDark.violet12,
-        200: violet.violet6,
-        300: violet.violet8,
-        400: violet.violet11,
-        500: violet.violet9,
-        600: violetDark.violet8,
-        700: violetDark.violet7,
-        800: violetDark.violet6,
-        900: violet.violet12,
-      },
+      ...colors,
       body: slateDark.slate7,
     },
     keyframes: {
diff --git a/theme/colors.js b/theme/colors.js
new file mode 100644
index 0000000000000..1ca8fb6a6cb8e
--- /dev/null
+++ b/theme/colors.js
@@ -0,0 +1,285 @@
+const {
+  blue,
+  blueDark,
+  green,
+  greenDark,
+  yellow,
+  yellowDark,
+  slate,
+  slateDark,
+  red,
+  redDark,
+  violet,
+  violetDark,
+} = require('@radix-ui/colors');
+export const colors = {
+  woot: {
+    25: blue.blue2,
+    50: blue.blue3,
+    75: blue.blue4,
+    100: blue.blue5,
+    200: blue.blue7,
+    300: blue.blue8,
+    400: blueDark.blue11,
+    500: blueDark.blue10,
+    600: blueDark.blue9,
+    700: blueDark.blue8,
+    800: blueDark.blue6,
+    900: blueDark.blue2,
+  },
+  green: {
+    50: greenDark.green12,
+    100: green.green6,
+    200: green.green7,
+    300: green.green8,
+    400: greenDark.green10,
+    500: greenDark.green9,
+    600: green.green10,
+    700: green.green11,
+    800: greenDark.green7,
+    900: greenDark.green6,
+  },
+  yellow: {
+    50: yellow.yellow2,
+    100: yellow.yellow3,
+    200: yellow.yellow5,
+    300: yellowDark.yellow10,
+    400: yellowDark.yellow9,
+    500: yellowDark.yellow11,
+    600: yellow.yellow8,
+    700: yellowDark.yellow7,
+    800: yellowDark.yellow2,
+    900: yellowDark.yellow1,
+  },
+  slate: {
+    25: slate.slate2,
+    50: slate.slate3,
+    75: slate.slate4,
+    100: slate.slate5,
+    200: slate.slate7,
+    300: slate.slate8,
+    400: slateDark.slate11,
+    500: slateDark.slate10,
+    600: slate.slate11,
+    700: slateDark.slate8,
+    800: slateDark.slate4,
+    900: slateDark.slate1,
+  },
+  black: {
+    50: slate.slate2,
+    100: slateDark.slate12,
+    200: slate.slate7,
+    300: slate.slate8,
+    400: slateDark.slate11,
+    500: slate.slate9,
+    600: slateDark.slate9,
+    700: slateDark.slate8,
+    800: slateDark.slate7,
+    900: slateDark.slate2,
+  },
+  red: {
+    50: redDark.red12,
+    100: red.red6,
+    200: red.red8,
+    300: redDark.red11,
+    400: redDark.red10,
+    500: red.red9,
+    600: red.red10,
+    700: red.red11,
+    800: redDark.red8,
+    900: red.red12,
+  },
+  violet: {
+    50: violet.violet1,
+    100: violetDark.violet12,
+    200: violet.violet6,
+    300: violet.violet8,
+    400: violet.violet11,
+    500: violet.violet9,
+    600: violetDark.violet8,
+    700: violetDark.violet7,
+    800: violetDark.violet6,
+    900: violet.violet12,
+  },
+  primary: {
+    25: 'rgb(var(--color-primary-25) / <alpha-value>)',
+    50: 'rgb(var(--color-primary-50) / <alpha-value>)',
+    75: 'rgb(var(--color-primary-75) / <alpha-value>)',
+    100: 'rgb(var(--color-primary-100) / <alpha-value>)',
+    200: 'rgb(var(--color-primary-200) / <alpha-value>)',
+    300: 'rgb(var(--color-primary-300) / <alpha-value>)',
+    400: 'rgb(var(--color-primary-400) / <alpha-value>)',
+    500: 'rgb(var(--color-primary-500) / <alpha-value>)',
+    600: 'rgb(var(--color-primary-600) / <alpha-value>)',
+    700: 'rgb(var(--color-primary-700) / <alpha-value>)',
+    800: 'rgb(var(--color-primary-800) / <alpha-value>)',
+    900: 'rgb(var(--color-primary-900) / <alpha-value>)',
+  },
+  ash: {
+    25: 'rgb(var(--color-ash-25) / <alpha-value>)',
+    50: 'rgb(var(--color-ash-50) / <alpha-value>)',
+    75: 'rgb(var(--color-ash-75) / <alpha-value>)',
+    100: 'rgb(var(--color-ash-100) / <alpha-value>)',
+    200: 'rgb(var(--color-ash-200) / <alpha-value>)',
+    300: 'rgb(var(--color-ash-300) / <alpha-value>)',
+    400: 'rgb(var(--color-ash-400) / <alpha-value>)',
+    500: 'rgb(var(--color-ash-500) / <alpha-value>)',
+    600: 'rgb(var(--color-ash-600) / <alpha-value>)',
+    700: 'rgb(var(--color-ash-700) / <alpha-value>)',
+    800: 'rgb(var(--color-ash-800) / <alpha-value>)',
+    900: 'rgb(var(--color-ash-900) / <alpha-value>)',
+  },
+  teal: {
+    25: 'rgb(var(--color-teal-25) / <alpha-value>)',
+    50: 'rgb(var(--color-teal-50) / <alpha-value>)',
+    100: 'rgb(var(--color-teal-100) / <alpha-value>)',
+    200: 'rgb(var(--color-teal-200) / <alpha-value>)',
+    300: 'rgb(var(--color-teal-300) / <alpha-value>)',
+    400: 'rgb(var(--color-teal-400) / <alpha-value>)',
+    500: 'rgb(var(--color-teal-500) / <alpha-value>)',
+    600: 'rgb(var(--color-teal-600) / <alpha-value>)',
+    700: 'rgb(var(--color-teal-700) / <alpha-value>)',
+    800: 'rgb(var(--color-teal-800) / <alpha-value>)',
+    900: 'rgb(var(--color-teal-900) / <alpha-value>)',
+  },
+  amber: {
+    25: 'rgb(var(--color-amber-25) / <alpha-value>)',
+    50: 'rgb(var(--color-amber-50) / <alpha-value>)',
+    75: 'rgb(var(--color-amber-75) / <alpha-value>)',
+    100: 'rgb(var(--color-amber-100) / <alpha-value>)',
+    200: 'rgb(var(--color-amber-200) / <alpha-value>)',
+    300: 'rgb(var(--color-amber-300) / <alpha-value>)',
+    400: 'rgb(var(--color-amber-400) / <alpha-value>)',
+    500: 'rgb(var(--color-amber-500) / <alpha-value>)',
+    600: 'rgb(var(--color-amber-600) / <alpha-value>)',
+    700: 'rgb(var(--color-amber-700) / <alpha-value>)',
+    800: 'rgb(var(--color-amber-800) / <alpha-value>)',
+    900: 'rgb(var(--color-amber-900) / <alpha-value>)',
+  },
+  ruby: {
+    25: 'rgb(var(--color-ruby-25) / <alpha-value>)',
+    50: 'rgb(var(--color-ruby-50) / <alpha-value>)',
+    75: 'rgb(var(--color-ruby-75) / <alpha-value>)',
+    100: 'rgb(var(--color-ruby-100) / <alpha-value>)',
+    200: 'rgb(var(--color-ruby-200) / <alpha-value>)',
+    300: 'rgb(var(--color-ruby-300) / <alpha-value>)',
+    400: 'rgb(var(--color-ruby-400) / <alpha-value>)',
+    500: 'rgb(var(--color-ruby-500) / <alpha-value>)',
+    600: 'rgb(var(--color-ruby-600) / <alpha-value>)',
+    700: 'rgb(var(--color-ruby-700) / <alpha-value>)',
+    800: 'rgb(var(--color-ruby-800) / <alpha-value>)',
+    900: 'rgb(var(--color-ruby-900) / <alpha-value>)',
+  },
+  grass: {
+    25: 'rgb(var(--color-green-25) / <alpha-value>)',
+    50: 'rgb(var(--color-green-50) / <alpha-value>)',
+    75: 'rgb(var(--color-green-75) / <alpha-value>)',
+    100: 'rgb(var(--color-green-100) / <alpha-value>)',
+    200: 'rgb(var(--color-green-200) / <alpha-value>)',
+    300: 'rgb(var(--color-green-300) / <alpha-value>)',
+    400: 'rgb(var(--color-green-400) / <alpha-value>)',
+    500: 'rgb(var(--color-green-500) / <alpha-value>)',
+    600: 'rgb(var(--color-green-600) / <alpha-value>)',
+    700: 'rgb(var(--color-green-700) / <alpha-value>)',
+    800: 'rgb(var(--color-green-800) / <alpha-value>)',
+    900: 'rgb(var(--color-green-900) / <alpha-value>)',
+  },
+  mint: {
+    25: 'rgb(var(--color-mint-25) / <alpha-value>)',
+    50: 'rgb(var(--color-mint-50) / <alpha-value>)',
+    75: 'rgb(var(--color-mint-75) / <alpha-value>)',
+    100: 'rgb(var(--color-mint-100) / <alpha-value>)',
+    200: 'rgb(var(--color-mint-200) / <alpha-value>)',
+    300: 'rgb(var(--color-mint-300) / <alpha-value>)',
+    400: 'rgb(var(--color-mint-400) / <alpha-value>)',
+    500: 'rgb(var(--color-mint-500) / <alpha-value>)',
+    600: 'rgb(var(--color-mint-600) / <alpha-value>)',
+    700: 'rgb(var(--color-mint-700) / <alpha-value>)',
+    800: 'rgb(var(--color-mint-800) / <alpha-value>)',
+    900: 'rgb(var(--color-mint-900) / <alpha-value>)',
+  },
+  sky: {
+    25: 'rgb(var(--color-sky-25) / <alpha-value>)',
+    50: 'rgb(var(--color-sky-50) / <alpha-value>)',
+    75: 'rgb(var(--color-sky-75) / <alpha-value>)',
+    100: 'rgb(var(--color-sky-100) / <alpha-value>)',
+    200: 'rgb(var(--color-sky-200) / <alpha-value>)',
+    300: 'rgb(var(--color-sky-300) / <alpha-value>)',
+    400: 'rgb(var(--color-sky-400) / <alpha-value>)',
+    500: 'rgb(var(--color-sky-500) / <alpha-value>)',
+    600: 'rgb(var(--color-sky-600) / <alpha-value>)',
+    700: 'rgb(var(--color-sky-700) / <alpha-value>)',
+    800: 'rgb(var(--color-sky-800) / <alpha-value>)',
+    900: 'rgb(var(--color-sky-900) / <alpha-value>)',
+  },
+  indigo: {
+    25: 'rgb(var(--color-indigo-25) / <alpha-value>)',
+    50: 'rgb(var(--color-indigo-50) / <alpha-value>)',
+    75: 'rgb(var(--color-indigo-75) / <alpha-value>)',
+    100: 'rgb(var(--color-indigo-100) / <alpha-value>)',
+    200: 'rgb(var(--color-indigo-200) / <alpha-value>)',
+    300: 'rgb(var(--color-indigo-300) / <alpha-value>)',
+    400: 'rgb(var(--color-indigo-400) / <alpha-value>)',
+    500: 'rgb(var(--color-indigo-500) / <alpha-value>)',
+    600: 'rgb(var(--color-indigo-600) / <alpha-value>)',
+    700: 'rgb(var(--color-indigo-700) / <alpha-value>)',
+    800: 'rgb(var(--color-indigo-800) / <alpha-value>)',
+    900: 'rgb(var(--color-indigo-900) / <alpha-value>)',
+  },
+  iris: {
+    25: 'rgb(var(--color-iris-25) / <alpha-value>)',
+    50: 'rgb(var(--color-iris-50) / <alpha-value>)',
+    75: 'rgb(var(--color-iris-75) / <alpha-value>)',
+    100: 'rgb(var(--color-iris-100) / <alpha-value>)',
+    200: 'rgb(var(--color-iris-200) / <alpha-value>)',
+    300: 'rgb(var(--color-iris-300) / <alpha-value>)',
+    400: 'rgb(var(--color-iris-400) / <alpha-value>)',
+    500: 'rgb(var(--color-iris-500) / <alpha-value>)',
+    600: 'rgb(var(--color-iris-600) / <alpha-value>)',
+    700: 'rgb(var(--color-iris-700) / <alpha-value>)',
+    800: 'rgb(var(--color-iris-800) / <alpha-value>)',
+    900: 'rgb(var(--color-iris-900) / <alpha-value>)',
+  },
+  purple: {
+    25: 'rgb(var(--color-violet-25) / <alpha-value>)',
+    50: 'rgb(var(--color-violet-50) / <alpha-value>)',
+    75: 'rgb(var(--color-violet-75) / <alpha-value>)',
+    100: 'rgb(var(--color-violet-100) / <alpha-value>)',
+    200: 'rgb(var(--color-violet-200) / <alpha-value>)',
+    300: 'rgb(var(--color-violet-300) / <alpha-value>)',
+    400: 'rgb(var(--color-violet-400) / <alpha-value>)',
+    500: 'rgb(var(--color-violet-500) / <alpha-value>)',
+    600: 'rgb(var(--color-violet-600) / <alpha-value>)',
+    700: 'rgb(var(--color-violet-700) / <alpha-value>)',
+    800: 'rgb(var(--color-violet-800) / <alpha-value>)',
+    900: 'rgb(var(--color-violet-900) / <alpha-value>)',
+  },
+  pink: {
+    25: 'rgb(var(--color-pink-25) / <alpha-value>)',
+    50: 'rgb(var(--color-pink-50) / <alpha-value>)',
+    75: 'rgb(var(--color-pink-75) / <alpha-value>)',
+    100: 'rgb(var(--color-pink-100) / <alpha-value>)',
+    200: 'rgb(var(--color-pink-200) / <alpha-value>)',
+    300: 'rgb(var(--color-pink-300) / <alpha-value>)',
+    400: 'rgb(var(--color-pink-400) / <alpha-value>)',
+    500: 'rgb(var(--color-pink-500) / <alpha-value>)',
+    600: 'rgb(var(--color-pink-600) / <alpha-value>)',
+    700: 'rgb(var(--color-pink-700) / <alpha-value>)',
+    800: 'rgb(var(--color-pink-800) / <alpha-value>)',
+    900: 'rgb(var(--color-pink-900) / <alpha-value>)',
+  },
+  orange: {
+    25: 'rgb(var(--color-orange-25) / <alpha-value>)',
+    50: 'rgb(var(--color-orange-50) / <alpha-value>)',
+    75: 'rgb(var(--color-orange-75) / <alpha-value>)',
+    100: 'rgb(var(--color-orange-100) / <alpha-value>)',
+    200: 'rgb(var(--color-orange-200) / <alpha-value>)',
+    300: 'rgb(var(--color-orange-300) / <alpha-value>)',
+    400: 'rgb(var(--color-orange-400) / <alpha-value>)',
+    500: 'rgb(var(--color-orange-500) / <alpha-value>)',
+    600: 'rgb(var(--color-orange-600) / <alpha-value>)',
+    700: 'rgb(var(--color-orange-700) / <alpha-value>)',
+    800: 'rgb(var(--color-orange-800) / <alpha-value>)',
+    900: 'rgb(var(--color-orange-900) / <alpha-value>)',
+  },
+};
diff --git a/yarn.lock b/yarn.lock
index 71040ce1792e4..0aefd8413c04f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3177,10 +3177,10 @@
     prosemirror-utils "^0.9.6"
     prosemirror-view "^1.17.2"
 
-"@chatwoot/utils@^0.0.23":
-  version "0.0.23"
-  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.23.tgz#e961fd87ef9ee19c442bfcedac5fe0be2ef37726"
-  integrity sha512-BQ7DprXr7FIkSbHdDc1WonwH0rt/+B+WaaLaXNMjCcxJgkX/gZ8QMltruOfRp/S8cFyd9JfFQhNF0T9lz1OMvA==
+"@chatwoot/utils@^0.0.25":
+  version "0.0.25"
+  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.25.tgz#7657286baa1ef833789f934991df63c4a9716595"
+  integrity sha512-2bGfRewHu0Bra47vHwJa3SdZ0VqXK/2q2ampcc6TT3z8ojSfZqpfMdb+1RKJ/Q1tQEYn/0rJTdWtLDRjePF92A==
   dependencies:
     date-fns "^2.29.1"
 
@@ -6793,6 +6793,20 @@
     source-map "0.5.6"
     tsconfig "^7.0.0"
 
+"@vuelidate/core@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.3.tgz#40468c5ed15b72bde880a026b0699c2f0f1ecede"
+  integrity sha512-AN6l7KF7+mEfyWG0doT96z+47ljwPpZfi9/JrNMkOGLFv27XVZvKzRLXlmDPQjPl/wOB1GNnHuc54jlCLRNqGA==
+  dependencies:
+    vue-demi "^0.13.11"
+
+"@vuelidate/validators@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@vuelidate/validators/-/validators-2.0.4.tgz#0a88a7b2b18f15fd9c384095593f369a6f7384e9"
+  integrity sha512-odTxtUZ2JpwwiQ10t0QWYJkkYrfd0SyFYhdHH44QQ1jDatlZgTh/KRzrWVmn/ib9Gq7H4hFD4e8ahoo5YlUlDw==
+  dependencies:
+    vue-demi "^0.13.11"
+
 "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
   version "1.11.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
@@ -8559,20 +8573,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.30001494"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001494.tgz"
-  integrity sha512-sY2B5Qyl46ZzfYDegrl8GBCzdawSLT4ThM9b9F+aDYUrAG2zCOyMbd2Tq34mS1g4ZKBfjRlzOohQMxx28x6wJg==
-
-caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538:
-  version "1.0.30001538"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz#9dbc6b9af1ff06b5eb12350c2012b3af56744f3f"
-  integrity sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==
-
-caniuse-lite@^1.0.30001503:
-  version "1.0.30001507"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz#fae53f6286e7564783eadea9b447819410a59534"
-  integrity sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A==
+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, caniuse-lite@^1.0.30001503, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538:
+  version "1.0.30001616"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz"
+  integrity sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -14058,6 +14062,13 @@ klona@^2.0.4:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
   integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
 
+lamejs@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.0.tgz#0259f83db4666141a7b671b8caa6369d95177d08"
+  integrity sha512-xEYvsB2sZ9jIccqfUQpQEBdB6UYQDG/ta2xQkH7oEpENb0JHFJii965WVF8ErUMdZzoe7EdIruz1WpICdhZ9Pw==
+  dependencies:
+    use-strict "1.0.1"
+
 language-subtag-registry@~0.3.2:
   version "0.3.21"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a"
@@ -14396,16 +14407,6 @@ loglevel@^1.6.8:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
   integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
-logrocket-vuex@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/logrocket-vuex/-/logrocket-vuex-0.0.3.tgz#e11d65d384f0c9fdac72f984436cc038adf3db90"
-  integrity sha512-Xnl3pBEkc/bbtZ5JEtFwqNjVuLzVEohlBpyQHP47BlO+/6sFmSM2JcNWojysYUo4cp3IWpmWXcezax2+Cq4RsA==
-
-logrocket@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/logrocket/-/logrocket-3.0.1.tgz#c746e8df3d5fee999b152975e51db1908357a6f0"
-  integrity sha512-jOWG+jEzobKVxGytzZ+4KGm2kiMQMRTHab2uDWQyVZcHfEF38BlCH1yjQVY4LCmuQUwZitP9biMzJZnyUQ0dtQ==
-
 loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -14890,6 +14891,11 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
 minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -19450,13 +19456,13 @@ tapable@^2.1.1, tapable@^2.2.0:
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 tar@^6.0.2:
-  version "6.1.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
-  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^3.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
@@ -19625,6 +19631,11 @@ tinycolor2@^1.1.2:
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
   integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==
 
+tinykeys@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tinykeys/-/tinykeys-2.1.0.tgz#1341563e92a7fac9ca90053fddaf2b7553500298"
+  integrity sha512-/MESnqBD1xItZJn5oGQ4OsNORQgJfPP96XSGoyu4eLpwpL0ifO0SYR5OD76u0YMhMXsqkb0UqvI9+yXTh4xv8Q==
+
 titleize@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53"
@@ -20285,6 +20296,11 @@ urlpattern-polyfill@^6.0.2:
   dependencies:
     braces "^3.0.2"
 
+use-strict@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
+  integrity sha512-IeiWvvEXfW5ltKVMkxq6FvNf2LojMKvB2OCeja6+ct24S1XOmQw2dGr2JyndwACWAGJva9B7yPHwAmeA9QCqAQ==
+
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
@@ -20520,6 +20536,11 @@ vue-color@2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
+vue-demi@^0.13.11:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
+  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
+
 vue-docgen-api@^4.44.15:
   version "4.73.0"
   resolved "https://registry.yarnpkg.com/vue-docgen-api/-/vue-docgen-api-4.73.0.tgz#13ef47c349374f5fd375093199085bd83e6b096c"