diff --git a/.rubocop.yml b/.rubocop.yml
index 484e424ed..5add6e26a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,7 +2,6 @@ require:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
-inherit_from: .rubocop_todo.yml
 
 Layout/LineLength:
   Max: 150
@@ -12,7 +11,8 @@ Metrics/ClassLength:
   Exclude:
     - 'app/models/message.rb'
     - 'app/models/conversation.rb'
-
+Metrics/MethodLength:
+  Max: 19
 RSpec/ExampleLength:
   Max: 25
 Style/Documentation:
@@ -50,6 +50,7 @@ Lint/OrAssignmentToConstant:
   Exclude:
     - 'lib/redis/config.rb'
 Metrics/BlockLength:
+  Max: 30
   Exclude:
     - spec/**/*
     - '**/routes.rb'
@@ -102,84 +103,31 @@ RSpec/FactoryBot/SyntaxMethods:
   Enabled: false
 Naming/VariableNumber:
   Enabled: false
-Metrics/MethodLength:
+Naming/MemoizedInstanceVariableName:
   Exclude:
-    - 'db/migrate/20161123131628_devise_token_auth_create_users.rb'
-    - 'db/migrate/20211219031453_update_foreign_keys_on_delete.rb'
-Rails/CreateTableWithTimestamps:
-  Exclude:
-    - 'db/migrate/20170207092002_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb'
+    - 'app/models/message.rb'
 Style/GuardClause:
   Exclude:
     - 'app/builders/account_builder.rb'
     - 'app/models/attachment.rb'
     - 'app/models/message.rb'
-    - 'db/migrate/20190819005836_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb'
 Metrics/AbcSize:
+  Max: 26
   Exclude:
     - 'app/controllers/concerns/auth_helper.rb'
-    - 'db/migrate/20190819005836_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb'
-    - 'db/migrate/20161123131628_devise_token_auth_create_users.rb'
-    - 'app/controllers/api/v1/accounts/inboxes_controller.rb'
-    - 'db/migrate/20211219031453_update_foreign_keys_on_delete.rb'
-Metrics/CyclomaticComplexity:
-  Max: 7
-  Exclude:
-    - 'db/migrate/20190819005836_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb'
-Rails/ReversibleMigration:
-  Exclude:
-    - 'db/migrate/20161025070152_removechannelsfrommodels.rb'
-    - 'db/migrate/20161025070645_remchannel.rb'
-    - 'db/migrate/20161025070645_remchannel.rb'
-    - 'db/migrate/20161110102609_removeinboxid.rb'
-    - 'db/migrate/20170519091539_add_avatar_to_fb.rb'
-    - 'db/migrate/20191020085608_rename_old_tables.rb'
-    - 'db/migrate/20191126185833_update_user_invite_foreign_key.rb'
-    - 'db/migrate/20191130164019_add_template_type_to_messages.rb'
-    - 'db/migrate/20210513083044_remove_not_null_from_webhook_url_channel_api.rb'
-Rails/BulkChangeTable:
-  Exclude:
-    - 'db/migrate/20161025070152_removechannelsfrommodels.rb'
-    - 'db/migrate/20200121190901_create_account_users.rb'
-    - 'db/migrate/20170211092540_notnullableusers.rb'
-    - 'db/migrate/20170403095203_contactadder.rb'
-    - 'db/migrate/20170406104018_add_default_status_conv.rb'
-    - 'db/migrate/20170511134418_latlong.rb'
-    - 'db/migrate/20191027054756_create_contact_inboxes.rb'
-    - 'db/migrate/20191130164019_add_template_type_to_messages.rb'
-    - 'db/migrate/20210425093724_convert_integration_hook_settings_field.rb'
 Rails/UniqueValidationWithoutIndex:
   Exclude:
     - 'app/models/channel/twitter_profile.rb'
     - 'app/models/webhook.rb'
     - 'app/models/contact.rb'
     - 'app/models/integrations/hook.rb'
+    - 'app/models/canned_response.rb'
+    - 'app/models/telegram_bot.rb'
 Rails/RenderInline:
   Exclude:
     - 'app/controllers/swagger_controller.rb'
-Performance/CollectionLiteralInLoop:
-  Exclude:
-    - 'db/migrate/20210315101919_enable_email_channel.rb'
 Rails/ThreeStateBooleanColumn:
   Exclude:
-    - 'db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb'
-    - 'db/migrate/20200605130625_agent_away_message_to_auto_reply.rb'
-    - 'db/migrate/20200606132552_create_labels.rb'
-    - 'db/migrate/20201027135006_create_working_hours.rb'
-    - 'db/migrate/20210112174124_add_hmac_token_to_inbox.rb'
-    - 'db/migrate/20210114202310_create_teams.rb'
-    - 'db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb'
-    - 'db/migrate/20210428135041_add_campaigns.rb'
-    - 'db/migrate/20210602182058_add_hmac_to_api_channel.rb'
-    - 'db/migrate/20210609133433_add_email_collect_to_inboxes.rb'
-    - 'db/migrate/20210618095823_add_csat_toggle_for_inbox.rb'
-    - 'db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb'
-    - 'db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb'
-    - 'db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb'
-    - 'db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb'
-    - 'db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb'
-    - 'db/migrate/20220216151613_add_open_all_day_to_working_hour.rb'
-    - 'db/migrate/20220511072655_add_archive_column_to_portal.rb'
     - 'db/migrate/20230503101201_create_sla_policies.rb'
 RSpec/IndexedLet:
   Enabled: false
@@ -187,6 +135,8 @@ RSpec/NamedSubject:
   Enabled: false
 
 # we should bring this down
+RSpec/MultipleExpectations:
+  Max: 7
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
@@ -203,13 +153,4 @@ AllCops:
     - 'config/environments/**/*'
     - 'tmp/**/*'
     - 'storage/**/*'
-    - 'db/migrate/20200225162150_init_schema.rb'
-    - 'db/migrate/20210611180222_create_active_storage_variant_records.active_storage.rb'
-    - 'db/migrate/20210611180221_add_service_name_to_active_storage_blobs.active_storage.rb'
-    - db/migrate/20200309213132_add_account_id_to_agent_bot_inboxes.rb
-    - db/migrate/20200331095710_add_identifier_to_contact.rb
-    - db/migrate/20200429082655_add_medium_to_twilio_sms.rb
-    - db/migrate/20200503151130_add_account_feature_flag.rb
-    - db/migrate/20200927135222_add_last_activity_at_to_conversation.rb
-    - db/migrate/20210306170117_add_last_activity_at_to_contacts.rb
-    - db/migrate/20220809104508_revert_cascading_indexes.rb
+    - 'db/migrate/20230426130150_init_schema.rb'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index 48e714dd6..000000000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,287 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2019-10-23 16:47:02 +0530 using RuboCop version 0.73.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-Lint/DuplicateMethods:
-  Exclude:
-    - 'app/controllers/api/v1/reports_controller.rb'
-
-# Offense count: 1
-Lint/RescueException:
-  Exclude:
-    - 'app/builders/messages/message_builder.rb'
-
-# Offense count: 4
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'app/controllers/api/v1/reports_controller.rb'
-
-# Offense count: 3
-# Configuration parameters: AllowKeywordBlockArguments.
-Lint/UnderscorePrefixedVariableName:
-  Exclude:
-    - 'app/models/account.rb'
-    - 'deploy/before_symlink.rb'
-
-# Offense count: 18
-Lint/UselessAssignment:
-  Exclude:
-    - 'app/controllers/api/v1/callbacks_controller.rb'
-    - 'app/controllers/api/v1/facebook_indicators_controller.rb'
-    - 'app/listeners/action_cable_listener.rb'
-    - 'app/listeners/reporting_listener.rb'
-    - 'app/models/channel/facebook_page.rb'
-    - 'app/models/facebook_page.rb'
-
-# Offense count: 14
-Metrics/AbcSize:
-  Max: 26
-
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 30
-
-# Offense count: 2
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-# Offense count: 10
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 19
-
-# Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 8
-
-# Offense count: 6
-Naming/AccessorMethodName:
-  Exclude:
-    - 'app/builders/report_builder.rb'
-    - 'app/controllers/api/v1/accounts_controller.rb'
-    - 'app/controllers/api/v1/callbacks_controller.rb'
-    - 'app/controllers/api/v1/conversations_controller.rb'
-
-# Offense count: 9
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'app/controllers/api/base_controller.rb'
-    - 'app/controllers/api/v1/conversations_controller.rb'
-    - 'app/controllers/api/v1/webhooks_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/models/message.rb'
-    - 'lib/integrations/widget/outgoing_message_builder.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: MaxKeyValuePairs.
-Performance/RedundantMerge:
-  Exclude:
-    - 'app/controllers/api/v1/callbacks_controller.rb'
-    - 'app/models/message.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/StringReplacement:
-  Exclude:
-    - 'lib/events/base.rb'
-
-# Offense count: 4
-# Configuration parameters: Prefixes.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/models/contact_spec.rb'
-    - 'spec/models/user_spec.rb'
-
-# Offense count: 1
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/mailers/confirmation_instructions_spec.rb'
-
-# Offense count: 1
-RSpec/DescribeSymbol:
-  Exclude:
-    - 'spec/mailers/confirmation_instructions_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Exclude:
-    - 'spec/models/user_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/models/conversation_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_line_only, single_statement_only, disallow
-RSpec/ImplicitSubject:
-  Exclude:
-    - 'spec/models/user_spec.rb'
-
-# Offense count: 7
-# Configuration parameters: AggregateFailuresByDefault.
-RSpec/MultipleExpectations:
-  Max: 7
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: not_to, to_not
-RSpec/NotToNot:
-  Exclude:
-    - 'spec/mailers/confirmation_instructions_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
-RSpec/VerifiedDoubles:
-  Exclude:
-    - 'spec/models/conversation_spec.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Rails/ActiveRecordAliases:
-  Exclude:
-    - 'app/controllers/api/v1/agents_controller.rb'
-    - 'app/controllers/api/v1/callbacks_controller.rb'
-    - 'app/controllers/api/v1/canned_responses_controller.rb'
-    - 'app/controllers/api/v1/contacts_controller.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Rails/BelongsTo:
-  Exclude:
-    - 'app/models/message.rb'
-    - 'app/models/user.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/EnumHash:
-  Exclude:
-    - 'app/models/attachment.rb'
-    - 'app/models/conversation.rb'
-    - 'app/models/message.rb'
-    - 'app/models/user.rb'
-
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/HasManyOrHasOneDependent:
-  Exclude:
-    - 'app/models/user.rb'
-
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/InverseOf:
-  Exclude:
-    - 'app/models/user.rb'
-
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb
-Rails/LexicallyScopedActionFilter:
-  Exclude:
-    - 'app/controllers/home_controller.rb'
-
-# Offense count: 2
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
-Rails/Output:
-  Exclude:
-    - 'app/bot/bot.rb'
-    - 'app/builders/account_builder.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Exclude:
-    - 'app/builders/report_builder.rb'
-    - 'lib/reports/update_account_identity.rb'
-    - 'lib/reports/update_agent_identity.rb'
-    - 'lib/reports/update_identity.rb'
-    - 'spec/models/conversation_spec.rb'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/Validation:
-  Exclude:
-    - 'app/models/canned_response.rb'
-    - 'app/models/channel/facebook_page.rb'
-    - 'app/models/facebook_page.rb'
-    - 'app/models/telegram_bot.rb'
-    - 'app/models/user.rb'
-
-# Offense count: 15
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Exclude:
-    - 'app/builders/messages/message_builder.rb'
-    - 'app/controllers/api/v1/inbox_members_controller.rb'
-    - 'app/models/channel/facebook_page.rb'
-    - 'app/models/channel/web_widget.rb'
-    - 'app/presenters/conversations/event_data_presenter.rb'
-    - 'app/services/facebook/send_reply_service.rb'
-    - 'lib/integrations/facebook/delivery_status.rb'
-    - 'lib/integrations/facebook/message_creator.rb'
-    - 'lib/integrations/facebook/message_parser.rb'
-    - 'lib/integrations/widget/incoming_message_builder.rb'
-
-# Offense count: 4
-Style/CommentedKeyword:
-  Exclude:
-    - 'app/controllers/api/v1/callbacks_controller.rb'
-    - 'app/controllers/api/v1/conversations/assignments_controller.rb'
-    - 'app/controllers/api/v1/conversations/labels_controller.rb'
-    - 'app/controllers/api/v1/labels_controller.rb'
-
-# Offense count: 1
-# Configuration parameters: AllowIfModifier.
-Style/IfInsideElse:
-  Exclude:
-    - 'app/finders/conversation_finder.rb'
-
-# Offense count: 1
-Style/MixinUsage:
-  Exclude:
-    - 'app/bot/bot.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/controllers/api/v1/callbacks_controller.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'app/models/channel/facebook_page.rb'
diff --git a/Gemfile b/Gemfile
index 0f9a1d5ba..a21af8c01 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,6 +39,8 @@ gem 'rack-attack', '>= 6.7.0'
 gem 'down'
 # authentication type to fetch and send mail over oauth2.0
 gem 'gmail_xoauth'
+# Lock net-smtp to 0.3.4 to avoid issues with gmail_xoauth2
+gem 'net-smtp',  '~> 0.3.4'
 # Prevent CSV injection
 gem 'csv-safe'
 
@@ -74,7 +76,7 @@ gem 'devise_token_auth'
 gem 'jwt'
 gem 'pundit'
 # super admin
-gem 'administrate', '>= 0.19.0'
+gem 'administrate', '>= 0.20.1'
 gem 'administrate-field-active_storage', '>= 1.0.1'
 gem 'administrate-field-belongs_to_search', '>= 0.9.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 08c2696c6..74b281b43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,12 +105,12 @@ GEM
       activerecord (>= 6.0, < 7.1)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    administrate (0.19.0)
-      actionpack (>= 5.0)
-      actionview (>= 5.0)
-      activerecord (>= 5.0)
-      jquery-rails (>= 4.0)
-      kaminari (>= 1.0)
+    administrate (0.20.1)
+      actionpack (>= 6.0, < 8.0)
+      actionview (>= 6.0, < 8.0)
+      activerecord (>= 6.0, < 8.0)
+      jquery-rails (~> 4.6.0)
+      kaminari (~> 1.2.2)
       sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
     administrate-field-active_storage (1.0.1)
@@ -277,7 +277,7 @@ GEM
     gli (2.21.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    gmail_xoauth (0.4.2)
+    gmail_xoauth (0.4.3)
       oauth (>= 0.3.6)
     google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -461,7 +461,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.2)
     mock_redis (0.36.0)
       ruby2_keywords
     msgpack (1.7.0)
@@ -479,7 +479,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.3.4)
       net-protocol
     netrc (0.11.0)
     newrelic-sidekiq-metrics (1.6.2)
@@ -488,14 +488,14 @@ GEM
     newrelic_rpm (9.6.0)
       base64
     nio4r (2.7.0)
-    nokogiri (1.16.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.0-arm64-darwin)
+    nokogiri (1.16.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-darwin)
+    nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-linux)
+    nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
     numo-narray (0.9.2.1)
     oauth (1.1.0)
@@ -794,7 +794,7 @@ GEM
     valid_email2 (4.0.6)
       activemodel (>= 3.2)
       mail (~> 2.5)
-    version_gem (1.1.2)
+    version_gem (1.1.3)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.1)
@@ -840,7 +840,7 @@ DEPENDENCIES
   active_record_query_trace
   activerecord-import
   acts-as-taggable-on
-  administrate (>= 0.19.0)
+  administrate (>= 0.20.1)
   administrate-field-active_storage (>= 1.0.1)
   administrate-field-belongs_to_search (>= 0.9.0)
   annotate
@@ -903,6 +903,7 @@ DEPENDENCIES
   meta_request
   mock_redis
   neighbor
+  net-smtp (~> 0.3.4)
   newrelic-sidekiq-metrics (>= 1.6.2)
   newrelic_rpm
   omniauth (>= 2.1.2)
diff --git a/LICENSE b/LICENSE
index f36fc7c53..8f80f35be 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2021 Chatwoot Inc.
+Copyright (c) 2017-2024 Chatwoot Inc.
 
 Portions of this software are licensed as follows:
 
diff --git a/app/assets/stylesheets/administrate/custom_styles.scss b/app/assets/stylesheets/administrate/custom_styles.scss
index 859a35689..5e6d803d8 100644
--- a/app/assets/stylesheets/administrate/custom_styles.scss
+++ b/app/assets/stylesheets/administrate/custom_styles.scss
@@ -9,7 +9,7 @@
   padding: 4px 12px;
 
   .icon-container {
-    margin-right: 4px;
+    margin-right: 2px;
 
   }
 
diff --git a/app/builders/account_builder.rb b/app/builders/account_builder.rb
index 3e2ac9d6e..f179c6405 100644
--- a/app/builders/account_builder.rb
+++ b/app/builders/account_builder.rb
@@ -2,7 +2,7 @@
 
 class AccountBuilder
   include CustomExceptions::Account
-  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password, :super_admin, :locale]
+  pattr_initialize [:account_name, :email!, :confirmed, :user, :user_full_name, :user_password, :super_admin, :locale]
 
   def perform
     if @user.nil?
@@ -15,12 +15,22 @@ class AccountBuilder
     end
     [@user, @account]
   rescue StandardError => e
-    puts e.inspect
+    Rails.logger.debug e.inspect
     raise e
   end
 
   private
 
+  def user_full_name
+    # the empty string ensures that not-null constraint is not violated
+    @user_full_name || ''
+  end
+
+  def account_name
+    # the empty string ensures that not-null constraint is not violated
+    @account_name || ''
+  end
+
   def validate_email
     address = ValidEmail2::Address.new(@email)
     if address.valid? # && !address.disposable?
@@ -39,7 +49,7 @@ class AccountBuilder
   end
 
   def create_account
-    @account = Account.create!(name: @account_name, locale: I18n.locale)
+    @account = Account.create!(name: account_name, locale: I18n.locale)
     Current.account = @account
   end
 
@@ -64,7 +74,7 @@ class AccountBuilder
     @user = User.new(email: @email,
                      password: user_password,
                      password_confirmation: user_password,
-                     name: @user_full_name)
+                     name: user_full_name)
     @user.type = 'SuperAdmin' if @super_admin
     @user.confirm if @confirmed
     @user.save!
diff --git a/app/builders/agent_builder.rb b/app/builders/agent_builder.rb
new file mode 100644
index 000000000..6ea68821d
--- /dev/null
+++ b/app/builders/agent_builder.rb
@@ -0,0 +1,60 @@
+# The AgentBuilder class is responsible for creating a new agent.
+# It initializes with necessary attributes and provides a perform method
+# to create a user and account user in a transaction.
+class AgentBuilder
+  # Initializes an AgentBuilder with necessary attributes.
+  # @param email [String] the email of the user.
+  # @param name [String] the name of the user.
+  # @param role [String] the role of the user, defaults to 'agent' if not provided.
+  # @param inviter [User] the user who is inviting the agent (Current.user in most cases).
+  # @param availability [String] the availability status of the user, defaults to 'offline' if not provided.
+  # @param auto_offline [Boolean] the auto offline status of the user.
+  pattr_initialize [:email, { name: '' }, :inviter, :account, { role: :agent }, { availability: :offline }, { auto_offline: false }]
+
+  # Creates a user and account user in a transaction.
+  # @return [User] the created user.
+  def perform
+    ActiveRecord::Base.transaction do
+      @user = find_or_create_user
+      send_confirmation_if_required
+      create_account_user
+    end
+    @user
+  end
+
+  private
+
+  # Finds a user by email or creates a new one with a temporary password.
+  # @return [User] the found or created user.
+  def find_or_create_user
+    user = User.find_by(email: email)
+    return user if user
+
+    temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
+    User.create!(email: email, name: name, password: temp_password, password_confirmation: temp_password)
+  end
+
+  # Sends confirmation instructions if the user is persisted and not confirmed.
+  def send_confirmation_if_required
+    @user.send_confirmation_instructions if user_needs_confirmation?
+  end
+
+  # Checks if the user needs confirmation.
+  # @return [Boolean] true if the user is persisted and not confirmed, false otherwise.
+  def user_needs_confirmation?
+    @user.persisted? && !@user.confirmed?
+  end
+
+  # Creates an account user linking the user to the current account.
+  def create_account_user
+    AccountUser.create!({
+      account_id: account.id,
+      user_id: @user.id,
+      inviter_id: inviter.id
+    }.merge({
+      role: role,
+      availability: availability,
+      auto_offline: auto_offline
+    }.compact))
+  end
+end
diff --git a/app/controllers/api/v1/accounts/agents_controller.rb b/app/controllers/api/v1/accounts/agents_controller.rb
index 9a089f242..768d1a3ff 100644
--- a/app/controllers/api/v1/accounts/agents_controller.rb
+++ b/app/controllers/api/v1/accounts/agents_controller.rb
@@ -1,16 +1,26 @@
 class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
-  before_action :fetch_agent, except: [:create, :index]
+  before_action :fetch_agent, except: [:create, :index, :bulk_create]
   before_action :check_authorization
-  before_action :find_user, only: [:create]
   before_action :validate_limit, only: [:create]
-  before_action :create_user, only: [:create]
-  before_action :save_account_user, only: [:create]
+  before_action :validate_limit_for_bulk_create, only: [:bulk_create]
 
   def index
     @agents = agents
   end
 
-  def create; end
+  def create
+    builder = AgentBuilder.new(
+      email: new_agent_params['email'],
+      name: new_agent_params['name'],
+      role: new_agent_params['role'],
+      availability: new_agent_params['availability'],
+      auto_offline: new_agent_params['auto_offline'],
+      inviter: current_user,
+      account: Current.account
+    )
+
+    builder.perform
+  end
 
   def update
     @agent.update!(agent_params.slice(:name).compact)
@@ -23,6 +33,21 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
     head :ok
   end
 
+  def bulk_create
+    emails = params[:emails]
+
+    emails.each do |email|
+      builder = AgentBuilder.new(
+        email: email,
+        name: email.split('@').first,
+        inviter: current_user,
+        account: Current.account
+      )
+      builder.perform
+    end
+    head :ok
+  end
+
   private
 
   def check_authorization
@@ -33,47 +58,34 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
     @agent = agents.find(params[:id])
   end
 
-  def find_user
-    @user =  User.find_by(email: new_agent_params[:email])
-  end
-
-  # TODO: move this to a builder and combine the save account user method into a builder
-  # ensure the account user association is also created in a single transaction
-  def create_user
-    return @user.send_confirmation_instructions if @user
-
-    @user = User.create!(new_agent_params.slice(:email, :name, :password, :password_confirmation))
-  end
-
-  def save_account_user
-    AccountUser.create!({
-      account_id: Current.account.id,
-      user_id: @user.id,
-      inviter_id: current_user.id
-    }.merge({
-      role: new_agent_params[:role],
-      availability: new_agent_params[:availability],
-      auto_offline: new_agent_params[:auto_offline]
-    }.compact))
-  end
-
   def agent_params
     params.require(:agent).permit(:name, :email, :name, :role, :availability, :auto_offline)
   end
 
   def new_agent_params
-    # intial string ensures the password requirements are met
-    temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
     params.require(:agent).permit(:email, :name, :role, :availability, :auto_offline)
-          .merge!(password: temp_password, password_confirmation: temp_password, inviter: current_user)
   end
 
   def agents
     @agents ||= Current.account.users.order_by_full_name.includes(:account_users, { avatar_attachment: [:blob] })
   end
 
+  def validate_limit_for_bulk_create
+    limit_available = params[:emails].count <= available_agent_count
+
+    render_payment_required('Account limit exceeded. Please purchase more licenses') unless limit_available
+  end
+
   def validate_limit
-    render_payment_required('Account limit exceeded. Please purchase more licenses') if agents.count >= Current.account.usage_limits[:agents]
+    render_payment_required('Account limit exceeded. Please purchase more licenses') unless can_add_agent?
+  end
+
+  def available_agent_count
+    Current.account.usage_limits[:agents] - agents.count
+  end
+
+  def can_add_agent?
+    available_agent_count.positive?
   end
 
   def delete_user_record(agent)
diff --git a/app/controllers/api/v1/accounts/notifications_controller.rb b/app/controllers/api/v1/accounts/notifications_controller.rb
index a3d8df27e..0eeff5695 100644
--- a/app/controllers/api/v1/accounts/notifications_controller.rb
+++ b/app/controllers/api/v1/accounts/notifications_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
   RESULTS_PER_PAGE = 15
   include DateRangeHelper
 
-  before_action :fetch_notification, only: [:update, :destroy, :snooze]
+  before_action :fetch_notification, only: [:update, :destroy, :snooze, :unread]
   before_action :set_primary_actor, only: [:read_all]
   before_action :set_current_page, only: [:index]
 
@@ -29,11 +29,25 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
     render json: @notification
   end
 
+  def unread
+    @notification.update(read_at: nil)
+    render json: @notification
+  end
+
   def destroy
     @notification.destroy
     head :ok
   end
 
+  def destroy_all
+    if params[:type] == 'read'
+      ::Notification::DeleteNotificationJob.perform_later(Current.user, type: :read)
+    else
+      ::Notification::DeleteNotificationJob.perform_later(Current.user, type: :all)
+    end
+    head :ok
+  end
+
   def unread_count
     @unread_count = notification_finder.unread_count
     render json: @unread_count
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index ef0e0c777..0e5615bae 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -5,11 +5,13 @@ class Api::V1::AccountsController < Api::BaseController
   skip_before_action :authenticate_user!, :set_current_user, :handle_with_exception,
                      only: [:create], raise: false
   before_action :check_signup_enabled, only: [:create]
+  before_action :ensure_account_name, only: [:create]
   before_action :validate_captcha, only: [:create]
   before_action :fetch_account, except: [:create]
   before_action :check_authorization, except: [:create]
 
   rescue_from CustomExceptions::Account::InvalidEmail,
+              CustomExceptions::Account::InvalidParams,
               CustomExceptions::Account::UserExists,
               CustomExceptions::Account::UserErrors,
               with: :render_error_response
@@ -38,7 +40,7 @@ class Api::V1::AccountsController < Api::BaseController
 
   def cache_keys
     expires_in 10.seconds, public: false, stale_while_revalidate: 5.minutes
-    render json: { cache_keys: get_cache_keys }, status: :ok
+    render json: { cache_keys: cache_keys_for_account }, status: :ok
   end
 
   def update
@@ -53,7 +55,18 @@ class Api::V1::AccountsController < Api::BaseController
 
   private
 
-  def get_cache_keys
+  def ensure_account_name
+    # ensure that account_name and user_full_name is present
+    # this is becuase the account builder and the models validations are not triggered
+    # this change is to align the behaviour with the v2 accounts controller
+    # since these values are not required directly there
+    return if account_params[:account_name].present?
+    return if account_params[:user_full_name].present?
+
+    raise CustomExceptions::Account::InvalidParams.new({})
+  end
+
+  def cache_keys_for_account
     {
       label: fetch_value_for_key(params[:id], Label.name.underscore),
       inbox: fetch_value_for_key(params[:id], Inbox.name.underscore),
diff --git a/app/controllers/api/v1/profiles_controller.rb b/app/controllers/api/v1/profiles_controller.rb
index cbf801e82..a77652ff8 100644
--- a/app/controllers/api/v1/profiles_controller.rb
+++ b/app/controllers/api/v1/profiles_controller.rb
@@ -31,6 +31,11 @@ class Api::V1::ProfilesController < Api::BaseController
     head :ok
   end
 
+  def resend_confirmation
+    @user.send_confirmation_instructions unless @user.confirmed?
+    head :ok
+  end
+
   private
 
   def set_user
diff --git a/app/controllers/api/v2/accounts_controller.rb b/app/controllers/api/v2/accounts_controller.rb
new file mode 100644
index 000000000..e38863c07
--- /dev/null
+++ b/app/controllers/api/v2/accounts_controller.rb
@@ -0,0 +1,48 @@
+class Api::V2::AccountsController < Api::BaseController
+  include AuthHelper
+
+  skip_before_action :authenticate_user!, :set_current_user, :handle_with_exception,
+                     only: [:create], raise: false
+  before_action :check_signup_enabled, only: [:create]
+  before_action :validate_captcha, only: [:create]
+  before_action :fetch_account, except: [:create]
+  before_action :check_authorization, except: [:create]
+
+  rescue_from CustomExceptions::Account::InvalidEmail,
+              CustomExceptions::Account::UserExists,
+              CustomExceptions::Account::UserErrors,
+              with: :render_error_response
+
+  def create
+    @user, @account = AccountBuilder.new(
+      email: account_params[:email],
+      user_password: account_params[:password],
+      user: current_user
+    ).perform
+    if @user
+      send_auth_headers(@user)
+      render 'api/v1/accounts/create', format: :json, locals: { resource: @user }
+    else
+      render_error_response(CustomExceptions::Account::SignupFailed.new({}))
+    end
+  end
+
+  private
+
+  def fetch_account
+    @account = current_user.accounts.find(params[:id])
+    @current_account_user = @account.account_users.find_by(user_id: current_user.id)
+  end
+
+  def account_params
+    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :auto_resolve_duration, :user_full_name)
+  end
+
+  def check_signup_enabled
+    raise ActionController::RoutingError, 'Not Found' if GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false') == 'false'
+  end
+
+  def validate_captcha
+    raise ActionController::InvalidAuthenticityToken, 'Invalid Captcha' unless ChatwootCaptcha.new(params[:h_captcha_client_response]).valid?
+  end
+end
diff --git a/app/controllers/super_admin/app_configs_controller.rb b/app/controllers/super_admin/app_configs_controller.rb
index 97caad42c..a31d01675 100644
--- a/app/controllers/super_admin/app_configs_controller.rb
+++ b/app/controllers/super_admin/app_configs_controller.rb
@@ -22,19 +22,24 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
       i.value = value
       i.save!
     end
-    # rubocop:disable Rails/I18nLocaleTexts
-    redirect_to super_admin_settings_path, notice: 'App Configs updated successfully'
-    # rubocop:enable Rails/I18nLocaleTexts
+    redirect_to super_admin_settings_path, notice: "App Configs - #{@config.titleize} updated successfully"
   end
 
   private
 
   def set_config
-    @config = params[:config]
+    @config = params[:config] || 'general'
   end
 
   def allowed_configs
-    @allowed_configs = %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET]
+    @allowed_configs = case @config
+                       when 'facebook'
+                         %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT]
+                       when 'email'
+                         ['MAILER_INBOUND_EMAIL_DOMAIN']
+                       else
+                         %w[ENABLE_ACCOUNT_SIGNUP]
+                       end
   end
 end
 
diff --git a/app/finders/notification_finder.rb b/app/finders/notification_finder.rb
index 7559d6ef9..7e5789372 100644
--- a/app/finders/notification_finder.rb
+++ b/app/finders/notification_finder.rb
@@ -26,6 +26,7 @@ class NotificationFinder
 
   def set_up
     find_all_notifications
+    filter_by_read_status
     filter_by_status
   end
 
@@ -37,11 +38,15 @@ class NotificationFinder
     @notifications = @notifications.where('snoozed_until > ?', DateTime.now.utc) if params[:status] == 'snoozed'
   end
 
+  def filter_by_read_status
+    @notifications = @notifications.where.not(read_at: nil) if params[:type] == 'read'
+  end
+
   def current_page
     params[:page] || 1
   end
 
   def notifications
-    @notifications.page(current_page).per(RESULTS_PER_PAGE).order(last_activity_at: :desc)
+    @notifications.page(current_page).per(RESULTS_PER_PAGE).order(last_activity_at: params[:sort_order] || :desc)
   end
 end
diff --git a/app/helpers/super_admin/account_features_helper.rb b/app/helpers/super_admin/account_features_helper.rb
new file mode 100644
index 000000000..759aec134
--- /dev/null
+++ b/app/helpers/super_admin/account_features_helper.rb
@@ -0,0 +1,9 @@
+module SuperAdmin::AccountFeaturesHelper
+  def self.account_features
+    YAML.safe_load(Rails.root.join('config/features.yml').read).freeze
+  end
+
+  def self.account_premium_features
+    account_features.filter { |feature| feature['premium'] }.pluck('name')
+  end
+end
diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index 6fd470fcf..49fe325f6 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -2,12 +2,13 @@
   <div
     v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
     id="app"
-    class="app-wrapper h-full flex-grow-0 min-h-0 w-full"
+    class="flex-grow-0 w-full h-full min-h-0 app-wrapper"
     :class="{ 'app-rtl--wrapper': isRTLView }"
     :dir="isRTLView ? 'rtl' : 'ltr'"
   >
     <update-banner :latest-chatwoot-version="latestChatwootVersion" />
     <template v-if="currentAccountId">
+      <pending-email-verification-banner />
       <payment-pending-banner />
       <upgrade-banner />
     </template>
@@ -32,6 +33,7 @@ import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
 import UpgradeBanner from './components/app/UpgradeBanner.vue';
 import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
+import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
 import vueActionCable from './helper/actionCable';
 import WootSnackbarBox from './components/SnackbarContainer.vue';
 import rtlMixin from 'shared/mixins/rtlMixin';
@@ -52,6 +54,7 @@ export default {
     PaymentPendingBanner,
     WootSnackbarBox,
     UpgradeBanner,
+    PendingEmailVerificationBanner,
   },
 
   mixins: [rtlMixin],
diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index 48e7d7085..dde817866 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -29,11 +29,12 @@ export default {
     return fetchPromise;
   },
   hasAuthCookie() {
-    return !!Cookies.getJSON('cw_d_session_info');
+    return !!Cookies.get('cw_d_session_info');
   },
   getAuthData() {
     if (this.hasAuthCookie()) {
-      return Cookies.getJSON('cw_d_session_info');
+      const savedAuthInfo = Cookies.get('cw_d_session_info');
+      return JSON.parse(savedAuthInfo || '{}');
     }
     return false;
   },
@@ -97,4 +98,8 @@ export default {
       },
     });
   },
+  resendConfirmation() {
+    const urlData = endPoints('resendConfirmation');
+    return axios.post(urlData.url);
+  },
 };
diff --git a/app/javascript/dashboard/api/endPoints.js b/app/javascript/dashboard/api/endPoints.js
index 678386d50..31337b7fc 100644
--- a/app/javascript/dashboard/api/endPoints.js
+++ b/app/javascript/dashboard/api/endPoints.js
@@ -47,6 +47,10 @@ const endPoints = {
   setActiveAccount: {
     url: '/api/v1/profile/set_active_account',
   },
+
+  resendConfirmation: {
+    url: '/api/v1/profile/resend_confirmation',
+  },
 };
 
 export default page => {
diff --git a/app/javascript/dashboard/api/notifications.js b/app/javascript/dashboard/api/notifications.js
index e13bc78a6..65fc937b7 100644
--- a/app/javascript/dashboard/api/notifications.js
+++ b/app/javascript/dashboard/api/notifications.js
@@ -6,8 +6,15 @@ class NotificationsAPI extends ApiClient {
     super('notifications', { accountScoped: true });
   }
 
-  get(page) {
-    return axios.get(`${this.url}?page=${page}`);
+  get({ page, status, type, sortOrder }) {
+    return axios.get(this.url, {
+      params: {
+        page,
+        status,
+        type,
+        sort_order: sortOrder,
+      },
+    });
   }
 
   getNotifications(contactId) {
@@ -25,9 +32,29 @@ class NotificationsAPI extends ApiClient {
     });
   }
 
+  unRead(id) {
+    return axios.post(`${this.url}/${id}/unread`);
+  }
+
   readAll() {
     return axios.post(`${this.url}/read_all`);
   }
+
+  delete(id) {
+    return axios.delete(`${this.url}/${id}`);
+  }
+
+  deleteAll({ type = 'all' }) {
+    return axios.post(`${this.url}/destroy_all`, {
+      type,
+    });
+  }
+
+  snooze({ id, snoozedUntil = null }) {
+    return axios.post(`${this.url}/${id}/snooze`, {
+      snoozed_until: snoozedUntil,
+    });
+  }
 }
 
 export default new NotificationsAPI();
diff --git a/app/javascript/dashboard/api/specs/notifications.spec.js b/app/javascript/dashboard/api/specs/notifications.spec.js
index 5bdf88d7f..bc06eaa2b 100644
--- a/app/javascript/dashboard/api/specs/notifications.spec.js
+++ b/app/javascript/dashboard/api/specs/notifications.spec.js
@@ -28,10 +28,20 @@ describe('#NotificationAPI', () => {
     });
 
     it('#get', () => {
-      notificationsAPI.get(1);
-      expect(axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/notifications?page=1'
-      );
+      notificationsAPI.get({
+        page: 1,
+        status: 'read',
+        type: 'Conversation',
+        sortOrder: 'desc',
+      });
+      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/notifications', {
+        params: {
+          page: 1,
+          status: 'read',
+          type: 'Conversation',
+          sort_order: 'desc',
+        },
+      });
     });
 
     it('#getNotifications', () => {
@@ -65,5 +75,30 @@ describe('#NotificationAPI', () => {
         '/api/v1/notifications/read_all'
       );
     });
+
+    it('#snooze', () => {
+      notificationsAPI.snooze({ id: 1, snoozedUntil: 12332211 });
+      expect(axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/notifications/1/snooze',
+        {
+          snoozed_until: 12332211,
+        }
+      );
+    });
+
+    it('#delete', () => {
+      notificationsAPI.delete(1);
+      expect(axiosMock.delete).toHaveBeenCalledWith('/api/v1/notifications/1');
+    });
+
+    it('#deleteAll', () => {
+      notificationsAPI.deleteAll({ type: 'all' });
+      expect(axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/notifications/destroy_all',
+        {
+          type: 'all',
+        }
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 31fe6110d..7fcc58127 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="conversations-list-wrap flex-basis-clamp flex-shrink-0 flex-basis-custom overflow-hidden flex flex-col border-r rtl:border-r-0 rtl:border-l border-slate-50 dark:border-slate-800/50"
+    class="conversations-list-wrap flex-basis-clamp flex-shrink-0 overflow-hidden flex flex-col border-r rtl:border-r-0 rtl:border-l border-slate-50 dark:border-slate-800/50"
     :class="{
       hide: !showConversationList,
       'list--full-width': isOnExpandedLayout,
diff --git a/app/javascript/dashboard/components/app/PendingEmailVerificationBanner.vue b/app/javascript/dashboard/components/app/PendingEmailVerificationBanner.vue
new file mode 100644
index 000000000..c9dc51754
--- /dev/null
+++ b/app/javascript/dashboard/components/app/PendingEmailVerificationBanner.vue
@@ -0,0 +1,43 @@
+<template>
+  <banner
+    v-if="shouldShowBanner"
+    color-scheme="alert"
+    :banner-message="bannerMessage"
+    :action-button-label="actionButtonMessage"
+    action-button-icon="mail"
+    has-action-button
+    @click="resendVerificationEmail"
+  />
+</template>
+
+<script>
+import Banner from 'dashboard/components/ui/Banner.vue';
+import { mapGetters } from 'vuex';
+import accountMixin from 'dashboard/mixins/account';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: { Banner },
+  mixins: [accountMixin, alertMixin],
+  computed: {
+    ...mapGetters({
+      currentUser: 'getCurrentUser',
+    }),
+    bannerMessage() {
+      return this.$t('APP_GLOBAL.EMAIL_VERIFICATION_PENDING');
+    },
+    actionButtonMessage() {
+      return this.$t('APP_GLOBAL.RESEND_VERIFICATION_MAIL');
+    },
+    shouldShowBanner() {
+      return !this.currentUser.confirmed;
+    },
+  },
+  methods: {
+    resendVerificationEmail() {
+      this.$store.dispatch('resendConfirmation');
+      this.showAlert(this.$t('APP_GLOBAL.EMAIL_VERIFICATION_SENT'));
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/components/ui/Banner.vue b/app/javascript/dashboard/components/ui/Banner.vue
index 5d680fe48..3473111ae 100644
--- a/app/javascript/dashboard/components/ui/Banner.vue
+++ b/app/javascript/dashboard/components/ui/Banner.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="banner flex items-center h-12 gap-4 text-white dark:text-white text-xs py-3 px-4 justify-center"
+    class="flex items-center justify-center h-12 gap-4 px-4 py-3 text-xs text-white banner dark:text-white"
     :class="bannerClasses"
   >
     <span class="banner-message">
@@ -18,7 +18,7 @@
       <woot-button
         v-if="hasActionButton"
         size="tiny"
-        icon="arrow-right"
+        :icon="actionButtonIcon"
         :variant="actionButtonVariant"
         color-scheme="primary"
         class-names="banner-action__button"
@@ -67,6 +67,10 @@ export default {
       type: String,
       default: '',
     },
+    actionButtonIcon: {
+      type: String,
+      default: 'arrow-right',
+    },
     colorScheme: {
       type: String,
       default: '',
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 8ba65dadc..dad5c9c0b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -6,6 +6,7 @@
     <conversation-header
       v-if="currentChat.id"
       :chat="currentChat"
+      :is-inbox-view="isInboxView"
       :is-contact-panel-open="isContactPanelOpen"
       :show-back-button="isOnExpandedLayout"
       @contact-panel-toggle="onToggleContactPanel"
@@ -30,6 +31,7 @@
       <messages-view
         v-if="currentChat.id"
         :inbox-id="inboxId"
+        :is-inbox-view="isInboxView"
         :is-contact-panel-open="isContactPanelOpen"
         @contact-panel-toggle="onToggleContactPanel"
       />
@@ -80,6 +82,10 @@ export default {
       default: '',
       required: false,
     },
+    isInboxView: {
+      type: Boolean,
+      default: false,
+    },
     isContactPanelOpen: {
       type: Boolean,
       default: true,
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 742b6003a..42172eb23 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -66,7 +66,7 @@
         </div>
       </div>
       <div
-        class="header-actions-wrap items-center flex flex-row flex-grow justify-end mt-3 lg:mt-0"
+        class="header-actions-wrap items-center flex flex-row flex-grow justify-end mt-3 lg:mt-0 rtl:relative rtl:left-6"
         :class="{ 'justify-end': isContactPanelOpen }"
       >
         <more-actions :conversation-id="currentChat.id" />
@@ -86,7 +86,8 @@ import MoreActions from './MoreActions.vue';
 import Thumbnail from '../Thumbnail.vue';
 import wootConstants from 'dashboard/constants/globals';
 import { conversationListPageURL } from 'dashboard/helper/URLHelper';
-import { conversationReopenTime } from 'dashboard/helper/snoozeHelpers';
+import { snoozedReopenTime } from 'dashboard/helper/snoozeHelpers';
+import { frontendURL } from 'dashboard/helper/URLHelper';
 
 export default {
   components: {
@@ -109,6 +110,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isInboxView: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     ...mapGetters({
@@ -123,6 +128,9 @@ export default {
         params: { accountId, inbox_id: inboxId, label, teamId },
         name,
       } = this.$route;
+      if (this.isInboxView) {
+        return frontendURL(`accounts/${accountId}/inbox`);
+      }
       return conversationListPageURL({
         accountId,
         inboxId,
@@ -150,7 +158,7 @@ export default {
       if (snoozedUntil) {
         return `${this.$t(
           'CONVERSATION.HEADER.SNOOZED_UNTIL'
-        )} ${conversationReopenTime(snoozedUntil)}`;
+        )} ${snoozedReopenTime(snoozedUntil)}`;
       }
       return this.$t('CONVERSATION.HEADER.SNOOZED_UNTIL_NEXT_REPLY');
     },
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 8eb03137b..e6890535b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -1,7 +1,10 @@
 <template>
   <li v-if="shouldRenderMessage" :id="`message${data.id}`" :class="alignBubble">
     <div :class="wrapClass">
-      <div v-if="isFailed && !hasOneDayPassed" class="message-failed--alert">
+      <div
+        v-if="isFailed && !hasOneDayPassed && !isAnEmailInbox"
+        class="message-failed--alert"
+      >
         <woot-button
           v-tooltip.top-end="$t('CONVERSATION.TRY_AGAIN')"
           size="tiny"
@@ -203,6 +206,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isAnEmailInbox: {
+      type: Boolean,
+      default: false,
+    },
     inboxSupportsReplyTo: {
       type: Object,
       default: () => ({}),
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 62eb6d739..747551e18 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -12,7 +12,10 @@
         variant="smooth"
         size="tiny"
         color-scheme="secondary"
-        class="rounded-bl-calc rtl:rotate-180 rounded-tl-calc fixed top-[9.5rem] md:top-[6.25rem] z-10 bg-white dark:bg-slate-700 border-slate-50 dark:border-slate-600 border-solid border border-r-0 box-border"
+        class="rounded-bl-calc rtl:rotate-180 rounded-tl-calc fixed z-10 bg-white dark:bg-slate-700 border-slate-50 dark:border-slate-600 border-solid border border-r-0 box-border"
+        :class="
+          isInboxView ? 'top-52 md:top-40' : 'top-[9.5rem] md:top-[6.25rem]'
+        "
         :icon="isRightOrLeftIcon"
         @click="onToggleContactPanel"
       />
@@ -33,6 +36,7 @@
         :is-a-whatsapp-channel="isAWhatsAppChannel"
         :is-web-widget-inbox="isAWebWidgetInbox"
         :is-a-facebook-inbox="isAFacebookInbox"
+        :is-an-email-inbox="isAnEmailChannel"
         :is-instagram="isInstagramDM"
         :inbox-supports-reply-to="inboxSupportsReplyTo"
         :in-reply-to="getInReplyToMessage(message)"
@@ -141,6 +145,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isInboxView: {
+      type: Boolean,
+      default: false,
+    },
   },
 
   data() {
diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js
index 303f828cd..b8014ce6c 100644
--- a/app/javascript/dashboard/constants/globals.js
+++ b/app/javascript/dashboard/constants/globals.js
@@ -46,5 +46,18 @@ export default {
   },
   EXAMPLE_URL: 'https://example.com',
   EXAMPLE_WEBHOOK_URL: 'https://example/api/webhook',
+  INBOX_SORT_BY: {
+    NEWEST: 'desc',
+    OLDEST: 'asc',
+  },
+  INBOX_DISPLAY_BY: {
+    SNOOZED: 'snoozed',
+    READ: 'read',
+  },
+  INBOX_FILTER_TYPE: {
+    STATUS: 'status',
+    TYPE: 'type',
+    SORT_ORDER: 'sort_order',
+  },
 };
 export const DEFAULT_REDIRECT_URL = '/app/';
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 4280e0f10..9d06f15c6 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -17,4 +17,5 @@ export const FEATURE_FLAGS = {
   VOICE_RECORDER: 'voice_recorder',
   AUDIT_LOGS: 'audit_logs',
   INSERT_ARTICLE_IN_REPLY: 'insert_article_in_reply',
+  INBOX_VIEW: 'inbox_view',
 };
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 60f880d0e..aba812732 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -103,8 +103,21 @@ export const GENERAL_EVENTS = Object.freeze({
   COMMAND_BAR: 'Used commandbar',
 });
 
+
+export const INBOX_EVENTS = Object.freeze({
+  OPEN_CONVERSATION_VIA_INBOX: 'Opened conversation via inbox',
+  MARK_NOTIFICATION_AS_READ: 'Marked notification as read',
+  MARK_ALL_NOTIFICATIONS_AS_READ: 'Marked all notifications as read',
+  MARK_NOTIFICATION_AS_UNREAD: 'Marked notification as unread',
+  DELETE_NOTIFICATION: 'Deleted notification',
+  DELETE_ALL_NOTIFICATIONS: 'Deleted all notifications',
+
+});
+
 export const SLA_EVENTS = Object.freeze({
   CREATE: 'Created an SLA',
   UPDATE: 'Updated an SLA',
   DELETED: 'Deleted an SLA',
-});
+  
+  });
+
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index 2b138a3fb..5f4570474 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -24,6 +24,7 @@ class ActionCableConnector extends BaseActionCableConnector {
       'conversation.mentioned': this.onConversationMentioned,
       'notification.created': this.onNotificationCreated,
       'notification.deleted': this.onNotificationDeleted,
+      'notification.updated': this.onNotificationUpdated,
       'first.reply.created': this.onFirstReplyCreated,
       'conversation.read': this.onConversationRead,
       'conversation.updated': this.onConversationUpdated,
@@ -200,6 +201,10 @@ class ActionCableConnector extends BaseActionCableConnector {
     this.app.$store.dispatch('notifications/deleteNotification', data);
   };
 
+  onNotificationUpdated = data => {
+    this.app.$store.dispatch('notifications/updateNotification', data);
+  };
+
   // eslint-disable-next-line class-methods-use-this
   onFirstReplyCreated = () => {
     bus.$emit('fetch_overview_reports');
diff --git a/app/javascript/dashboard/helper/routeHelpers.js b/app/javascript/dashboard/helper/routeHelpers.js
index f12cbe0b8..8ecc71164 100644
--- a/app/javascript/dashboard/helper/routeHelpers.js
+++ b/app/javascript/dashboard/helper/routeHelpers.js
@@ -86,3 +86,6 @@ export const getConversationDashboardRoute = routeName => {
       return null;
   }
 };
+
+export const isAInboxViewRoute = routeName =>
+  ['inbox_view_conversation'].includes(routeName);
diff --git a/app/javascript/dashboard/helper/snoozeHelpers.js b/app/javascript/dashboard/helper/snoozeHelpers.js
index 60954364b..b758a69f4 100644
--- a/app/javascript/dashboard/helper/snoozeHelpers.js
+++ b/app/javascript/dashboard/helper/snoozeHelpers.js
@@ -55,7 +55,7 @@ export const findSnoozeTime = (snoozeType, currentDate = new Date()) => {
 
   return parsedDate ? getUnixTime(parsedDate) : null;
 };
-export const conversationReopenTime = snoozedUntil => {
+export const snoozedReopenTime = snoozedUntil => {
   if (!snoozedUntil) {
     return null;
   }
diff --git a/app/javascript/dashboard/helper/specs/routeHelpers.spec.js b/app/javascript/dashboard/helper/specs/routeHelpers.spec.js
index 3da657dd0..d473585a1 100644
--- a/app/javascript/dashboard/helper/specs/routeHelpers.spec.js
+++ b/app/javascript/dashboard/helper/specs/routeHelpers.spec.js
@@ -5,6 +5,7 @@ import {
   isAConversationRoute,
   routeIsAccessibleFor,
   validateLoggedInRoutes,
+  isAInboxViewRoute,
 } from '../routeHelpers';
 
 describe('#getCurrentAccount', () => {
@@ -134,3 +135,10 @@ describe('getConversationDashboardRoute', () => {
     expect(getConversationDashboardRoute('non_existent_route')).toBeNull();
   });
 });
+
+describe('isAInboxViewRoute', () => {
+  it('returns true if inbox view route name is provided', () => {
+    expect(isAInboxViewRoute('inbox_view_conversation')).toBe(true);
+    expect(isAInboxViewRoute('inbox_conversation')).toBe(false);
+  });
+});
diff --git a/app/javascript/dashboard/helper/specs/snoozeHelpers.spec.js b/app/javascript/dashboard/helper/specs/snoozeHelpers.spec.js
index 31c07ae65..27a4d1b63 100644
--- a/app/javascript/dashboard/helper/specs/snoozeHelpers.spec.js
+++ b/app/javascript/dashboard/helper/specs/snoozeHelpers.spec.js
@@ -1,6 +1,6 @@
 import {
   findSnoozeTime,
-  conversationReopenTime,
+  snoozedReopenTime,
   findStartOfNextWeek,
   findStartOfNextMonth,
   findNextDay,
@@ -88,13 +88,13 @@ describe('#Snooze Helpers', () => {
     });
   });
 
-  describe('conversationReopenTime', () => {
+  describe('snoozedReopenTime', () => {
     it('should return nil if snoozedUntil is nil', () => {
-      expect(conversationReopenTime(null)).toEqual(null);
+      expect(snoozedReopenTime(null)).toEqual(null);
     });
 
     it('should return formatted date if snoozedUntil is not nil', () => {
-      expect(conversationReopenTime('2023-06-07T09:00:00.000Z')).toEqual(
+      expect(snoozedReopenTime('2023-06-07T09:00:00.000Z')).toEqual(
         '7 Jun, 9.00am'
       );
     });
diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/en/inbox.json b/app/javascript/dashboard/i18n/locale/en/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "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"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "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"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 68e2b90a6..75cdb5836 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -30,6 +30,7 @@ import signup from './signup.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 import sla from './sla.json';
+import inbox from './inbox.json';
 
 export default {
   ...advancedFilters,
@@ -64,4 +65,5 @@ export default {
   ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
+  ...inbox,
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 749fd4040..d1d16a607 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -156,6 +156,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "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.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -193,6 +196,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
diff --git a/app/javascript/dashboard/mixins/specs/time.spec.js b/app/javascript/dashboard/mixins/specs/time.spec.js
index af120eb50..39b160e75 100644
--- a/app/javascript/dashboard/mixins/specs/time.spec.js
+++ b/app/javascript/dashboard/mixins/specs/time.spec.js
@@ -52,19 +52,77 @@ describe('#dateFormat', () => {
 });
 
 describe('#shortTimestamp', () => {
-  it('returns correct value', () => {
+  // Test cases when withAgo is false or not provided
+  it('returns correct value without ago', () => {
     expect(TimeMixin.methods.shortTimestamp('less than a minute ago')).toEqual(
       'now'
     );
-    expect(TimeMixin.methods.shortTimestamp(' minute ago')).toEqual('m');
-    expect(TimeMixin.methods.shortTimestamp(' minutes ago')).toEqual('m');
-    expect(TimeMixin.methods.shortTimestamp(' hour ago')).toEqual('h');
-    expect(TimeMixin.methods.shortTimestamp(' hours ago')).toEqual('h');
-    expect(TimeMixin.methods.shortTimestamp(' day ago')).toEqual('d');
-    expect(TimeMixin.methods.shortTimestamp(' days ago')).toEqual('d');
-    expect(TimeMixin.methods.shortTimestamp(' month ago')).toEqual('mo');
-    expect(TimeMixin.methods.shortTimestamp(' months ago')).toEqual('mo');
-    expect(TimeMixin.methods.shortTimestamp(' year ago')).toEqual('y');
-    expect(TimeMixin.methods.shortTimestamp(' years ago')).toEqual('y');
+    expect(TimeMixin.methods.shortTimestamp('1 minute ago')).toEqual('1m');
+    expect(TimeMixin.methods.shortTimestamp('12 minutes ago')).toEqual('12m');
+    expect(TimeMixin.methods.shortTimestamp('a minute ago')).toEqual('1m');
+    expect(TimeMixin.methods.shortTimestamp('an hour ago')).toEqual('1h');
+    expect(TimeMixin.methods.shortTimestamp('1 hour ago')).toEqual('1h');
+    expect(TimeMixin.methods.shortTimestamp('2 hours ago')).toEqual('2h');
+    expect(TimeMixin.methods.shortTimestamp('1 day ago')).toEqual('1d');
+    expect(TimeMixin.methods.shortTimestamp('a day ago')).toEqual('1d');
+    expect(TimeMixin.methods.shortTimestamp('3 days ago')).toEqual('3d');
+    expect(TimeMixin.methods.shortTimestamp('a month ago')).toEqual('1mo');
+    expect(TimeMixin.methods.shortTimestamp('1 month ago')).toEqual('1mo');
+    expect(TimeMixin.methods.shortTimestamp('2 months ago')).toEqual('2mo');
+    expect(TimeMixin.methods.shortTimestamp('a year ago')).toEqual('1y');
+    expect(TimeMixin.methods.shortTimestamp('1 year ago')).toEqual('1y');
+    expect(TimeMixin.methods.shortTimestamp('4 years ago')).toEqual('4y');
+  });
+
+  // Test cases when withAgo is true
+  it('returns correct value with ago', () => {
+    expect(
+      TimeMixin.methods.shortTimestamp('less than a minute ago', true)
+    ).toEqual('now');
+    expect(TimeMixin.methods.shortTimestamp('1 minute ago', true)).toEqual(
+      '1m ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('12 minutes ago', true)).toEqual(
+      '12m ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('a minute ago', true)).toEqual(
+      '1m ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('an hour ago', true)).toEqual(
+      '1h ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('1 hour ago', true)).toEqual(
+      '1h ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('2 hours ago', true)).toEqual(
+      '2h ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('1 day ago', true)).toEqual(
+      '1d ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('a day ago', true)).toEqual(
+      '1d ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('3 days ago', true)).toEqual(
+      '3d ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('a month ago', true)).toEqual(
+      '1mo ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('1 month ago', true)).toEqual(
+      '1mo ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('2 months ago', true)).toEqual(
+      '2mo ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('a year ago', true)).toEqual(
+      '1y ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('1 year ago', true)).toEqual(
+      '1y ago'
+    );
+    expect(TimeMixin.methods.shortTimestamp('4 years ago', true)).toEqual(
+      '4y ago'
+    );
   });
 });
diff --git a/app/javascript/dashboard/mixins/time.js b/app/javascript/dashboard/mixins/time.js
index 6b63f97f9..35b4b5a37 100644
--- a/app/javascript/dashboard/mixins/time.js
+++ b/app/javascript/dashboard/mixins/time.js
@@ -28,25 +28,36 @@ export default {
       const unixTime = fromUnixTime(time);
       return format(unixTime, dateFormat);
     },
-    shortTimestamp(time) {
+    shortTimestamp(time, withAgo = false) {
+      // This function takes a time string and converts it to a short time string
+      // with the following format: 1m, 1h, 1d, 1mo, 1y
+      // The function also takes an optional boolean parameter withAgo
+      // which will add the word "ago" to the end of the time string
+      const suffix = withAgo ? ' ago' : '';
+      const timeMappings = {
+        'less than a minute ago': 'now',
+        'a minute ago': `1m${suffix}`,
+        'an hour ago': `1h${suffix}`,
+        'a day ago': `1d${suffix}`,
+        'a month ago': `1mo${suffix}`,
+        'a year ago': `1y${suffix}`,
+      };
+      // Check if the time string is one of the specific cases
+      if (timeMappings[time]) {
+        return timeMappings[time];
+      }
       const convertToShortTime = time
         .replace(/about|over|almost|/g, '')
-        .replace('less than a minute ago', 'now')
-        .replace(' minute ago', 'm')
-        .replace(' minutes ago', 'm')
-        .replace('a minute ago', 'm')
-        .replace('an hour ago', 'h')
-        .replace(' hour ago', 'h')
-        .replace(' hours ago', 'h')
-        .replace(' day ago', 'd')
-        .replace('a day ago', 'd')
-        .replace(' days ago', 'd')
-        .replace('a month ago', 'mo')
-        .replace(' months ago', 'mo')
-        .replace(' month ago', 'mo')
-        .replace('a year ago', 'y')
-        .replace(' year ago', 'y')
-        .replace(' years ago', 'y');
+        .replace(' minute ago', `m${suffix}`)
+        .replace(' minutes ago', `m${suffix}`)
+        .replace(' hour ago', `h${suffix}`)
+        .replace(' hours ago', `h${suffix}`)
+        .replace(' day ago', `d${suffix}`)
+        .replace(' days ago', `d${suffix}`)
+        .replace(' month ago', `mo${suffix}`)
+        .replace(' months ago', `mo${suffix}`)
+        .replace(' year ago', `y${suffix}`)
+        .replace(' years ago', `y${suffix}`);
       return convertToShortTime;
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js b/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
index d3f10b342..b202c5640 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
+++ b/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
@@ -71,3 +71,5 @@ export const ICON_APPEARANCE = `<svg role="img" class="ninja-icon ninja-icon--fl
 export const ICON_LIGHT_MODE = `<svg role="img" class="ninja-icon ninja-icon--fluent" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path fill="currentColor" d="M12 2a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0v-1.5A.75.75 0 0 1 12 2Zm5 10a5 5 0 1 1-10 0a5 5 0 0 1 10 0Zm4.25.75a.75.75 0 0 0 0-1.5h-1.5a.75.75 0 0 0 0 1.5h1.5ZM12 19a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0v-1.5A.75.75 0 0 1 12 19Zm-7.75-6.25a.75.75 0 0 0 0-1.5h-1.5a.75.75 0 0 0 0 1.5h1.5Zm-.03-8.53a.75.75 0 0 1 1.06 0l1.5 1.5a.75.75 0 0 1-1.06 1.06l-1.5-1.5a.75.75 0 0 1 0-1.06Zm1.06 15.56a.75.75 0 1 1-1.06-1.06l1.5-1.5a.75.75 0 1 1 1.06 1.06l-1.5 1.5Zm14.5-15.56a.75.75 0 0 0-1.06 0l-1.5 1.5a.75.75 0 0 0 1.06 1.06l1.5-1.5a.75.75 0 0 0 0-1.06Zm-1.06 15.56a.75.75 0 1 0 1.06-1.06l-1.5-1.5a.75.75 0 1 0-1.06 1.06l1.5 1.5Z"/></svg>`;
 export const ICON_DARK_MODE = `<svg role="img" class="ninja-icon ninja-icon--fluent" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path fill="currentColor" d="M20.026 17.001c-2.762 4.784-8.879 6.423-13.663 3.661A9.965 9.965 0 0 1 3.13 17.68a.75.75 0 0 1 .365-1.132c3.767-1.348 5.785-2.91 6.956-5.146c1.232-2.353 1.551-4.93.689-8.463a.75.75 0 0 1 .769-.927a9.961 9.961 0 0 1 4.457 1.327c4.784 2.762 6.423 8.879 3.66 13.662Zm-8.248-4.903c-1.25 2.389-3.31 4.1-6.817 5.499a8.49 8.49 0 0 0 2.152 1.766a8.502 8.502 0 0 0 8.502-14.725a8.484 8.484 0 0 0-2.792-1.015c.647 3.384.23 6.043-1.045 8.475Z"/></svg>`;
 export const ICON_SYSTEM_MODE = `<svg role="img" class="ninja-icon ninja-icon--fluent" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path fill="currentColor" d="M4.25 3A2.25 2.25 0 0 0 2 5.25v10.5A2.25 2.25 0 0 0 4.25 18H9.5v1.25c0 .69-.56 1.25-1.25 1.25h-.5a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-.5c-.69 0-1.25-.56-1.25-1.25V18h5.25A2.25 2.25 0 0 0 22 15.75V5.25A2.25 2.25 0 0 0 19.75 3H4.25ZM13 18v1.25c0 .45.108.875.3 1.25h-2.6c.192-.375.3-.8.3-1.25V18h2ZM3.5 5.25a.75.75 0 0 1 .75-.75h15.5a.75.75 0 0 1 .75.75V13h-17V5.25Zm0 9.25h17v1.25a.75.75 0 0 1-.75.75H4.25a.75.75 0 0 1-.75-.75V14.5Z"/></svg>`;
+
+export const ICON_SNOOZE_NOTIFICATION = `<svg role="img" class="ninja-icon ninja-icon--fluent" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path fill="currentColor" d="M12 3.5c-3.104 0-6 2.432-6 6.25v4.153L4.682 17h14.67l-1.354-3.093V11.75a.75.75 0 0 1 1.5 0v1.843l1.381 3.156a1.25 1.25 0 0 1-1.145 1.751H15a3.002 3.002 0 0 1-6.003 0H4.305a1.25 1.25 0 0 1-1.15-1.739l1.344-3.164V9.75C4.5 5.068 8.103 2 12 2c.86 0 1.705.15 2.5.432a.75.75 0 0 1-.502 1.413A5.964 5.964 0 0 0 12 3.5ZM12 20c.828 0 1.5-.671 1.501-1.5h-3.003c0 .829.673 1.5 1.502 1.5Zm3.25-13h-2.5l-.101.007A.75.75 0 0 0 12.75 8.5h1.043l-1.653 2.314l-.055.09A.75.75 0 0 0 12.75 12h2.5l.102-.007a.75.75 0 0 0-.102-1.493h-1.042l1.653-2.314l.055-.09A.75.75 0 0 0 15.25 7Zm6-5h-3.5l-.101.007A.75.75 0 0 0 17.75 3.5h2.134l-2.766 4.347l-.05.09A.75.75 0 0 0 17.75 9h3.5l.102-.007A.75.75 0 0 0 21.25 7.5h-2.133l2.766-4.347l.05-.09A.75.75 0 0 0 21.25 2Z"/></svg>`;
diff --git a/app/javascript/dashboard/routes/dashboard/commands/commandBarBusEvents.js b/app/javascript/dashboard/routes/dashboard/commands/commandBarBusEvents.js
index e291248e3..86e417ad7 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/commandBarBusEvents.js
+++ b/app/javascript/dashboard/routes/dashboard/commands/commandBarBusEvents.js
@@ -15,3 +15,6 @@ export const CMD_REOPEN_CONVERSATION = 'CMD_REOPEN_CONVERSATION';
 export const CMD_RESOLVE_CONVERSATION = 'CMD_RESOLVE_CONVERSATION';
 export const CMD_SNOOZE_CONVERSATION = 'CMD_SNOOZE_CONVERSATION';
 export const CMD_AI_ASSIST = 'CMD_AI_ASSIST';
+
+// 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 98745cb8b..45b807fb3 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 inboxHotKeysMixin from './inboxHotKeys';
 import goToCommandHotKeys from './goToCommandHotKeys';
 import appearanceHotKeys from './appearanceHotKeys';
 import agentMixin from 'dashboard/mixins/agentMixin';
@@ -25,6 +26,7 @@ export default {
     adminMixin,
     agentMixin,
     conversationHotKeysMixin,
+    inboxHotKeysMixin,
     conversationLabelMixin,
     conversationTeamMixin,
     appearanceHotKeys,
@@ -42,6 +44,7 @@ export default {
     },
     hotKeys() {
       return [
+        ...this.inboxHotKeys,
         ...this.conversationHotKeys,
         ...this.goToCommandHotKeys,
         ...this.goToAppearanceHotKeys,
diff --git a/app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js b/app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js
index f85449925..5d0b1960d 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js
+++ b/app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js
@@ -30,7 +30,10 @@ import {
   UNMUTE_ACTION,
   MUTE_ACTION,
 } from './commandBarActions';
-import { isAConversationRoute } from '../../../helper/routeHelpers';
+import {
+  isAConversationRoute,
+  isAInboxViewRoute,
+} from '../../../helper/routeHelpers';
 export default {
   mixins: [aiMixin],
   watch: {
@@ -325,7 +328,10 @@ export default {
     },
 
     conversationHotKeys() {
-      if (isAConversationRoute(this.$route.name)) {
+      if (
+        isAConversationRoute(this.$route.name) ||
+        isAInboxViewRoute(this.$route.name)
+      ) {
         const defaultConversationHotKeys = [
           ...this.statusActions,
           ...this.conversationAdditionalActions,
diff --git a/app/javascript/dashboard/routes/dashboard/commands/inboxHotKeys.js b/app/javascript/dashboard/routes/dashboard/commands/inboxHotKeys.js
new file mode 100644
index 000000000..e8f92a9f6
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/commands/inboxHotKeys.js
@@ -0,0 +1,81 @@
+import wootConstants from 'dashboard/constants/globals';
+
+import { CMD_SNOOZE_NOTIFICATION } from './commandBarBusEvents';
+import { ICON_SNOOZE_NOTIFICATION } from './CommandBarIcons';
+
+import { isAInboxViewRoute } from 'dashboard/helper/routeHelpers';
+
+const SNOOZE_OPTIONS = wootConstants.SNOOZE_OPTIONS;
+
+const INBOX_SNOOZE_EVENTS = [
+  {
+    id: 'snooze_notification',
+    title: 'COMMAND_BAR.COMMANDS.SNOOZE_NOTIFICATION',
+    icon: ICON_SNOOZE_NOTIFICATION,
+    children: Object.values(SNOOZE_OPTIONS),
+  },
+  {
+    id: SNOOZE_OPTIONS.AN_HOUR_FROM_NOW,
+    title: 'COMMAND_BAR.COMMANDS.AN_HOUR_FROM_NOW',
+    parent: 'snooze_notification',
+    section: 'COMMAND_BAR.SECTIONS.SNOOZE_NOTIFICATION',
+    icon: ICON_SNOOZE_NOTIFICATION,
+    handler: () =>
+      bus.$emit(CMD_SNOOZE_NOTIFICATION, SNOOZE_OPTIONS.AN_HOUR_FROM_NOW),
+  },
+  {
+    id: SNOOZE_OPTIONS.UNTIL_TOMORROW,
+    title: 'COMMAND_BAR.COMMANDS.UNTIL_TOMORROW',
+    section: 'COMMAND_BAR.SECTIONS.SNOOZE_NOTIFICATION',
+    parent: 'snooze_notification',
+    icon: ICON_SNOOZE_NOTIFICATION,
+    handler: () =>
+      bus.$emit(CMD_SNOOZE_NOTIFICATION, SNOOZE_OPTIONS.UNTIL_TOMORROW),
+  },
+  {
+    id: SNOOZE_OPTIONS.UNTIL_NEXT_WEEK,
+    title: 'COMMAND_BAR.COMMANDS.UNTIL_NEXT_WEEK',
+    section: 'COMMAND_BAR.SECTIONS.SNOOZE_NOTIFICATION',
+    parent: 'snooze_notification',
+    icon: ICON_SNOOZE_NOTIFICATION,
+    handler: () =>
+      bus.$emit(CMD_SNOOZE_NOTIFICATION, SNOOZE_OPTIONS.UNTIL_NEXT_WEEK),
+  },
+  {
+    id: SNOOZE_OPTIONS.UNTIL_NEXT_MONTH,
+    title: 'COMMAND_BAR.COMMANDS.UNTIL_NEXT_MONTH',
+    section: 'COMMAND_BAR.SECTIONS.SNOOZE_NOTIFICATION',
+    parent: 'snooze_notification',
+    icon: ICON_SNOOZE_NOTIFICATION,
+    handler: () =>
+      bus.$emit(CMD_SNOOZE_NOTIFICATION, SNOOZE_OPTIONS.UNTIL_NEXT_MONTH),
+  },
+  {
+    id: SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME,
+    title: 'COMMAND_BAR.COMMANDS.CUSTOM',
+    section: 'COMMAND_BAR.SECTIONS.SNOOZE_NOTIFICATION',
+    parent: 'snooze_notification',
+    icon: ICON_SNOOZE_NOTIFICATION,
+    handler: () =>
+      bus.$emit(CMD_SNOOZE_NOTIFICATION, SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME),
+  },
+];
+export default {
+  computed: {
+    inboxHotKeys() {
+      if (isAInboxViewRoute(this.$route.name)) {
+        return this.prepareActions(INBOX_SNOOZE_EVENTS);
+      }
+      return [];
+    },
+  },
+  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/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 0133ceed6..ad2ea5d25 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -182,6 +182,7 @@ import { getCountryFlag } from 'dashboard/helper/flag';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import {
   isAConversationRoute,
+  isAInboxViewRoute,
   getConversationDashboardRoute,
 } from '../../../../helper/routeHelpers';
 
@@ -303,6 +304,10 @@ export default {
           this.$router.push({
             name: getConversationDashboardRoute(this.$route.name),
           });
+        } else if (isAInboxViewRoute(this.$route.name)) {
+          this.$router.push({
+            name: 'inbox_view',
+          });
         } else if (this.$route.name !== 'contacts_dashboard') {
           this.$router.push({
             name: 'contacts_dashboard',
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
index 14487682e..63a32d72b 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
@@ -1,9 +1,28 @@
 /* eslint arrow-body-style: 0 */
 import { frontendURL } from '../../../helper/URLHelper';
 const ConversationView = () => import('./ConversationView');
+const InboxView = () => import('../inbox/InboxView.vue');
 
 export default {
   routes: [
+    {
+      path: frontendURL('accounts/:accountId/inbox-view'),
+      name: 'inbox_view',
+      roles: ['administrator', 'agent'],
+      component: InboxView,
+      props: () => {
+        return { inboxId: 0 };
+      },
+    },
+    {
+      path: frontendURL('accounts/:accountId/inbox-view/:conversation_id'),
+      name: 'inbox_view_conversation',
+      roles: ['administrator', 'agent'],
+      component: InboxView,
+      props: route => {
+        return { inboxId: 0, conversationId: route.params.conversation_id };
+      },
+    },
     {
       path: frontendURL('accounts/:accountId/dashboard'),
       name: 'home',
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
index 6704ce7bf..aa92ced67 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="w-full">
     <div
-      class="my-0 py-0 px-4 grid grid-cols-6 md:grid-cols-7 lg:grid-cols-8 gap-4 border-b border-slate-100 dark:border-slate-700 sticky top-16 bg-white dark:bg-slate-900"
+      class="my-0 py-0 px-4 grid grid-cols-6 z-10 md:grid-cols-7 lg:grid-cols-8 gap-4 border-b border-slate-100 dark:border-slate-700 sticky top-16 bg-white dark:bg-slate-900"
       :class="{ draggable: onCategoryPage }"
     >
       <div
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 cfb722f16..401243393 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex px-4 items-center justify-between w-full h-16 pt-2 sticky top-0 z-10 bg-white dark:bg-slate-900"
+    class="flex px-4 items-center justify-between w-full h-16 pt-2 sticky top-0 z-50 bg-white dark:bg-slate-900"
   >
     <div class="flex items-center">
       <woot-sidemenu-icon />
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue b/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue
new file mode 100644
index 000000000..bb0f2e7df
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue
@@ -0,0 +1,200 @@
+<template>
+  <div
+    class="flex flex-col h-full w-full ltr:border-r border-slate-50 dark:border-slate-800/50"
+    :class="isOnExpandedLayout ? '' : 'min-w-[360px] max-w-[360px]'"
+  >
+    <inbox-list-header @filter="onFilterChange" />
+    <div
+      ref="notificationList"
+      class="flex flex-col w-full h-[calc(100%-56px)] overflow-x-hidden overflow-y-auto"
+    >
+      <inbox-card
+        v-for="notificationItem in notifications"
+        :key="notificationItem.id"
+        :notification-item="notificationItem"
+        @mark-notification-as-read="markNotificationAsRead"
+        @mark-notification-as-unread="markNotificationAsUnRead"
+        @delete-notification="deleteNotification"
+      />
+      <div v-if="uiFlags.isFetching" class="text-center">
+        <span class="spinner mt-4 mb-4" />
+      </div>
+      <p
+        v-if="showEmptyState"
+        class="text-center text-slate-400 text-sm dark:text-slate-400 p-4 font-medium"
+      >
+        {{ $t('INBOX.LIST.NO_NOTIFICATIONS') }}
+      </p>
+      <p
+        v-if="showEndOfListMessage"
+        class="text-center text-slate-400 dark:text-slate-400 p-4"
+      >
+        {{ $t('INBOX.LIST.EOF') }}
+      </p>
+      <intersection-observer
+        v-if="!showEndOfList && !uiFlags.isFetching"
+        :options="infiniteLoaderOptions"
+        @observed="loadMoreNotifications"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import wootConstants from 'dashboard/constants/globals';
+import InboxCard from './components/InboxCard.vue';
+import InboxListHeader from './components/InboxListHeader.vue';
+import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+import IntersectionObserver from 'dashboard/components/IntersectionObserver.vue';
+import alertMixin from 'shared/mixins/alertMixin';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+export default {
+  components: {
+    InboxCard,
+    InboxListHeader,
+    IntersectionObserver,
+  },
+  mixins: [alertMixin, uiSettingsMixin],
+  props: {
+    conversationId: {
+      type: [String, Number],
+      default: 0,
+    },
+    isOnExpandedLayout: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      infiniteLoaderOptions: {
+        root: this.$refs.notificationList,
+        rootMargin: '100px 0px 100px 0px',
+      },
+      page: 1,
+      status: '',
+      type: '',
+      sortOrder: wootConstants.INBOX_SORT_BY.NEWEST,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+      meta: 'notifications/getMeta',
+      uiFlags: 'notifications/getUIFlags',
+      notification: 'notifications/getFilteredNotifications',
+    }),
+    inboxFilters() {
+      return {
+        page: this.page,
+        status: this.status,
+        type: this.type,
+        sortOrder: this.sortOrder,
+      };
+    },
+    notifications() {
+      return this.notification(this.inboxFilters);
+    },
+    showEndOfList() {
+      return this.uiFlags.isAllNotificationsLoaded && !this.uiFlags.isFetching;
+    },
+    showEmptyState() {
+      return !this.uiFlags.isFetching && !this.notifications.length;
+    },
+    showEndOfListMessage() {
+      return this.showEndOfList && this.notifications.length;
+    },
+  },
+  mounted() {
+    this.setSavedFilter();
+    this.fetchNotifications();
+  },
+  methods: {
+    fetchNotifications() {
+      this.page = 1;
+      this.$store.dispatch('notifications/clear');
+      const filter = this.inboxFilters;
+
+      this.$store.dispatch('notifications/index', filter);
+    },
+    redirectToInbox() {
+      if (!this.conversationId) return;
+      if (this.$route.name === 'inbox_view') return;
+      this.$router.push({ name: 'inbox_view' });
+    },
+    loadMoreNotifications() {
+      if (this.uiFlags.isAllNotificationsLoaded) return;
+      this.$store.dispatch('notifications/index', {
+        page: this.page + 1,
+        status: this.status,
+        type: this.type,
+        sortOrder: this.sortOrder,
+      });
+      this.page += 1;
+    },
+    markNotificationAsRead(notification) {
+      this.$track(INBOX_EVENTS.MARK_NOTIFICATION_AS_READ);
+      const {
+        id,
+        primary_actor_id: primaryActorId,
+        primary_actor_type: primaryActorType,
+      } = notification;
+      this.$store
+        .dispatch('notifications/read', {
+          id,
+          primaryActorId,
+          primaryActorType,
+          unreadCount: this.meta.unreadCount,
+        })
+        .then(() => {
+          this.showAlert(this.$t('INBOX.ALERTS.MARK_AS_READ'));
+        });
+    },
+    markNotificationAsUnRead(notification) {
+      this.$track(INBOX_EVENTS.MARK_NOTIFICATION_AS_UNREAD);
+      this.redirectToInbox();
+      const { id } = notification;
+      this.$store
+        .dispatch('notifications/unread', {
+          id,
+        })
+        .then(() => {
+          this.showAlert(this.$t('INBOX.ALERTS.MARK_AS_UNREAD'));
+        });
+    },
+    deleteNotification(notification) {
+      this.$track(INBOX_EVENTS.DELETE_NOTIFICATION);
+      this.redirectToInbox();
+      this.$store
+        .dispatch('notifications/delete', {
+          notification,
+          unread_count: this.meta.unreadCount,
+          count: this.meta.count,
+        })
+        .then(() => {
+          this.showAlert(this.$t('INBOX.ALERTS.DELETE'));
+        });
+    },
+    onFilterChange(option) {
+      if (option.type === wootConstants.INBOX_FILTER_TYPE.STATUS) {
+        this.status = option.selected ? option.key : '';
+      }
+      if (option.type === wootConstants.INBOX_FILTER_TYPE.TYPE) {
+        this.type = option.selected ? option.key : '';
+      }
+      if (option.type === wootConstants.INBOX_FILTER_TYPE.SORT_ORDER) {
+        this.sortOrder = option.key;
+      }
+      this.fetchNotifications();
+    },
+    setSavedFilter() {
+      const { inbox_filter_by: filterBy = {} } = this.uiSettings;
+      const { status, type, sort_by: sortBy } = filterBy;
+      this.status = status;
+      this.type = type;
+      this.sortOrder = sortBy || wootConstants.INBOX_SORT_BY.NEWEST;
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/InboxView.vue b/app/javascript/dashboard/routes/dashboard/inbox/InboxView.vue
new file mode 100644
index 000000000..edc36da15
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/InboxView.vue
@@ -0,0 +1,217 @@
+<template>
+  <section class="flex w-full h-full bg-white dark:bg-slate-900">
+    <inbox-list
+      v-show="showConversationList"
+      :conversation-id="conversationId"
+      :is-on-expanded-layout="isOnExpandedLayout"
+    />
+    <div
+      v-if="showInboxMessageView"
+      class="flex flex-col h-full"
+      :class="isOnExpandedLayout ? 'w-full' : 'w-[calc(100%-360px)]'"
+    >
+      <inbox-item-header
+        :total-length="totalNotifications"
+        :current-index="activeNotificationIndex"
+        :active-notification="activeNotification"
+        @next="onClickNext"
+        @prev="onClickPrev"
+      />
+      <conversation-box
+        class="h-[calc(100%-56px)]"
+        is-inbox-view
+        :inbox-id="inboxId"
+        :is-contact-panel-open="isContactPanelOpen"
+        :is-on-expanded-layout="isOnExpandedLayout"
+        @contact-panel-toggle="onToggleContactPanel"
+      />
+    </div>
+    <div
+      v-if="!showInboxMessageView && !isOnExpandedLayout"
+      class="text-center bg-slate-25 dark:bg-slate-800 justify-center w-full h-full flex items-center"
+    >
+      <span v-if="uiFlags.isFetching" class="spinner mt-4 mb-4" />
+      <div v-else class="flex flex-col items-center gap-2">
+        <fluent-icon
+          icon="mail-inbox"
+          size="40"
+          class="text-slate-600 dark:text-slate-400"
+        />
+        <span class="text-slate-500 text-sm font-medium dark:text-slate-300">
+          {{ $t('INBOX.LIST.NOTE') }}
+        </span>
+      </div>
+    </div>
+  </section>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import InboxList from './InboxList.vue';
+import InboxItemHeader from './components/InboxItemHeader.vue';
+import ConversationBox from 'dashboard/components/widgets/conversation/ConversationBox.vue';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import wootConstants from 'dashboard/constants/globals';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { BUS_EVENTS } from 'shared/constants/busEvents';
+import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+
+export default {
+  components: {
+    InboxList,
+    InboxItemHeader,
+    ConversationBox,
+  },
+  mixins: [uiSettingsMixin],
+  props: {
+    inboxId: {
+      type: [String, Number],
+      default: 0,
+    },
+    conversationId: {
+      type: [String, Number],
+      default: 0,
+    },
+  },
+  computed: {
+    ...mapGetters({
+      currentAccountId: 'getCurrentAccountId',
+      notifications: 'notifications/getNotifications',
+      currentChat: 'getSelectedChat',
+      allConversation: 'getAllConversations',
+      uiFlags: 'notifications/getUIFlags',
+    }),
+    activeNotification() {
+      return this.notifications.find(
+        n => n.primary_actor.id === Number(this.conversationId)
+      );
+    },
+    isInboxViewEnabled() {
+      return this.$store.getters['accounts/isFeatureEnabledGlobally'](
+        this.currentAccountId,
+        FEATURE_FLAGS.INBOX_VIEW
+      );
+    },
+    showConversationList() {
+      return this.isOnExpandedLayout ? !this.conversationId : true;
+    },
+    isFetchingInitialData() {
+      return this.uiFlags.isFetching && !this.notifications.length;
+    },
+    showInboxMessageView() {
+      return (
+        Boolean(this.conversationId) &&
+        Boolean(this.currentChat.id) &&
+        !this.isFetchingInitialData
+      );
+    },
+    totalNotifications() {
+      return this.notifications?.length ?? 0;
+    },
+    activeNotificationIndex() {
+      const conversationId = Number(this.conversationId);
+      const notificationIndex = this.notifications.findIndex(
+        n => n.primary_actor.id === conversationId
+      );
+      return notificationIndex >= 0 ? notificationIndex + 1 : 0;
+    },
+    isOnExpandedLayout() {
+      const {
+        LAYOUT_TYPES: { CONDENSED },
+      } = wootConstants;
+      const { conversation_display_type: conversationDisplayType = CONDENSED } =
+        this.uiSettings;
+      return conversationDisplayType !== CONDENSED;
+    },
+    isContactPanelOpen() {
+      if (this.currentChat.id) {
+        const { is_contact_sidebar_open: isContactSidebarOpen } =
+          this.uiSettings;
+        return isContactSidebarOpen;
+      }
+      return false;
+    },
+  },
+  watch: {
+    conversationId: {
+      immediate: true,
+      handler() {
+        this.fetchConversationById();
+      },
+    },
+  },
+  mounted() {
+    // Open inbox view if inbox view feature is enabled, else redirect to dashboard
+    // TODO: Remove this code once inbox view feature is enabled for all accounts
+    if (!this.isInboxViewEnabled) {
+      this.$router.push({
+        name: 'home',
+      });
+    }
+    this.$store.dispatch('agents/get');
+  },
+  methods: {
+    async fetchConversationById() {
+      if (!this.conversationId) return;
+      const chat = this.findConversation();
+      if (!chat) {
+        await this.$store.dispatch('getConversation', this.conversationId);
+      }
+      this.setActiveChat();
+    },
+    setActiveChat() {
+      const selectedConversation = this.findConversation();
+      if (!selectedConversation) return;
+      this.$store
+        .dispatch('setActiveChat', { data: selectedConversation })
+        .then(() => {
+          bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
+        });
+    },
+    findConversation() {
+      const conversationId = Number(this.conversationId);
+      return this.allConversation.find(c => c.id === conversationId);
+    },
+    navigateToConversation(activeIndex, direction) {
+      const indexOffset = direction === 'next' ? 0 : -2;
+      const targetNotification = this.notifications[activeIndex + indexOffset];
+      if (targetNotification) {
+        const {
+          id,
+          primary_actor_id: primaryActorId,
+          primary_actor_type: primaryActorType,
+          primary_actor: { id: conversationId, meta: { unreadCount } = {} },
+          notification_type: notificationType,
+        } = targetNotification;
+
+        this.$track(INBOX_EVENTS.OPEN_CONVERSATION_VIA_INBOX, {
+          notificationType,
+        });
+
+        this.$store.dispatch('notifications/read', {
+          id,
+          primaryActorId,
+          primaryActorType,
+          unreadCount,
+        });
+
+        this.$router.push({
+          name: 'inbox_view_conversation',
+          params: { conversation_id: conversationId },
+        });
+      }
+    },
+    onClickNext() {
+      this.navigateToConversation(this.activeNotificationIndex, 'next');
+    },
+    onClickPrev() {
+      this.navigateToConversation(this.activeNotificationIndex, 'prev');
+    },
+    onToggleContactPanel() {
+      this.updateUISettings({
+        is_contact_sidebar_open: !this.isContactPanelOpen,
+      });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue
new file mode 100644
index 000000000..8e100f7b5
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue
@@ -0,0 +1,236 @@
+<template>
+  <div
+    role="button"
+    class="flex flex-col ltr:pl-5 rtl:pl-3 rtl:pr-5 ltr:pr-3 gap-2.5 py-3 w-full border-b border-slate-50 dark:border-slate-800/50 hover:bg-slate-25 dark:hover:bg-slate-800 cursor-pointer"
+    :class="
+      isInboxCardActive
+        ? 'bg-slate-25 dark:bg-slate-800 click-animation'
+        : 'bg-white dark:bg-slate-900'
+    "
+    @contextmenu="openContextMenu($event)"
+    @click="openConversation(notificationItem)"
+  >
+    <div class="flex relative items-center justify-between w-full">
+      <div
+        v-if="isUnread"
+        class="absolute ltr:-left-3.5 rtl:-right-3.5 flex w-2 h-2 rounded bg-woot-500 dark:bg-woot-500"
+      />
+      <InboxNameAndId :inbox="inbox" :conversation-id="primaryActor.id" />
+
+      <div class="flex gap-2">
+        <PriorityIcon :priority="primaryActor.priority" />
+        <StatusIcon :status="primaryActor.status" />
+      </div>
+    </div>
+
+    <div class="flex flex-row justify-between items-center w-full">
+      <div class="flex gap-1.5 items-center max-w-[calc(100%-70px)]">
+        <Thumbnail
+          v-if="assigneeMeta"
+          :src="assigneeMeta.thumbnail"
+          :username="assigneeMeta.name"
+          size="16px"
+          class="relative bottom-0.5"
+        />
+        <div class="flex min-w-0">
+          <span
+            class="text-slate-800 dark:text-slate-50 text-sm overflow-hidden text-ellipsis whitespace-nowrap"
+            :class="isUnread ? 'font-medium' : 'font-normal'"
+          >
+            {{ pushTitle }}
+          </span>
+        </div>
+      </div>
+      <span
+        class="font-medium max-w-[60px] text-slate-600 dark:text-slate-300 text-xs whitespace-nowrap"
+      >
+        {{ lastActivityAt }}
+      </span>
+    </div>
+    <div v-if="snoozedUntilTime" class="flex items-center">
+      <span class="text-woot-500 dark:text-woot-500 text-xs font-medium">
+        {{ snoozedDisplayText }}
+      </span>
+    </div>
+    <inbox-context-menu
+      v-if="isContextMenuOpen"
+      :context-menu-position="contextMenuPosition"
+      :menu-items="menuItems"
+      @close="closeContextMenu"
+      @click="handleAction"
+    />
+  </div>
+</template>
+<script>
+import PriorityIcon from './PriorityIcon.vue';
+import StatusIcon from './StatusIcon.vue';
+import InboxNameAndId from './InboxNameAndId.vue';
+import InboxContextMenu from './InboxContextMenu.vue';
+import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+import timeMixin from 'dashboard/mixins/time';
+import { snoozedReopenTime } from 'dashboard/helper/snoozeHelpers';
+import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+export default {
+  components: {
+    PriorityIcon,
+    InboxContextMenu,
+    StatusIcon,
+    InboxNameAndId,
+    Thumbnail,
+  },
+  mixins: [timeMixin],
+  props: {
+    notificationItem: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      isContextMenuOpen: false,
+      contextMenuPosition: { x: null, y: null },
+    };
+  },
+  computed: {
+    primaryActor() {
+      return this.notificationItem?.primary_actor;
+    },
+    isInboxCardActive() {
+      return this.$route.params.conversation_id === this.primaryActor?.id;
+    },
+    inbox() {
+      return this.$store.getters['inboxes/getInbox'](
+        this.primaryActor.inbox_id
+      );
+    },
+    isUnread() {
+      return !this.notificationItem?.read_at;
+    },
+    meta() {
+      return this.primaryActor?.meta;
+    },
+    assigneeMeta() {
+      return this.meta?.assignee;
+    },
+    pushTitle() {
+      return this.$t(
+        `INBOX.TYPES.${this.notificationItem.notification_type.toUpperCase()}`
+      );
+    },
+    lastActivityAt() {
+      const dynamicTime = this.dynamicTime(
+        this.notificationItem?.last_activity_at
+      );
+      return this.shortTimestamp(dynamicTime, true);
+    },
+    menuItems() {
+      const items = [
+        {
+          key: 'delete',
+          label: this.$t('INBOX.MENU_ITEM.DELETE'),
+        },
+      ];
+
+      if (!this.isUnread) {
+        items.push({
+          key: 'mark_as_unread',
+          label: this.$t('INBOX.MENU_ITEM.MARK_AS_UNREAD'),
+        });
+      } else {
+        items.push({
+          key: 'mark_as_read',
+          label: this.$t('INBOX.MENU_ITEM.MARK_AS_READ'),
+        });
+      }
+      return items;
+    },
+    snoozedUntilTime() {
+      const { snoozed_until: snoozedUntil } = this.notificationItem;
+      return snoozedUntil;
+    },
+    snoozedDisplayText() {
+      if (this.snoozedUntilTime) {
+        return `${this.$t('INBOX.LIST.SNOOZED_UNTIL')} ${snoozedReopenTime(
+          this.snoozedUntilTime
+        )}`;
+      }
+      return '';
+    },
+  },
+  unmounted() {
+    this.closeContextMenu();
+  },
+  methods: {
+    openConversation(notification) {
+      const {
+        id,
+        primary_actor_id: primaryActorId,
+        primary_actor_type: primaryActorType,
+        primary_actor: { id: conversationId, inbox_id: inboxId },
+        notification_type: notificationType,
+      } = notification;
+
+      if (this.$route.params.conversation_id !== conversationId) {
+        this.$track(INBOX_EVENTS.OPEN_CONVERSATION_VIA_INBOX, {
+          notificationType,
+        });
+
+        this.$store.dispatch('notifications/read', {
+          id,
+          primaryActorId,
+          primaryActorType,
+          unreadCount: this.meta.unreadCount,
+        });
+
+        this.$router.push({
+          name: 'inbox_view_conversation',
+          params: { inboxId, conversation_id: conversationId },
+        });
+      }
+    },
+    closeContextMenu() {
+      this.isContextMenuOpen = false;
+      this.contextMenuPosition = { x: null, y: null };
+    },
+    openContextMenu(e) {
+      this.closeContextMenu();
+      e.preventDefault();
+      this.contextMenuPosition = {
+        x: e.pageX || e.clientX,
+        y: e.pageY || e.clientY,
+      };
+      this.isContextMenuOpen = true;
+    },
+    handleAction(key) {
+      switch (key) {
+        case 'mark_as_read':
+          this.$emit('mark-notification-as-read', this.notificationItem);
+          break;
+        case 'mark_as_unread':
+          this.$emit('mark-notification-as-unread', this.notificationItem);
+          break;
+        case 'delete':
+          this.$emit('delete-notification', this.notificationItem);
+          break;
+        default:
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+.click-animation {
+  animation: click-animation 0.3s ease-in-out;
+}
+@keyframes click-animation {
+  0% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(0.99);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxContextMenu.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxContextMenu.vue
new file mode 100644
index 000000000..50ebd3a5b
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxContextMenu.vue
@@ -0,0 +1,46 @@
+<template>
+  <woot-context-menu
+    :x="contextMenuPosition.x"
+    :y="contextMenuPosition.y"
+    @close="handleClose"
+  >
+    <div
+      class="bg-white dark:bg-slate-900 w-40 py-1 border shadow-md border-slate-100 dark:border-slate-700/50 rounded-xl"
+    >
+      <menu-item
+        v-for="item in menuItems"
+        :key="item.key"
+        :label="item.label"
+        @click="onMenuItemClick(item.key)"
+      />
+    </div>
+  </woot-context-menu>
+</template>
+
+<script>
+import MenuItem from './MenuItem.vue';
+export default {
+  components: {
+    MenuItem,
+  },
+  props: {
+    contextMenuPosition: {
+      type: Object,
+      default: () => ({}),
+    },
+    menuItems: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  methods: {
+    handleClose() {
+      this.$emit('close');
+    },
+    onMenuItemClick(key) {
+      this.$emit('click', key);
+      this.handleClose();
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxDisplayMenu.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxDisplayMenu.vue
new file mode 100644
index 000000000..3101bc63c
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxDisplayMenu.vue
@@ -0,0 +1,198 @@
+<template>
+  <div
+    class="flex flex-col bg-white z-50 dark:bg-slate-900 w-[170px] border shadow-md border-slate-100 dark:border-slate-700/50 rounded-xl divide-y divide-slate-100 dark:divide-slate-700/50"
+  >
+    <div class="flex items-center justify-between h-11 p-3 rounded-t-lg">
+      <div class="flex gap-1.5">
+        <fluent-icon
+          icon="arrow-sort"
+          type="outline"
+          size="16"
+          class="text-slate-700 dark:text-slate-100"
+        />
+        <span class="font-medium text-xs text-slate-800 dark:text-slate-100">
+          {{ $t('INBOX.DISPLAY_MENU.SORT') }}
+        </span>
+      </div>
+      <div class="relative">
+        <div
+          role="button"
+          class="border h-5 flex gap-1 rounded-md items-center pr-1.5 pl-1 py-0.5 w-[70px] justify-between border-slate-100 dark:border-slate-700/50"
+          @click="openSortMenu"
+        >
+          <span class="text-xs font-medium text-slate-600 dark:text-slate-300">
+            {{ activeSortOption }}
+          </span>
+          <fluent-icon
+            icon="chevron-down"
+            size="12"
+            class="text-slate-600 dark:text-slate-200"
+          />
+        </div>
+        <div
+          v-if="showSortMenu"
+          class="absolute flex flex-col gap-0.5 bg-white z-60 dark:bg-slate-800 rounded-md p-0.5 top-0 w-[70px] border border-slate-100 dark:border-slate-700/50"
+        >
+          <div
+            v-for="option in sortOptions"
+            :key="option.key"
+            role="button"
+            class="flex rounded-[4px] h-5 w-full items-center justify-between p-0.5 gap-1"
+            :class="{
+              'bg-woot-50 dark:bg-woot-700/50': activeSort === option.key,
+            }"
+            @click.stop="onSortOptionClick(option)"
+          >
+            <span
+              class="text-xs font-medium hover:text-woot-600 dark:hover:text-woot-600"
+              :class="{
+                'text-woot-600 dark:text-woot-600': activeSort === option.key,
+                'text-slate-600 dark:text-slate-300': activeSort !== option.key,
+              }"
+            >
+              {{ option.name }}
+            </span>
+            <fluent-icon
+              v-if="activeSort === option.key"
+              icon="checkmark"
+              size="14"
+              class="text-woot-600 dark:text-woot-600"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <span
+        class="font-medium text-xs py-4 px-3 text-slate-400 dark:text-slate-400"
+      >
+        {{ $t('INBOX.DISPLAY_MENU.DISPLAY') }}
+      </span>
+      <div
+        class="flex flex-col divide-y divide-slate-100 dark:divide-slate-700/50"
+      >
+        <div
+          v-for="option in displayOptions"
+          :key="option.key"
+          class="flex items-center px-3 py-2 gap-1.5 h-9"
+        >
+          <input
+            :id="option.key"
+            type="checkbox"
+            :name="option.key"
+            :checked="option.selected"
+            class="m-0 border-[1.5px] shadow border-slate-200 dark:border-slate-600 appearance-none rounded-[4px] w-4 h-4 dark:bg-slate-800 focus:ring-1 focus:ring-slate-100 dark:focus:ring-slate-700 checked:bg-woot-600 dark:checked:bg-woot-600 after:content-[''] after:text-white checked:after:content-['✓'] after:flex after:items-center after:justify-center checked:border-t checked:border-woot-700 dark:checked:border-woot-300 checked:border-b-0 checked:border-r-0 checked:border-l-0 after:text-center after:text-xs after:font-bold after:relative after:-top-[1.5px]"
+            @change="updateDisplayOption(option)"
+          />
+          <label
+            :for="option.key"
+            class="text-xs font-medium text-slate-800 !ml-0 !mr-0 dark:text-slate-100"
+          >
+            {{ option.name }}
+          </label>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import wootConstants from 'dashboard/constants/globals';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+
+export default {
+  mixins: [uiSettingsMixin],
+  data() {
+    return {
+      showSortMenu: false,
+      displayOptions: [
+        {
+          name: this.$t('INBOX.DISPLAY_MENU.DISPLAY_OPTIONS.SNOOZED'),
+          key: wootConstants.INBOX_DISPLAY_BY.SNOOZED,
+          selected: false,
+          type: wootConstants.INBOX_FILTER_TYPE.STATUS,
+        },
+        {
+          name: this.$t('INBOX.DISPLAY_MENU.DISPLAY_OPTIONS.READ'),
+          key: wootConstants.INBOX_DISPLAY_BY.READ,
+          selected: false,
+          type: wootConstants.INBOX_FILTER_TYPE.TYPE,
+        },
+      ],
+      sortOptions: [
+        {
+          name: this.$t('INBOX.DISPLAY_MENU.SORT_OPTIONS.NEWEST'),
+          key: wootConstants.INBOX_SORT_BY.NEWEST,
+          type: wootConstants.INBOX_FILTER_TYPE.SORT_ORDER,
+        },
+        {
+          name: this.$t('INBOX.DISPLAY_MENU.SORT_OPTIONS.OLDEST'),
+          key: wootConstants.INBOX_SORT_BY.OLDEST,
+          type: wootConstants.INBOX_FILTER_TYPE.SORT_ORDER,
+        },
+      ],
+      activeSort: wootConstants.INBOX_SORT_BY.NEWEST,
+      activeDisplayFilter: {
+        status: '',
+        type: '',
+      },
+    };
+  },
+  computed: {
+    activeSortOption() {
+      return (
+        this.sortOptions.find(option => option.key === this.activeSort)?.name ||
+        ''
+      );
+    },
+  },
+  mounted() {
+    this.setSavedFilter();
+  },
+  methods: {
+    updateDisplayOption(option) {
+      this.displayOptions.forEach(displayOption => {
+        if (displayOption.key === option.key) {
+          displayOption.selected = !option.selected;
+          this.activeDisplayFilter[displayOption.type] = displayOption.selected
+            ? displayOption.key
+            : '';
+          this.saveSelectedDisplayFilter();
+          this.$emit('filter', option);
+        }
+      });
+    },
+    openSortMenu() {
+      this.showSortMenu = !this.showSortMenu;
+    },
+    onSortOptionClick(option) {
+      this.activeSort = option.key;
+      this.showSortMenu = false;
+      this.saveSelectedDisplayFilter();
+      this.$emit('filter', option);
+    },
+    saveSelectedDisplayFilter() {
+      this.updateUISettings({
+        inbox_filter_by: {
+          ...this.activeDisplayFilter,
+          sort_by: this.activeSort || wootConstants.INBOX_SORT_BY.NEWEST,
+        },
+      });
+    },
+    setSavedFilter() {
+      const { inbox_filter_by: filterBy = {} } = this.uiSettings;
+      const { status, type, sort_by: sortBy } = filterBy;
+      this.activeSort = sortBy || wootConstants.INBOX_SORT_BY.NEWEST;
+      this.displayOptions.forEach(option => {
+        option.selected =
+          option.type === wootConstants.INBOX_FILTER_TYPE.STATUS
+            ? option.key === status
+            : option.key === type;
+        this.activeDisplayFilter[option.type] = option.selected
+          ? option.key
+          : '';
+      });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue
new file mode 100644
index 000000000..99b642cbf
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue
@@ -0,0 +1,145 @@
+<template>
+  <div
+    class="flex gap-2 py-2 ltr:pl-4 rtl:pl-2 h-14 ltr:pr-2 rtl:pr-4 rtl:border-r justify-between items-center w-full border-b border-slate-50 dark:border-slate-800/50"
+  >
+    <pagination-button
+      v-if="totalLength > 1"
+      :total-length="totalLength"
+      :current-index="currentIndex"
+      @next="onClickNext"
+      @prev="onClickPrev"
+    />
+    <div v-else />
+    <div class="flex items-center gap-2">
+      <woot-button
+        variant="hollow"
+        size="small"
+        color-scheme="secondary"
+        icon="snooze"
+        @click="openSnoozeNotificationModal"
+      >
+        {{ $t('INBOX.ACTION_HEADER.SNOOZE') }}
+      </woot-button>
+      <woot-button
+        icon="delete"
+        size="small"
+        color-scheme="secondary"
+        variant="hollow"
+        @click="deleteNotification"
+      >
+        {{ $t('INBOX.ACTION_HEADER.DELETE') }}
+      </woot-button>
+    </div>
+    <woot-modal
+      :show.sync="showCustomSnoozeModal"
+      :on-close="hideCustomSnoozeModal"
+    >
+      <custom-snooze-modal
+        @close="hideCustomSnoozeModal"
+        @choose-time="scheduleCustomSnooze"
+      />
+    </woot-modal>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { getUnixTime } from 'date-fns';
+import { CMD_SNOOZE_NOTIFICATION } from 'dashboard/routes/dashboard/commands/commandBarBusEvents';
+import wootConstants from 'dashboard/constants/globals';
+import { findSnoozeTime } from 'dashboard/helper/snoozeHelpers';
+import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+import PaginationButton from './PaginationButton.vue';
+import CustomSnoozeModal from 'dashboard/components/CustomSnoozeModal.vue';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: {
+    PaginationButton,
+    CustomSnoozeModal,
+  },
+  mixins: [alertMixin],
+  props: {
+    totalLength: {
+      type: Number,
+      default: 0,
+    },
+    currentIndex: {
+      type: Number,
+      default: 0,
+    },
+    activeNotification: {
+      type: Object,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      showCustomSnoozeModal: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      meta: 'notifications/getMeta',
+    }),
+  },
+  mounted() {
+    bus.$on(CMD_SNOOZE_NOTIFICATION, this.onCmdSnoozeNotification);
+  },
+  destroyed() {
+    bus.$off(CMD_SNOOZE_NOTIFICATION, this.onCmdSnoozeNotification);
+  },
+  methods: {
+    openSnoozeNotificationModal() {
+      const ninja = document.querySelector('ninja-keys');
+      ninja.open({ parent: 'snooze_notification' });
+    },
+    hideCustomSnoozeModal() {
+      this.showCustomSnoozeModal = false;
+    },
+    snoozeNotification(snoozedUntil) {
+      this.$store
+        .dispatch('notifications/snooze', {
+          id: this.activeNotification?.id,
+          snoozedUntil,
+        })
+        .then(() => {
+          this.showAlert(this.$t('INBOX.ALERTS.SNOOZE'));
+        });
+    },
+    onCmdSnoozeNotification(snoozeType) {
+      if (snoozeType === wootConstants.SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME) {
+        this.showCustomSnoozeModal = true;
+      } else {
+        const snoozedUntil = findSnoozeTime(snoozeType) || null;
+        this.snoozeNotification(snoozedUntil);
+      }
+    },
+    scheduleCustomSnooze(customSnoozeTime) {
+      this.showCustomSnoozeModal = false;
+      if (customSnoozeTime) {
+        const snoozedUntil = getUnixTime(customSnoozeTime) || null;
+        this.snoozeNotification(snoozedUntil);
+      }
+    },
+    deleteNotification() {
+      this.$track(INBOX_EVENTS.DELETE_NOTIFICATION);
+      this.$store
+        .dispatch('notifications/delete', {
+          notification: this.activeNotification,
+          unread_count: this.meta.unreadCount,
+          count: this.meta.count,
+        })
+        .then(() => {
+          this.showAlert(this.$t('INBOX.ALERTS.DELETE'));
+        });
+      this.$router.push({ name: 'inbox_view' });
+    },
+    onClickNext() {
+      this.$emit('next');
+    },
+    onClickPrev() {
+      this.$emit('prev');
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
new file mode 100644
index 000000000..3f5a594b7
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
@@ -0,0 +1,123 @@
+<template>
+  <div
+    class="flex w-full ltr:pl-4 rtl:pl-2 rtl:pr-4 ltr:pr-2 py-2 h-14 justify-between items-center border-b border-slate-50 dark:border-slate-800/50"
+  >
+    <div class="flex items-center gap-1.5">
+      <h1 class="font-medium text-slate-900 dark:text-slate-25 text-xl">
+        {{ $t('INBOX.LIST.TITLE') }}
+      </h1>
+      <div class="relative">
+        <div
+          role="button"
+          class="flex gap-1 items-center py-1 px-2 border border-slate-100 dark:border-slate-700/50 rounded-md"
+          @click="openInboxDisplayMenu"
+        >
+          <span
+            class="text-slate-600 dark:text-slate-200 text-xs text-center font-medium"
+          >
+            {{ $t('INBOX.LIST.DISPLAY_DROPDOWN') }}
+          </span>
+          <fluent-icon
+            icon="chevron-down"
+            size="12"
+            class="text-slate-600 dark:text-slate-200"
+          />
+        </div>
+        <inbox-display-menu
+          v-if="showInboxDisplayMenu"
+          v-on-clickaway="openInboxDisplayMenu"
+          class="absolute top-8"
+          @filter="onFilterChange"
+        />
+      </div>
+    </div>
+    <div class="flex relative gap-1 items-center">
+      <!-- <woot-button
+        variant="clear"
+        size="small"
+        color-scheme="secondary"
+        icon="filter"
+        @click="openInboxFilter"
+      /> -->
+      <woot-button
+        variant="clear"
+        size="small"
+        color-scheme="secondary"
+        icon="mail-inbox"
+        @click="openInboxOptionsMenu"
+      />
+      <inbox-option-menu
+        v-if="showInboxOptionMenu"
+        v-on-clickaway="openInboxOptionsMenu"
+        class="absolute top-9"
+        @option-click="onInboxOptionMenuClick"
+      />
+    </div>
+  </div>
+</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';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: {
+    InboxOptionMenu,
+    InboxDisplayMenu,
+  },
+  mixins: [clickaway, alertMixin],
+  data() {
+    return {
+      showInboxDisplayMenu: false,
+      showInboxOptionMenu: false,
+    };
+  },
+  methods: {
+    markAllRead() {
+      this.$track(INBOX_EVENTS.MARK_ALL_NOTIFICATIONS_AS_READ);
+      this.$store.dispatch('notifications/readAll').then(() => {
+        this.showAlert(this.$t('INBOX.ALERTS.MARK_ALL_READ'));
+      });
+    },
+    deleteAll() {
+      this.$store.dispatch('notifications/deleteAll').then(() => {
+        this.showAlert(this.$t('INBOX.ALERTS.DELETE_ALL'));
+      });
+    },
+    deleteAllRead() {
+      this.$store.dispatch('notifications/deleteAllRead').then(() => {
+        this.showAlert(this.$t('INBOX.ALERTS.DELETE_ALL_READ'));
+      });
+    },
+    openInboxDisplayMenu() {
+      this.showInboxDisplayMenu = !this.showInboxDisplayMenu;
+    },
+    openInboxOptionsMenu() {
+      this.showInboxOptionMenu = !this.showInboxOptionMenu;
+    },
+    onInboxOptionMenuClick(key) {
+      this.showInboxOptionMenu = false;
+      if (key === 'mark_all_read') {
+        this.markAllRead();
+      }
+      if (key === 'delete_all') {
+        this.deleteAll();
+      }
+      if (key === 'delete_all_read') {
+        this.deleteAllRead();
+      }
+    },
+    onFilterChange(option) {
+      this.$emit('filter', option);
+      this.showInboxDisplayMenu = false;
+      if (this.$route.name === 'inbox_view') return;
+      this.$router.push({ name: 'inbox_view' });
+    },
+  },
+};
+</script>
+
+<style></style>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxNameAndId.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxNameAndId.vue
new file mode 100644
index 000000000..0b0ef03ff
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxNameAndId.vue
@@ -0,0 +1,44 @@
+<script>
+import { getInboxClassByType } from 'dashboard/helper/inbox';
+
+export default {
+  props: {
+    inbox: {
+      type: Object,
+      default: () => {},
+    },
+    conversationId: {
+      type: Number,
+      default: 0,
+    },
+  },
+  computed: {
+    inboxIcon() {
+      const { phone_number: phoneNumber, channel_type: type } = this.inbox;
+      const classByType = getInboxClassByType(type, phoneNumber);
+      return classByType;
+    },
+  },
+};
+</script>
+<template>
+  <div
+    class="inline-flex items-center rounded-[4px] border border-slate-100 dark:border-slate-700/50 divide-x divide-slate-100 dark:divide-slate-700/50 bg-none"
+  >
+    <div v-if="inbox" class="flex items-center gap-0.5 py-0.5 px-1.5">
+      <fluent-icon
+        class="text-slate-600 dark:text-slate-300"
+        :icon="inboxIcon"
+        size="14"
+      />
+      <span class="font-medium text-slate-600 dark:text-slate-200 text-xs">
+        {{ inbox.name }}
+      </span>
+    </div>
+    <div class="flex items-center py-0.5 px-1.5">
+      <span class="font-medium text-slate-600 dark:text-slate-200 text-xs">
+        {{ conversationId }}
+      </span>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxOptionMenu.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxOptionMenu.vue
new file mode 100644
index 000000000..f10821677
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxOptionMenu.vue
@@ -0,0 +1,46 @@
+<template>
+  <div
+    class="flex flex-col gap-1 bg-white z-50 dark:bg-slate-900 w-40 py-1 border shadow-md border-slate-100 dark:border-slate-700/50 rounded-xl divide-y divide-slate-100 dark:divide-slate-700/50"
+  >
+    <div class="flex flex-col">
+      <menu-item
+        v-for="item in menuItems"
+        :key="item.key"
+        :label="item.label"
+        @click="onClick(item.key)"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import MenuItem from './MenuItem.vue';
+export default {
+  components: {
+    MenuItem,
+  },
+  data() {
+    return {
+      menuItems: [
+        {
+          key: 'mark_all_read',
+          label: this.$t('INBOX.MENU_ITEM.MARK_ALL_READ'),
+        },
+        {
+          key: 'delete_all',
+          label: this.$t('INBOX.MENU_ITEM.DELETE_ALL'),
+        },
+        {
+          key: 'delete_all_read',
+          label: this.$t('INBOX.MENU_ITEM.DELETE_ALL_READ'),
+        },
+      ],
+    };
+  },
+  methods: {
+    onClick(key) {
+      this.$emit('option-click', key);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue
new file mode 100644
index 000000000..ea8ea421d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue
@@ -0,0 +1,25 @@
+<script setup>
+import { defineProps, defineEmits } from 'vue';
+
+defineProps({
+  label: {
+    type: String,
+    default: '',
+  },
+});
+
+const emits = defineEmits(['click']);
+
+const onMenuItemClick = () => {
+  emits('click');
+};
+</script>
+<template>
+  <div
+    role="button"
+    class="py-1 px-2 w-full h-8 font-medium text-xs text-slate-800 dark:text-slate-100 flex items-center whitespace-nowrap text-ellipsis overflow-hidden hover:text-woot-600 dark:hover:text-woot-500 cursor-pointer rounded-md"
+    @click.stop="onMenuItemClick"
+  >
+    {{ label }}
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue
new file mode 100644
index 000000000..46ff0c3bc
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="flex gap-2 items-center">
+    <div class="flex gap-1 items-center">
+      <woot-button
+        size="tiny"
+        variant="hollow"
+        color-scheme="secondary"
+        icon="chevron-up"
+        :disabled="isUpDisabled"
+        @click="handleUpClick"
+      />
+      <woot-button
+        size="tiny"
+        variant="hollow"
+        color-scheme="secondary"
+        icon="chevron-down"
+        :disabled="isDownDisabled"
+        @click="handleDownClick"
+      />
+    </div>
+    <div class="flex items-center gap-1 whitespace-nowrap">
+      <span class="text-sm font-medium text-gray-600">
+        {{ totalLength <= 1 ? '1' : currentIndex }}
+      </span>
+      <span
+        v-if="totalLength > 1"
+        class="text-sm text-slate-400 relative -top-px"
+      >
+        /
+      </span>
+      <span v-if="totalLength > 1" class="text-sm text-slate-400">
+        {{ totalLength }}
+      </span>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    totalLength: {
+      type: Number,
+      default: 0,
+    },
+    currentIndex: {
+      type: Number,
+      default: 0,
+    },
+  },
+  computed: {
+    isUpDisabled() {
+      return this.currentIndex === 1;
+    },
+    isDownDisabled() {
+      return this.currentIndex === this.totalLength || this.totalLength <= 1;
+    },
+  },
+  methods: {
+    handleUpClick() {
+      if (this.currentIndex > 1) {
+        this.$emit('prev');
+      }
+    },
+    handleDownClick() {
+      if (this.currentIndex < this.totalLength) {
+        this.$emit('next');
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/PriorityIcon.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/PriorityIcon.vue
new file mode 100644
index 000000000..721125827
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/PriorityIcon.vue
@@ -0,0 +1,80 @@
+<script>
+import { CONVERSATION_PRIORITY } from 'shared/constants/messages';
+export default {
+  props: {
+    priority: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      CONVERSATION_PRIORITY,
+    };
+  },
+};
+</script>
+
+<template>
+  <div class="inline-flex items-center justify-center rounded-md">
+    <!-- High Priority -->
+    <svg
+      v-if="priority === CONVERSATION_PRIORITY.HIGH"
+      class="h-4 w-4"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect x="4" y="12" width="4" height="8" rx="1" fill="#FFC291" />
+      <rect x="10" y="8" width="4" height="12" rx="1" fill="#FFC291" />
+      <rect x="16" y="4" width="4" height="16" rx="1" fill="#FFC291" />
+    </svg>
+
+    <!-- Low Priority -->
+    <svg
+      v-if="priority === CONVERSATION_PRIORITY.LOW"
+      class="h-4 w-4"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect x="4" y="12" width="4" height="8" rx="1" fill="#FFC291" />
+      <rect x="10" y="8" width="4" height="12" rx="1" fill="#DDDDDD" />
+      <rect x="16" y="4" width="4" height="16" rx="1" fill="#DDDDDD" />
+    </svg>
+
+    <!-- Medium Priority  -->
+    <svg
+      v-if="priority === CONVERSATION_PRIORITY.MEDIUM"
+      class="h-4 w-4"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect x="4" y="12" width="4" height="8" rx="1" fill="#FFC291" />
+      <rect x="10" y="8" width="4" height="12" rx="1" fill="#FFC291" />
+      <rect x="16" y="4" width="4" height="16" rx="1" fill="#DDDDDD" />
+    </svg>
+
+    <!-- Urgent Priority -->
+    <svg
+      v-if="priority === CONVERSATION_PRIORITY.URGENT"
+      class="h-4 w-4"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect x="4" y="12" width="4" height="8" rx="1" fill="#E5484D" />
+      <rect x="10" y="8" width="4" height="12" rx="1" fill="#E5484D" />
+      <rect x="16" y="4" width="4" height="16" rx="1" fill="#E5484D" />
+    </svg>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/StatusIcon.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/StatusIcon.vue
new file mode 100644
index 000000000..5f6ddc8d2
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/StatusIcon.vue
@@ -0,0 +1,86 @@
+<template>
+  <div class="inline-flex items-center justify-center rounded-md">
+    <!-- Pending -->
+    <svg
+      v-if="status === CONVERSATION_STATUS.PENDING"
+      class="h-3.5 w-3.5"
+      width="18"
+      height="18"
+      viewBox="0 0 18 18"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M8.1 0.0449978V1.8558C4.5486 2.2986 1.8 5.328 1.8 9C1.8 12.9762 5.0238 16.2 9 16.2C10.6641 16.2 12.195 15.6357 13.4154 14.688L14.6961 15.9687C13.1445 17.2377 11.16 18 9 18C4.0293 18 0 13.9707 0 9C0 4.3335 3.5523 0.495898 8.1 0.0449978ZM17.955 9.9C17.775 11.7099 17.0604 13.3623 15.9687 14.6952L14.688 13.4154C15.462 12.4191 15.9804 11.2149 16.1442 9.9H17.9559H17.955ZM9.9018 0.0449978C14.1534 0.467098 17.5338 3.8484 17.9568 8.1H16.1451C15.7392 4.8438 13.158 2.2626 9.9018 1.8558V0.0440979V0.0449978Z"
+        class="fill-[#B9BBC6]"
+      />
+    </svg>
+    <!-- Open -->
+    <svg
+      v-if="status === CONVERSATION_STATUS.OPEN"
+      class="h-3.5 w-3.5"
+      width="19"
+      height="19"
+      viewBox="0 0 19 19"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M9.375 18.875C4.19733 18.875 0 14.6776 0 9.5C0 4.32233 4.19733 0.125 9.375 0.125C14.5526 0.125 18.75 4.32233 18.75 9.5C18.75 14.6776 14.5526 18.875 9.375 18.875ZM9.375 17C13.5172 17 16.875 13.6422 16.875 9.5C16.875 5.35786 13.5172 2 9.375 2C5.23286 2 1.875 5.35786 1.875 9.5C1.875 13.6422 5.23286 17 9.375 17Z"
+        class="fill-[#ED8A5C]"
+      />
+    </svg>
+
+    <!-- Snoozed -->
+    <svg
+      v-if="status === CONVERSATION_STATUS.SNOOZED"
+      class="h-3.5 w-3.5"
+      width="18"
+      height="18"
+      viewBox="0 0 18 18"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M9 18C4.0293 18 0 13.9707 0 9C0 4.0293 4.0293 0 9 0C13.9707 0 18 4.0293 18 9C18 13.9707 13.9707 18 9 18ZM2.9961 12.9825C3.58766 13.8676 4.36812 14.6105 5.28129 15.1577C6.19446 15.7049 7.21761 16.0428 8.27707 16.147C9.33652 16.2513 10.4059 16.1193 11.4082 15.7606C12.4105 15.4019 13.3208 14.8254 14.0736 14.0726C14.8263 13.3198 15.4027 12.4094 15.7613 11.4071C16.12 10.4047 16.2518 9.33532 16.1475 8.27588C16.0431 7.21644 15.7052 6.19332 15.1579 5.2802C14.6106 4.36707 13.8676 3.58668 12.9825 2.9952C13.3706 4.3796 13.383 5.84237 13.0186 7.23318C12.6542 8.62399 11.926 9.89269 10.9089 10.9089C9.89277 11.9258 8.62423 12.6539 7.23359 13.0183C5.84296 13.3828 4.38037 13.3704 2.9961 12.9825Z"
+        class="fill-[#0B68CB]"
+      />
+    </svg>
+
+    <!-- Resolved -->
+    <svg
+      v-if="status === CONVERSATION_STATUS.RESOLVED"
+      class="h-3.5 w-3.5"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="3 3 17.92 17.92"
+    >
+      <path
+        d="M11.96 20.92C7.01152 20.92 3 16.9084 3 11.96C3 7.01152 7.01152 3 11.96 3C16.9084 3 20.92 7.01152 20.92 11.96C20.92 16.9084 16.9084 20.92 11.96 20.92ZM11.96 19.128C15.9188 19.128 19.128 15.9188 19.128 11.96C19.128 8.00122 15.9188 4.792 11.96 4.792C8.00122 4.792 4.792 8.00122 4.792 11.96C4.792 15.9188 8.00122 19.128 11.96 19.128Z"
+        class="fill-[#5BB98C]"
+      />
+      <path
+        d="M11.9599 17.9333C15.2589 17.9333 17.9332 15.2589 17.9332 11.96C17.9332 8.66098 15.2589 5.98663 11.9599 5.98663C8.66092 5.98663 5.98657 8.66098 5.98657 11.96C5.98657 15.2589 8.66092 17.9333 11.9599 17.9333Z"
+        class="fill-[#5BB98C]"
+      />
+    </svg>
+  </div>
+</template>
+
+<script>
+import { CONVERSATION_STATUS } from 'shared/constants/messages';
+
+export default {
+  props: {
+    status: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      CONVERSATION_STATUS,
+    };
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
index e5b008d8b..0d76d611b 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
@@ -188,6 +188,7 @@ export default {
         notificationType,
       });
       this.$store.dispatch('notifications/read', {
+        id: notification.id,
         primaryActorId,
         primaryActorType,
         unreadCount: this.meta.unreadCount,
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue
index 058305a7a..7ab8369be 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue
@@ -58,6 +58,7 @@ export default {
         notificationType,
       });
       this.$store.dispatch('notifications/read', {
+        id: notification.id,
         primaryActorId,
         primaryActorType,
         unreadCount: this.meta.unreadCount,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agents/AddAgent.vue b/app/javascript/dashboard/routes/dashboard/settings/agents/AddAgent.vue
index 17cc94be0..f2037b080 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agents/AddAgent.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agents/AddAgent.vue
@@ -130,15 +130,23 @@ export default {
         this.showAlert(this.$t('AGENT_MGMT.ADD.API.SUCCESS_MESSAGE'));
         this.onClose();
       } catch (error) {
-        const { response: { data: { error: errorResponse = '' } = {} } = {} } =
-          error;
+        const {
+          response: {
+            data: {
+              error: errorResponse = '',
+              attributes: attributes = [],
+              message: attrError = '',
+            } = {},
+          } = {},
+        } = error;
+
         let errorMessage = '';
-        if (error.response.status === 422) {
+        if (error.response.status === 422 && !attributes.includes('base')) {
           errorMessage = this.$t('AGENT_MGMT.ADD.API.EXIST_MESSAGE');
         } else {
           errorMessage = this.$t('AGENT_MGMT.ADD.API.ERROR_MESSAGE');
         }
-        this.showAlert(errorResponse || errorMessage);
+        this.showAlert(errorResponse || attrError || errorMessage);
       }
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
index 6ceb5faef..f6a7a5d8d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
@@ -143,9 +143,6 @@ export default {
             imap_login: this.login,
             imap_password: this.password,
             imap_enable_ssl: this.isSSLEnabled,
-            imap_inbox_synced_at: this.isIMAPEnabled
-              ? new Date().toISOString()
-              : undefined,
           },
         };
 
diff --git a/app/javascript/dashboard/store/modules/accounts.js b/app/javascript/dashboard/store/modules/accounts.js
index 4731ec2a7..c11312914 100644
--- a/app/javascript/dashboard/store/modules/accounts.js
+++ b/app/javascript/dashboard/store/modules/accounts.js
@@ -4,6 +4,9 @@ import AccountAPI from '../../api/account';
 import EnterpriseAccountAPI from '../../api/enterprise/account';
 import { throwErrorMessage } from '../utils/api';
 
+const findRecordById = ($state, id) =>
+  $state.records.find(record => record.id === Number(id)) || {};
+
 const state = {
   records: [],
   uiFlags: {
@@ -30,10 +33,15 @@ export const getters = {
         return true;
       }
 
-      const { features = {} } =
-        $state.records.find(record => record.id === Number(id)) || {};
+      const { features = {} } = findRecordById($state, id);
+
       return features[featureName] || false;
     },
+  // There are some features which can be enabled/disabled globally
+  isFeatureEnabledGlobally: $state => (id, featureName) => {
+    const { features = {} } = findRecordById($state, id);
+    return features[featureName] || false;
+  },
 };
 
 export const actions = {
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index cc1129970..d1952f43d 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -181,6 +181,14 @@ export const actions = {
       // Ignore error
     }
   },
+
+  resendConfirmation: async () => {
+    try {
+      await authAPI.resendConfirmation();
+    } catch (error) {
+      // Ignore error
+    }
+  },
 };
 
 // mutations
diff --git a/app/javascript/dashboard/store/modules/notifications/actions.js b/app/javascript/dashboard/store/modules/notifications/actions.js
index bf2f3f460..42245c8d9 100644
--- a/app/javascript/dashboard/store/modules/notifications/actions.js
+++ b/app/javascript/dashboard/store/modules/notifications/actions.js
@@ -9,7 +9,7 @@ export const actions = {
         data: {
           data: { payload, meta },
         },
-      } = await NotificationsAPI.get(page);
+      } = await NotificationsAPI.get({ page });
       commit(types.CLEAR_NOTIFICATIONS);
       commit(types.SET_NOTIFICATIONS, payload);
       commit(types.SET_NOTIFICATIONS_META, meta);
@@ -18,6 +18,29 @@ export const actions = {
       commit(types.SET_NOTIFICATIONS_UI_FLAG, { isFetching: false });
     }
   },
+  index: async ({ commit }, { page = 1, status, type, sortOrder } = {}) => {
+    commit(types.SET_NOTIFICATIONS_UI_FLAG, { isFetching: true });
+    try {
+      const {
+        data: {
+          data: { payload, meta },
+        },
+      } = await NotificationsAPI.get({
+        page,
+        status,
+        type,
+        sortOrder,
+      });
+      commit(types.SET_NOTIFICATIONS, payload);
+      commit(types.SET_NOTIFICATIONS_META, meta);
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isFetching: false });
+      if (payload.length < 15) {
+        commit(types.SET_ALL_NOTIFICATIONS_LOADED);
+      }
+    } catch (error) {
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isFetching: false });
+    }
+  },
   unReadCount: async ({ commit } = {}) => {
     commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdatingUnreadCount: true });
     try {
@@ -30,14 +53,26 @@ export const actions = {
   },
   read: async (
     { commit },
-    { primaryActorType, primaryActorId, unreadCount }
+    { id, primaryActorType, primaryActorId, unreadCount }
   ) => {
+    commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: true });
     try {
       await NotificationsAPI.read(primaryActorType, primaryActorId);
       commit(types.SET_NOTIFICATIONS_UNREAD_COUNT, unreadCount - 1);
-      commit(types.UPDATE_NOTIFICATION, primaryActorId);
+      commit(types.READ_NOTIFICATION, { id, read_at: new Date() });
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false });
     } catch (error) {
-      throw new Error(error);
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false });
+    }
+  },
+  unread: async ({ commit }, { id }) => {
+    commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: true });
+    try {
+      await NotificationsAPI.unRead(id);
+      commit(types.READ_NOTIFICATION, { id, read_at: null });
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false });
+    } catch (error) {
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false });
     }
   },
   readAll: async ({ commit }) => {
@@ -53,10 +88,75 @@ export const actions = {
     }
   },
 
+  delete: async ({ commit }, { notification, count, unreadCount }) => {
+    commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true });
+    try {
+      await NotificationsAPI.delete(notification.id);
+      commit(types.SET_NOTIFICATIONS_UNREAD_COUNT, unreadCount - 1);
+      commit(types.DELETE_NOTIFICATION, { notification, count, unreadCount });
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false });
+    } catch (error) {
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false });
+    }
+  },
+
+  deleteAllRead: async ({ commit }) => {
+    commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true });
+    try {
+      await NotificationsAPI.deleteAll({
+        type: 'read',
+      });
+      commit(types.DELETE_READ_NOTIFICATIONS);
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false });
+    } catch (error) {
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false });
+    }
+  },
+  deleteAll: async ({ commit }) => {
+    commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true });
+    try {
+      await NotificationsAPI.deleteAll({
+        type: 'all',
+      });
+      commit(types.DELETE_ALL_NOTIFICATIONS);
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false });
+    } catch (error) {
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false });
+    }
+  },
+
+  snooze: async ({ commit }, { id, snoozedUntil }) => {
+    commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await NotificationsAPI.snooze({
+        id,
+        snoozedUntil,
+      });
+
+      const {
+        data: { snoozed_until = null },
+      } = response;
+      commit(types.SNOOZE_NOTIFICATION, {
+        id,
+        snoozed_until,
+      });
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false });
+    } catch (error) {
+      commit(types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false });
+    }
+  },
+
+  updateNotification: async ({ commit }, data) => {
+    commit(types.UPDATE_NOTIFICATION, data);
+  },
+
   addNotification({ commit }, data) {
     commit(types.ADD_NOTIFICATION, data);
   },
   deleteNotification({ commit }, data) {
     commit(types.DELETE_NOTIFICATION, data);
   },
+  clear({ commit }) {
+    commit(types.CLEAR_NOTIFICATIONS);
+  },
 };
diff --git a/app/javascript/dashboard/store/modules/notifications/getters.js b/app/javascript/dashboard/store/modules/notifications/getters.js
index 6e9464697..b8df2b173 100644
--- a/app/javascript/dashboard/store/modules/notifications/getters.js
+++ b/app/javascript/dashboard/store/modules/notifications/getters.js
@@ -1,7 +1,19 @@
+import { applyInboxPageFilters, sortComparator } from './helpers';
+
 export const getters = {
   getNotifications($state) {
     return Object.values($state.records).sort((n1, n2) => n2.id - n1.id);
   },
+  getFilteredNotifications: $state => filters => {
+    const sortOrder = filters.sortOrder === 'desc' ? 'newest' : 'oldest';
+    const filteredNotifications = Object.values($state.records).filter(
+      notification => applyInboxPageFilters(notification, filters)
+    );
+    const sortedNotifications = filteredNotifications.sort((a, b) =>
+      sortComparator(a, b, sortOrder)
+    );
+    return sortedNotifications;
+  },
   getUIFlags($state) {
     return $state.uiFlags;
   },
diff --git a/app/javascript/dashboard/store/modules/notifications/helpers.js b/app/javascript/dashboard/store/modules/notifications/helpers.js
new file mode 100644
index 000000000..53c05c94e
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/notifications/helpers.js
@@ -0,0 +1,45 @@
+export const filterByStatus = (snoozedUntil, filterStatus) =>
+  filterStatus === 'snoozed' ? !!snoozedUntil : !snoozedUntil;
+
+export const filterByType = (readAt, filterType) =>
+  filterType === 'read' ? !!readAt : !readAt;
+
+export const filterByTypeAndStatus = (
+  readAt,
+  snoozedUntil,
+  filterType,
+  filterStatus
+) => {
+  const shouldFilterByStatus = filterByStatus(snoozedUntil, filterStatus);
+  const shouldFilterByType = filterByType(readAt, filterType);
+  return shouldFilterByStatus && shouldFilterByType;
+};
+
+export const applyInboxPageFilters = (notification, filters) => {
+  const { status, type } = filters;
+  const { read_at: readAt, snoozed_until: snoozedUntil } = notification;
+
+  if (status && type)
+    return filterByTypeAndStatus(readAt, snoozedUntil, type, status);
+  if (status && !type) return filterByStatus(snoozedUntil, status);
+  if (!status && type) return filterByType(readAt, type);
+  return true;
+};
+
+const INBOX_SORT_OPTIONS = {
+  newest: 'desc',
+  oldest: 'asc',
+};
+
+const sortConfig = {
+  newest: (a, b) => b.created_at - a.created_at,
+  oldest: (a, b) => a.created_at - b.created_at,
+};
+
+export const sortComparator = (a, b, sortOrder) => {
+  const sortDirection = INBOX_SORT_OPTIONS[sortOrder];
+  if (sortOrder === 'newest' || sortOrder === 'oldest') {
+    return sortConfig[sortOrder](a, b, sortDirection);
+  }
+  return 0;
+};
diff --git a/app/javascript/dashboard/store/modules/notifications/index.js b/app/javascript/dashboard/store/modules/notifications/index.js
index 149ac51c4..e3b31a637 100644
--- a/app/javascript/dashboard/store/modules/notifications/index.js
+++ b/app/javascript/dashboard/store/modules/notifications/index.js
@@ -13,7 +13,9 @@ const state = {
     isFetching: false,
     isFetchingItem: false,
     isUpdating: false,
+    isDeleting: false,
     isUpdatingUnreadCount: false,
+    isAllNotificationsLoaded: false,
   },
 };
 
diff --git a/app/javascript/dashboard/store/modules/notifications/mutations.js b/app/javascript/dashboard/store/modules/notifications/mutations.js
index 9d26b593c..3493de279 100644
--- a/app/javascript/dashboard/store/modules/notifications/mutations.js
+++ b/app/javascript/dashboard/store/modules/notifications/mutations.js
@@ -10,6 +10,7 @@ export const mutations = {
   },
   [types.CLEAR_NOTIFICATIONS]: $state => {
     Vue.set($state, 'records', {});
+    Vue.set($state.uiFlags, 'isAllNotificationsLoaded', false);
   },
   [types.SET_NOTIFICATIONS_META]: ($state, data) => {
     const {
@@ -33,12 +34,8 @@ export const mutations = {
       });
     });
   },
-  [types.UPDATE_NOTIFICATION]: ($state, primaryActorId) => {
-    Object.values($state.records).forEach(item => {
-      if (item.primary_actor_id === primaryActorId) {
-        Vue.set($state.records[item.id], 'read_at', true);
-      }
-    });
+  [types.READ_NOTIFICATION]: ($state, { id, read_at }) => {
+    Vue.set($state.records[id], 'read_at', read_at);
   },
   [types.UPDATE_ALL_NOTIFICATIONS]: $state => {
     Object.values($state.records).forEach(item => {
@@ -55,10 +52,37 @@ export const mutations = {
     Vue.set($state.meta, 'unreadCount', unreadCount);
     Vue.set($state.meta, 'count', count);
   },
+  [types.UPDATE_NOTIFICATION]($state, data) {
+    const { notification, unread_count: unreadCount, count } = data;
+    Vue.set($state.records, notification.id, {
+      ...($state.records[notification.id] || {}),
+      ...notification,
+    });
+    Vue.set($state.meta, 'unreadCount', unreadCount);
+    Vue.set($state.meta, 'count', count);
+  },
   [types.DELETE_NOTIFICATION]($state, data) {
     const { notification, unread_count: unreadCount, count } = data;
     Vue.delete($state.records, notification.id);
     Vue.set($state.meta, 'unreadCount', unreadCount);
     Vue.set($state.meta, 'count', count);
   },
+  [types.SET_ALL_NOTIFICATIONS_LOADED]: $state => {
+    Vue.set($state.uiFlags, 'isAllNotificationsLoaded', true);
+  },
+
+  [types.DELETE_READ_NOTIFICATIONS]: $state => {
+    Object.values($state.records).forEach(item => {
+      if (item.read_at) {
+        Vue.delete($state.records, item.id);
+      }
+    });
+  },
+  [types.DELETE_ALL_NOTIFICATIONS]: $state => {
+    Vue.set($state, 'records', {});
+  },
+
+  [types.SNOOZE_NOTIFICATION]: ($state, { id, snoozed_until }) => {
+    Vue.set($state.records[id], 'snoozed_until', snoozed_until);
+  },
 };
diff --git a/app/javascript/dashboard/store/modules/specs/account/getters.spec.js b/app/javascript/dashboard/store/modules/specs/account/getters.spec.js
index 39706cbbd..c8613b706 100644
--- a/app/javascript/dashboard/store/modules/specs/account/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/account/getters.spec.js
@@ -4,6 +4,10 @@ const accountData = {
   id: 1,
   name: 'Company one',
   locale: 'en',
+  features: {
+    auto_resolve_conversations: false,
+    agent_management: false,
+  },
 };
 
 describe('#getters', () => {
@@ -29,4 +33,32 @@ describe('#getters', () => {
       isDeleting: false,
     });
   });
+
+  it('isFeatureEnabledonAccount', () => {
+    const state = {
+      records: [accountData],
+    };
+    const rootGetters = {
+      getCurrentUser: {
+        type: 'SuperAdmin',
+      },
+    };
+    expect(
+      getters.isFeatureEnabledonAccount(
+        state,
+        null,
+        null,
+        rootGetters
+      )(1, 'auto_resolve_conversations')
+    ).toEqual(true);
+  });
+
+  it('isFeatureEnabledGlobally', () => {
+    const state = {
+      records: [accountData],
+    };
+    expect(
+      getters.isFeatureEnabledGlobally(state)(1, 'auto_resolve_conversations')
+    ).toEqual(false);
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js b/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
index c933333be..59ef88f4c 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
@@ -12,7 +12,7 @@ jest.mock('../../../utils/api', () => ({
   getHeaderExpiry: jest.fn(),
 }));
 jest.mock('js-cookie', () => ({
-  getJSON: jest.fn(),
+  get: jest.fn(),
 }));
 
 const commit = jest.fn();
@@ -155,14 +155,14 @@ describe('#actions', () => {
 
   describe('#setUser', () => {
     it('sends correct actions if user is logged in', async () => {
-      Cookies.getJSON.mockImplementation(() => true);
+      Cookies.get.mockImplementation(() => true);
       actions.setUser({ commit, dispatch });
       expect(commit.mock.calls).toEqual([]);
       expect(dispatch.mock.calls).toEqual([['validityCheck']]);
     });
 
     it('sends correct actions if user is not logged in', async () => {
-      Cookies.getJSON.mockImplementation(() => false);
+      Cookies.get.mockImplementation(() => false);
       actions.setUser({ commit, dispatch });
       expect(commit.mock.calls).toEqual([
         [types.default.CLEAR_USER],
diff --git a/app/javascript/dashboard/store/modules/specs/notifications/actions.spec.js b/app/javascript/dashboard/store/modules/specs/notifications/actions.spec.js
index 6c00e38ea..006c2e5af 100644
--- a/app/javascript/dashboard/store/modules/specs/notifications/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/notifications/actions.spec.js
@@ -1,7 +1,6 @@
 import axios from 'axios';
 import { actions } from '../../notifications/actions';
 import types from '../../../mutation-types';
-
 const commit = jest.fn();
 global.axios = axios;
 jest.mock('axios');
@@ -39,6 +38,38 @@ describe('#actions', () => {
     });
   });
 
+  describe('#index', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({
+        data: {
+          data: {
+            payload: [{ id: 1 }],
+            meta: { count: 3, current_page: 1, unread_count: 2 },
+          },
+        },
+      });
+      await actions.index({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isFetching: true }],
+        [types.SET_NOTIFICATIONS, [{ id: 1 }]],
+        [
+          types.SET_NOTIFICATIONS_META,
+          { count: 3, current_page: 1, unread_count: 2 },
+        ],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isFetching: false }],
+        [types.SET_ALL_NOTIFICATIONS_LOADED],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.index({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isFetching: true }],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
   describe('#unReadCount', () => {
     it('sends correct actions if API is success', async () => {
       axios.get.mockResolvedValue({ data: 1 });
@@ -62,18 +93,91 @@ describe('#actions', () => {
   describe('#read', () => {
     it('sends correct actions if API is success', async () => {
       axios.post.mockResolvedValue({});
-      await actions.read({ commit }, { unreadCount: 2, primaryActorId: 1 });
+      await actions.read(
+        { commit },
+        { id: 1, unreadCount: 2, primaryActorId: 1 }
+      );
       expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: true }],
         [types.SET_NOTIFICATIONS_UNREAD_COUNT, 1],
-        [types.UPDATE_NOTIFICATION, 1],
+        [types.READ_NOTIFICATION, { id: 1, read_at: expect.any(Date) }],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false }],
       ]);
     });
     it('sends correct actions if API is error', async () => {
       axios.post.mockRejectedValue({ message: 'Incorrect header' });
       await expect(actions.read({ commit })).rejects.toThrow(Error);
+      await actions.read(
+        { commit },
+        { id: 1, unreadCount: 2, primaryActorId: 1 }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: true }],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false }],
+      ]);
     });
   });
 
+  describe('#unread', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({});
+      await actions.unread({ commit }, { id: 1 });
+      expect(commit.mock.calls).toEqual([
+        ['SET_NOTIFICATIONS_UI_FLAG', { isUpdating: true }],
+        ['READ_NOTIFICATION', { id: 1, read_at: null }],
+        ['SET_NOTIFICATIONS_UI_FLAG', { isUpdating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.unread({ commit })).rejects.toThrow(Error);
+      await actions.unread({ commit }, { id: 1 });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: true }],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+  });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({});
+      await actions.delete(
+        { commit },
+        {
+          notification: { id: 1 },
+          count: 2,
+          unreadCount: 1,
+        }
+      );
+
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true }],
+        [types.SET_NOTIFICATIONS_UNREAD_COUNT, 0],
+        [
+          types.DELETE_NOTIFICATION,
+          { notification: { id: 1 }, count: 2, unreadCount: 1 },
+        ],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.delete({ commit })).rejects.toThrow(Error);
+      await actions.delete(
+        { commit },
+        {
+          notification: { id: 1 },
+          count: 2,
+          unreadCount: 1,
+        }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true }],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
   describe('#readAll', () => {
     it('sends correct actions if API is success', async () => {
       axios.post.mockResolvedValue({ data: 1 });
@@ -107,4 +211,76 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('clear', () => {
+    it('sends correct actions', async () => {
+      await actions.clear({ commit });
+      expect(commit.mock.calls).toEqual([[types.CLEAR_NOTIFICATIONS]]);
+    });
+  });
+
+  describe('deleteAllRead', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({});
+      await actions.deleteAllRead({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true }],
+        [types.DELETE_READ_NOTIFICATIONS],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.deleteAllRead({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true }],
+        [types.DELETE_READ_NOTIFICATIONS],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
+
+  describe('deleteAll', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({});
+      await actions.deleteAll({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true }],
+        [types.DELETE_ALL_NOTIFICATIONS],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.deleteAll({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: true }],
+        [types.DELETE_ALL_NOTIFICATIONS],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
+
+  describe('snooze', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({
+        data: { snoozed_until: '20 Jan, 5.04pm' },
+      });
+      await actions.snooze({ commit }, { id: 1, snoozedUntil: 1703057715 });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: true }],
+        [types.SNOOZE_NOTIFICATION, { id: 1, snoozed_until: '20 Jan, 5.04pm' }],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.snooze({ commit }, { id: 1, snoozedUntil: 1703057715 });
+
+      expect(commit.mock.calls).toEqual([
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: true }],
+        [types.SET_NOTIFICATIONS_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js b/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
index 35e2f1275..d557fca7a 100644
--- a/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
@@ -16,6 +16,32 @@ describe('#getters', () => {
     ]);
   });
 
+  it('getFilteredNotifications', () => {
+    const state = {
+      records: {
+        1: { id: 1, read_at: '2024-02-07T11:42:39.988Z', snoozed_until: null },
+        2: { id: 2, read_at: null, snoozed_until: null },
+        3: {
+          id: 3,
+          read_at: '2024-02-07T11:42:39.988Z',
+          snoozed_until: '2024-02-07T11:42:39.988Z',
+        },
+      },
+    };
+    const filters = {
+      type: 'read',
+      status: 'snoozed',
+      sortOrder: 'desc',
+    };
+    expect(getters.getFilteredNotifications(state)(filters)).toEqual([
+      {
+        id: 3,
+        read_at: '2024-02-07T11:42:39.988Z',
+        snoozed_until: '2024-02-07T11:42:39.988Z',
+      },
+    ]);
+  });
+
   it('getUIFlags', () => {
     const state = {
       uiFlags: {
diff --git a/app/javascript/dashboard/store/modules/specs/notifications/helpers.spec.js b/app/javascript/dashboard/store/modules/specs/notifications/helpers.spec.js
new file mode 100644
index 000000000..f5a9a3d9b
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/notifications/helpers.spec.js
@@ -0,0 +1,200 @@
+import {
+  filterByStatus,
+  filterByType,
+  filterByTypeAndStatus,
+  applyInboxPageFilters,
+  sortComparator,
+} from '../../notifications/helpers';
+
+const notifications = [
+  {
+    id: 1,
+    read_at: '2024-02-07T11:42:39.988Z',
+    snoozed_until: null,
+    created_at: 1707328400,
+  },
+  {
+    id: 2,
+    read_at: null,
+    snoozed_until: null,
+    created_at: 1707233688,
+  },
+  {
+    id: 3,
+    read_at: '2024-01-07T11:42:39.988Z',
+    snoozed_until: null,
+    created_at: 1707233672,
+  },
+  {
+    id: 4,
+    read_at: null,
+    snoozed_until: '2024-02-08T03:30:00.000Z',
+    created_at: 1707233667,
+  },
+  {
+    id: 5,
+    read_at: '2024-02-07T10:42:39.988Z',
+    snoozed_until: '2024-02-08T03:30:00.000Z',
+    created_at: 1707233662,
+  },
+  {
+    id: 6,
+    read_at: null,
+    snoozed_until: '2024-02-08T03:30:00.000Z',
+    created_at: 1707233561,
+  },
+];
+
+describe('#filterByStatus', () => {
+  it('returns the notifications with snoozed status', () => {
+    const filters = { status: 'snoozed' };
+    notifications.forEach(notification => {
+      expect(
+        filterByStatus(notification.snoozed_until, filters.status)
+      ).toEqual(notification.snoozed_until !== null);
+    });
+  });
+  it('returns true if the notification is snoozed', () => {
+    const filters = { status: 'snoozed' };
+    expect(
+      filterByStatus(notifications[3].snoozed_until, filters.status)
+    ).toEqual(true);
+  });
+  it('returns false if the notification is not snoozed', () => {
+    const filters = { status: 'snoozed' };
+    expect(
+      filterByStatus(notifications[2].snoozed_until, filters.status)
+    ).toEqual(false);
+  });
+});
+
+describe('#filterByType', () => {
+  it('returns the notifications with read status', () => {
+    const filters = { type: 'read' };
+    notifications.forEach(notification => {
+      expect(filterByType(notification.read_at, filters.type)).toEqual(
+        notification.read_at !== null
+      );
+    });
+  });
+  it('returns true if the notification is read', () => {
+    const filters = { type: 'read' };
+    expect(filterByType(notifications[0].read_at, filters.type)).toEqual(true);
+  });
+  it('returns false if the notification is not read', () => {
+    const filters = { type: 'read' };
+    expect(filterByType(notifications[1].read_at, filters.type)).toEqual(false);
+  });
+});
+
+describe('#filterByTypeAndStatus', () => {
+  it('returns the notifications with type and status', () => {
+    const filters = { type: 'read', status: 'snoozed' };
+    notifications.forEach(notification => {
+      expect(
+        filterByTypeAndStatus(
+          notification.read_at,
+          notification.snoozed_until,
+          filters.type,
+          filters.status
+        )
+      ).toEqual(
+        notification.read_at !== null && notification.snoozed_until !== null
+      );
+    });
+  });
+  it('returns true if the notification is read and snoozed', () => {
+    const filters = { type: 'read', status: 'snoozed' };
+    expect(
+      filterByTypeAndStatus(
+        notifications[4].read_at,
+        notifications[4].snoozed_until,
+        filters.type,
+        filters.status
+      )
+    ).toEqual(true);
+  });
+  it('returns false if the notification is not read and snoozed', () => {
+    const filters = { type: 'read', status: 'snoozed' };
+    expect(
+      filterByTypeAndStatus(
+        notifications[3].read_at,
+        notifications[3].snoozed_until,
+        filters.type,
+        filters.status
+      )
+    ).toEqual(false);
+  });
+});
+
+describe('#applyInboxPageFilters', () => {
+  it('returns the notifications with type and status', () => {
+    const filters = { type: 'read', status: 'snoozed' };
+    notifications.forEach(notification => {
+      expect(applyInboxPageFilters(notification, filters)).toEqual(
+        filterByTypeAndStatus(
+          notification.read_at,
+          notification.snoozed_until,
+          filters.type,
+          filters.status
+        )
+      );
+    });
+  });
+  it('returns the notifications with type only', () => {
+    const filters = { type: 'read', status: null };
+    notifications.forEach(notification => {
+      expect(applyInboxPageFilters(notification, filters)).toEqual(
+        filterByType(notification.read_at, filters.type)
+      );
+    });
+  });
+  it('returns the notifications with status only', () => {
+    const filters = { type: null, status: 'snoozed' };
+    notifications.forEach(notification => {
+      expect(applyInboxPageFilters(notification, filters)).toEqual(
+        filterByStatus(notification.snoozed_until, filters.status)
+      );
+    });
+  });
+  it('returns true if there are no filters', () => {
+    const filters = { type: null, status: null };
+    notifications.forEach(notification => {
+      expect(applyInboxPageFilters(notification, filters)).toEqual(true);
+    });
+  });
+});
+
+describe('#sortComparator', () => {
+  it('returns the notifications sorted by newest', () => {
+    const sortOrder = 'newest';
+    const sortedNotifications = [...notifications].sort((a, b) =>
+      sortComparator(a, b, sortOrder)
+    );
+    const expectedOrder = [
+      notifications[0],
+      notifications[1],
+      notifications[2],
+      notifications[3],
+      notifications[4],
+      notifications[5],
+    ].sort((a, b) => b.created_at - a.created_at);
+    expect(sortedNotifications).toEqual(expectedOrder);
+  });
+
+  it('returns the notifications sorted by oldest', () => {
+    const sortOrder = 'oldest';
+    const sortedNotifications = [...notifications].sort((a, b) =>
+      sortComparator(a, b, sortOrder)
+    );
+    const expectedOrder = [
+      notifications[0],
+      notifications[1],
+      notifications[2],
+      notifications[3],
+      notifications[4],
+      notifications[5],
+    ].sort((a, b) => a.created_at - b.created_at);
+    expect(sortedNotifications).toEqual(expectedOrder);
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/notifications/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/notifications/mutations.spec.js
index 25d4ea506..3d1fa00c5 100644
--- a/app/javascript/dashboard/store/modules/specs/notifications/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/notifications/mutations.spec.js
@@ -12,7 +12,10 @@ describe('#mutations', () => {
 
   describe('#CLEAR_NOTIFICATIONS', () => {
     it('clear notifications', () => {
-      const state = { records: { 1: { id: 1 } } };
+      const state = {
+        records: { 1: { id: 1 } },
+        uiFlags: { isAllNotificationsLoaded: true },
+      };
       mutations[types.CLEAR_NOTIFICATIONS](state);
       expect(state.records).toEqual({});
     });
@@ -72,7 +75,10 @@ describe('#mutations', () => {
           1: { id: 1, primary_actor_id: 1 },
         },
       };
-      mutations[types.UPDATE_NOTIFICATION](state, 1);
+      mutations[types.READ_NOTIFICATION](state, {
+        id: 1,
+        read_at: true,
+      });
       expect(state.records).toEqual({
         1: { id: 1, primary_actor_id: 1, read_at: true },
       });
@@ -141,4 +147,40 @@ describe('#mutations', () => {
       expect(state.meta.count).toEqual(232);
     });
   });
+
+  describe('#SET_ALL_NOTIFICATIONS_LOADED', () => {
+    it('set all notifications loaded', () => {
+      const state = { uiFlags: { isAllNotificationsLoaded: false } };
+      mutations[types.SET_ALL_NOTIFICATIONS_LOADED](state);
+      expect(state.uiFlags).toEqual({ isAllNotificationsLoaded: true });
+    });
+  });
+
+  describe('#DELETE_READ_NOTIFICATIONS', () => {
+    it('delete read notifications', () => {
+      const state = {
+        records: {
+          1: { id: 1, primary_actor_id: 1, read_at: true },
+          2: { id: 2, primary_actor_id: 2 },
+        },
+      };
+      mutations[types.DELETE_READ_NOTIFICATIONS](state);
+      expect(state.records).toEqual({
+        2: { id: 2, primary_actor_id: 2 },
+      });
+    });
+  });
+
+  describe('#DELETE_ALL_NOTIFICATIONS', () => {
+    it('delete all notifications', () => {
+      const state = {
+        records: {
+          1: { id: 1, primary_actor_id: 1, read_at: true },
+          2: { id: 2, primary_actor_id: 2 },
+        },
+      };
+      mutations[types.DELETE_ALL_NOTIFICATIONS](state);
+      expect(state.records).toEqual({});
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 9ed133993..c9d2d1767 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -132,6 +132,7 @@ export default {
   SET_NOTIFICATIONS_UNREAD_COUNT: 'SET_NOTIFICATIONS_UNREAD_COUNT',
   SET_NOTIFICATIONS_UI_FLAG: 'SET_NOTIFICATIONS_UI_FLAG',
   UPDATE_NOTIFICATION: 'UPDATE_NOTIFICATION',
+  READ_NOTIFICATION: 'READ_NOTIFICATION',
   ADD_NOTIFICATION: 'ADD_NOTIFICATION',
   DELETE_NOTIFICATION: 'DELETE_NOTIFICATION',
   UPDATE_ALL_NOTIFICATIONS: 'UPDATE_ALL_NOTIFICATIONS',
@@ -140,6 +141,10 @@ export default {
   CLEAR_NOTIFICATIONS: 'CLEAR_NOTIFICATIONS',
   EDIT_NOTIFICATIONS: 'EDIT_NOTIFICATIONS',
   UPDATE_NOTIFICATIONS_PRESENCE: 'UPDATE_NOTIFICATIONS_PRESENCE',
+  SET_ALL_NOTIFICATIONS_LOADED: 'SET_ALL_NOTIFICATIONS_LOADED',
+  DELETE_READ_NOTIFICATIONS: 'DELETE_READ_NOTIFICATIONS',
+  DELETE_ALL_NOTIFICATIONS: 'DELETE_ALL_NOTIFICATIONS',
+  SNOOZE_NOTIFICATION: 'SNOOZE_NOTIFICATION',
 
   // Contact Conversation
   SET_CONTACT_CONVERSATIONS_UI_FLAG: 'SET_CONTACT_CONVERSATIONS_UI_FLAG',
diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js
index 79e8bc6c3..1da4c6643 100644
--- a/app/javascript/dashboard/store/utils/api.js
+++ b/app/javascript/dashboard/store/utils/api.js
@@ -27,7 +27,7 @@ export const getHeaderExpiry = response =>
 
 export const setAuthCredentials = response => {
   const expiryDate = getHeaderExpiry(response);
-  Cookies.set('cw_d_session_info', response.headers, {
+  Cookies.set('cw_d_session_info', JSON.stringify(response.headers), {
     expires: differenceInDays(expiryDate, new Date()),
   });
   setUser(response.data.data, expiryDate);
diff --git a/app/javascript/sdk/cookieHelpers.js b/app/javascript/sdk/cookieHelpers.js
index 64a7afbf7..286e01317 100644
--- a/app/javascript/sdk/cookieHelpers.js
+++ b/app/javascript/sdk/cookieHelpers.js
@@ -34,5 +34,12 @@ export const setCookieWithDomain = (
     domain: baseDomain,
   };
 
+  // if type of value is object, stringify it
+  // this is because js-cookies 3.0 removed builtin json support
+  // ref: https://github.com/js-cookie/js-cookie/releases/tag/v3.0.0
+  if (typeof value === 'object') {
+    value = JSON.stringify(value);
+  }
+
   Cookies.set(name, value, cookieOptions);
 };
diff --git a/app/javascript/sdk/specs/cookieHelpers.spec.js b/app/javascript/sdk/specs/cookieHelpers.spec.js
index 7da09315f..6ede978fc 100644
--- a/app/javascript/sdk/specs/cookieHelpers.spec.js
+++ b/app/javascript/sdk/specs/cookieHelpers.spec.js
@@ -107,6 +107,26 @@ describe('setCookieWithDomain', () => {
     );
   });
 
+  it('should stringify the cookie value when setting', () => {
+    setCookieWithDomain(
+      'myCookie',
+      { value: 'cookieValue' },
+      {
+        baseDomain: 'example.com',
+      }
+    );
+
+    expect(Cookies.set).toHaveBeenCalledWith(
+      'myCookie',
+      JSON.stringify({ value: 'cookieValue' }),
+      expect.objectContaining({
+        expires: 365,
+        sameSite: 'Lax',
+        domain: 'example.com',
+      })
+    );
+  });
+
   it('should set a cookie with custom expiration, sameSite attribute, and specific base domain', () => {
     setCookieWithDomain('myCookie', 'cookieValue', {
       expires: 7,
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 93a876346..678045469 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -125,6 +125,7 @@
   "location-outline": "M5.843 4.568a8.707 8.707 0 1 1 12.314 12.314l-1.187 1.174c-.875.858-2.01 1.962-3.406 3.312a2.25 2.25 0 0 1-3.128 0l-3.491-3.396c-.439-.431-.806-.794-1.102-1.09a8.707 8.707 0 0 1 0-12.314Zm11.253 1.06A7.207 7.207 0 1 0 6.904 15.822L8.39 17.29a753.98 753.98 0 0 0 3.088 3 .75.75 0 0 0 1.043 0l3.394-3.3c.47-.461.863-.85 1.18-1.168a7.207 7.207 0 0 0 0-10.192ZM12 7.999a3.002 3.002 0 1 1 0 6.004 3.002 3.002 0 0 1 0-6.003Zm0 1.5a1.501 1.501 0 1 0 0 3.004 1.501 1.501 0 0 0 0-3.003Z",
   "lock-closed-outline": "M12 2a4 4 0 0 1 4 4v2h1.75A2.25 2.25 0 0 1 20 10.25v9.5A2.25 2.25 0 0 1 17.75 22H6.25A2.25 2.25 0 0 1 4 19.75v-9.5A2.25 2.25 0 0 1 6.25 8H8V6a4 4 0 0 1 4-4Zm5.75 7.5H6.25a.75.75 0 0 0-.75.75v9.5c0 .414.336.75.75.75h11.5a.75.75 0 0 0 .75-.75v-9.5a.75.75 0 0 0-.75-.75Zm-5.75 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm0-10A2.5 2.5 0 0 0 9.5 6v2h5V6A2.5 2.5 0 0 0 12 3.5Z",
   "lock-shield-outline": "M10 2a4 4 0 0 1 4 4v2h1.75A2.25 2.25 0 0 1 18 10.25V11c-.319 0-.637.11-.896.329l-.107.1c-.164.17-.33.323-.496.457L16.5 10.25a.75.75 0 0 0-.75-.75H4.25a.75.75 0 0 0-.75.75v9.5c0 .414.336.75.75.75h9.888a6.024 6.024 0 0 0 1.54 1.5H4.25A2.25 2.25 0 0 1 2 19.75v-9.5A2.25 2.25 0 0 1 4.25 8H6V6a4 4 0 0 1 4-4Zm8.284 10.122c.992 1.036 2.091 1.545 3.316 1.545.193 0 .355.143.392.332l.008.084v2.501c0 2.682-1.313 4.506-3.873 5.395a.385.385 0 0 1-.253 0c-2.476-.86-3.785-2.592-3.87-5.13L14 16.585v-2.5c0-.23.18-.417.4-.417 1.223 0 2.323-.51 3.318-1.545a.389.389 0 0 1 .566 0ZM10 13.5a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm0-10A2.5 2.5 0 0 0 7.5 6v2h5V6A2.5 2.5 0 0 0 10 3.5Z",
+  "mail-inbox-outline": "M6.25 3h11.5a3.25 3.25 0 0 1 3.245 3.066L21 6.25v11.5a3.25 3.25 0 0 1-3.066 3.245L17.75 21H6.25a3.25 3.25 0 0 1-3.245-3.066L3 17.75V6.25a3.25 3.25 0 0 1 3.066-3.245L6.25 3h11.5h-11.5ZM4.5 14.5v3.25a1.75 1.75 0 0 0 1.606 1.744l.144.006h11.5a1.75 1.75 0 0 0 1.744-1.607l.006-.143V14.5h-3.825a3.752 3.752 0 0 1-3.475 2.995l-.2.005a3.752 3.752 0 0 1-3.632-2.812l-.043-.188H4.5v3.25v-3.25Zm13.25-10H6.25a1.75 1.75 0 0 0-1.744 1.606L4.5 6.25V13H9a.75.75 0 0 1 .743.648l.007.102a2.25 2.25 0 0 0 4.495.154l.005-.154a.75.75 0 0 1 .648-.743L15 13h4.5V6.25a1.75 1.75 0 0 0-1.607-1.744L17.75 4.5Z",
   "mail-inbox-all-outline": "M6.25 3h11.5a3.25 3.25 0 0 1 3.245 3.066L21 6.25v11.5a3.25 3.25 0 0 1-3.066 3.245L17.75 21H6.25a3.25 3.25 0 0 1-3.245-3.066L3 17.75V6.25a3.25 3.25 0 0 1 3.066-3.245L6.25 3Zm2.075 11.5H4.5v3.25a1.75 1.75 0 0 0 1.606 1.744l.144.006h11.5a1.75 1.75 0 0 0 1.744-1.607l.006-.143V14.5h-3.825a3.752 3.752 0 0 1-3.475 2.995l-.2.005a3.752 3.752 0 0 1-3.632-2.812l-.043-.188Zm9.425-10H6.25a1.75 1.75 0 0 0-1.744 1.606L4.5 6.25V13H9a.75.75 0 0 1 .743.648l.007.102a2.25 2.25 0 0 0 4.495.154l.005-.154a.75.75 0 0 1 .648-.743L15 13h4.5V6.25a1.75 1.75 0 0 0-1.607-1.744L17.75 4.5Zm-11 5h10.5a.75.75 0 0 1 .102 1.493L17.25 11H6.75a.75.75 0 0 1-.102-1.493L6.75 9.5h10.5-10.5Zm0-3h10.5a.75.75 0 0 1 .102 1.493L17.25 8H6.75a.75.75 0 0 1-.102-1.493L6.75 6.5h10.5-10.5Z",
   "mail-unread-outline": "M16 6.5H5.25a1.75 1.75 0 0 0-1.744 1.606l-.004.1L11 12.153l6.03-3.174a3.489 3.489 0 0 0 2.97.985v6.786a3.25 3.25 0 0 1-3.066 3.245L16.75 20H5.25a3.25 3.25 0 0 1-3.245-3.066L2 16.75v-8.5a3.25 3.25 0 0 1 3.066-3.245L5.25 5h11.087A3.487 3.487 0 0 0 16 6.5Zm2.5 3.399-7.15 3.765a.75.75 0 0 1-.603.042l-.096-.042L3.5 9.9v6.85a1.75 1.75 0 0 0 1.606 1.744l.144.006h11.5a1.75 1.75 0 0 0 1.744-1.607l.006-.143V9.899ZM19.5 4a2.5 2.5 0 1 1 0 5 2.5 2.5 0 0 1 0-5Z",
   "mail-outline": "M5.25 4h13.5a3.25 3.25 0 0 1 3.245 3.066L22 7.25v9.5a3.25 3.25 0 0 1-3.066 3.245L18.75 20H5.25a3.25 3.25 0 0 1-3.245-3.066L2 16.75v-9.5a3.25 3.25 0 0 1 3.066-3.245L5.25 4h13.5-13.5ZM20.5 9.373l-8.15 4.29a.75.75 0 0 1-.603.043l-.096-.042L3.5 9.374v7.376a1.75 1.75 0 0 0 1.606 1.744l.144.006h13.5a1.75 1.75 0 0 0 1.744-1.607l.006-.143V9.373ZM18.75 5.5H5.25a1.75 1.75 0 0 0-1.744 1.606L3.5 7.25v.429l8.5 4.473 8.5-4.474V7.25a1.75 1.75 0 0 0-1.607-1.744L18.75 5.5Z",
diff --git a/app/javascript/v3/components/Form/Input.vue b/app/javascript/v3/components/Form/Input.vue
index f105e1137..f48708a26 100644
--- a/app/javascript/v3/components/Form/Input.vue
+++ b/app/javascript/v3/components/Form/Input.vue
@@ -1,44 +1,40 @@
 <template>
-  <div>
-    <label
-      v-if="label"
-      :for="name"
-      class="flex justify-between text-sm font-medium leading-6 text-slate-900 dark:text-white"
-      :class="{ 'text-red-500': hasError }"
-    >
-      {{ label }}
-      <slot />
-    </label>
-    <div class="mt-1">
-      <input
-        :id="name"
-        :name="name"
-        :type="type"
-        autocomplete="off"
-        :required="required"
-        :placeholder="placeholder"
-        :data-testid="dataTestid"
-        :value="value"
-        :class="{
-          'focus:ring-red-600 ring-red-600': hasError,
-          'dark:ring-slate-600 dark:focus:ring-woot-500 ring-slate-200':
-            !hasError,
-        }"
-        class="block w-full rounded-md border-0 px-3 py-3 appearance-none shadow-sm ring-1 ring-inset text-slate-900 dark:text-slate-100 placeholder:text-slate-400 focus:ring-2 focus:ring-inset focus:ring-woot-500 sm:text-sm sm:leading-6 outline-none dark:bg-slate-700"
-        @input="onInput"
-        @blur="$emit('blur')"
-      />
-      <span
-        v-if="errorMessage && hasError"
-        class="text-xs leading-2 text-red-400"
-      >
-        {{ errorMessage }}
-      </span>
-    </div>
-  </div>
+  <with-label
+    :label="label"
+    :icon="icon"
+    :name="name"
+    :has-error="hasError"
+    :error-message="errorMessage"
+  >
+    <input
+      :id="name"
+      :name="name"
+      :type="type"
+      autocomplete="off"
+      :required="required"
+      :placeholder="placeholder"
+      :data-testid="dataTestid"
+      :value="value"
+      :class="{
+        'focus:ring-red-600 ring-red-600': hasError,
+        'dark:ring-slate-600 dark:focus:ring-woot-500 ring-slate-200':
+          !hasError,
+        'px-3 py-3': spacing === 'base',
+        'px-3 py-2 mb-0': spacing === 'compact',
+        'pl-9': icon,
+      }"
+      class="block w-full border-none rounded-xl shadow-sm appearance-none outline outline-1 outline-slate-200 dark:outline-slate-800 focus:outline-none focus:outline-0 text-slate-900 dark:text-slate-100 placeholder:text-slate-400 focus:ring-2 focus:ring-woot-500 sm:text-sm sm:leading-6 dark:bg-slate-800"
+      @input="onInput"
+      @blur="$emit('blur')"
+    />
+  </with-label>
 </template>
 <script>
+import WithLabel from './WithLabel.vue';
 export default {
+  components: {
+    WithLabel,
+  },
   props: {
     label: {
       type: String,
@@ -64,6 +60,10 @@ export default {
       type: [String, Number],
       default: '',
     },
+    icon: {
+      type: String,
+      default: '',
+    },
     hasError: {
       type: Boolean,
       default: false,
@@ -76,6 +76,11 @@ export default {
       type: String,
       default: '',
     },
+    spacing: {
+      type: String,
+      default: 'base',
+      validator: value => ['base', 'compact'].includes(value),
+    },
   },
   methods: {
     onInput(e) {
diff --git a/app/javascript/v3/components/Form/RadioTags.vue b/app/javascript/v3/components/Form/RadioTags.vue
new file mode 100644
index 000000000..7cb221132
--- /dev/null
+++ b/app/javascript/v3/components/Form/RadioTags.vue
@@ -0,0 +1,60 @@
+<template>
+  <with-label
+    :label="label"
+    :name="name"
+    :has-error="hasError"
+    :error-message="errorMessage"
+  >
+    <div class="flex gap-2 flex-wrap">
+      <woot-button
+        v-for="option in options"
+        :key="option.value"
+        :variant="value === option.value ? '' : 'hollow'"
+        :color-scheme="value === option.value ? 'primary' : 'secondary'"
+        size="small"
+        @click="$emit('input', option.value)"
+      >
+        {{ option.label }}
+      </woot-button>
+    </div>
+  </with-label>
+</template>
+
+<script>
+import WithLabel from './WithLabel.vue';
+export default {
+  components: {
+    WithLabel,
+  },
+  props: {
+    id: {
+      type: String,
+      default: '',
+    },
+    options: {
+      type: Array,
+      default: () => [],
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    label: {
+      type: String,
+      required: true,
+    },
+    value: {
+      type: String,
+      default: '',
+    },
+    hasError: {
+      type: Boolean,
+      default: false,
+    },
+    errorMessage: {
+      type: String,
+      default: '',
+    },
+  },
+};
+</script>
diff --git a/app/javascript/v3/components/Form/Select.vue b/app/javascript/v3/components/Form/Select.vue
new file mode 100644
index 000000000..f04f3b312
--- /dev/null
+++ b/app/javascript/v3/components/Form/Select.vue
@@ -0,0 +1,92 @@
+<template>
+  <with-label
+    :label="label"
+    :icon="icon"
+    :name="name"
+    :has-error="hasError"
+    :error-message="errorMessage"
+  >
+    <select
+      :id="id"
+      :selected="value"
+      :name="name"
+      :class="{
+        'text-slate-400': !value,
+        'text-slate-900 dark:text-slate-100': value,
+        'pl-9': icon,
+      }"
+      class="mb-0 block w-full px-3 py-2 pr-6 border-0 rounded-xl 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"
+      @input="onInput"
+    >
+      <option value="" disabled selected class="hidden">
+        {{ placeholder }}
+      </option>
+      <slot>
+        <option v-for="opt in options" :key="opt.value" :value="opt.value">
+          {{ opt.label }}
+        </option>
+      </slot>
+    </select>
+  </with-label>
+</template>
+
+<script>
+import WithLabel from './WithLabel.vue';
+export default {
+  components: {
+    WithLabel,
+  },
+  props: {
+    id: {
+      type: String,
+      default: '',
+    },
+    options: {
+      type: Array,
+      default: () => [],
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    icon: {
+      type: String,
+      default: '',
+    },
+    label: {
+      type: String,
+      required: true,
+    },
+    value: {
+      type: String,
+      default: '',
+    },
+    hasError: {
+      type: Boolean,
+      default: false,
+    },
+    errorMessage: {
+      type: String,
+      default: '',
+    },
+  },
+  methods: {
+    onInput(e) {
+      this.$emit('input', e.target.value);
+    },
+  },
+};
+</script>
+<style scoped>
+.select-caret {
+  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: rgb%28110, 111, 115%29'></polygon></svg>");
+  background-origin: content-box;
+  background-position: right -1rem center;
+  background-repeat: no-repeat;
+  background-size: 9px 6px;
+}
+</style>
diff --git a/app/javascript/v3/components/Form/WithLabel.vue b/app/javascript/v3/components/Form/WithLabel.vue
new file mode 100644
index 000000000..d8c339a53
--- /dev/null
+++ b/app/javascript/v3/components/Form/WithLabel.vue
@@ -0,0 +1,57 @@
+<template>
+  <div class="space-y-1">
+    <label
+      v-if="label"
+      :for="name"
+      class="flex justify-between text-sm font-medium leading-6 text-slate-900 dark:text-white"
+      :class="{ 'text-red-500': hasError }"
+    >
+      <slot name="label">
+        {{ label }}
+      </slot>
+    </label>
+    <div class="w-full">
+      <div class="flex items-center relative w-full">
+        <fluent-icon
+          v-if="icon"
+          size="16"
+          :icon="icon"
+          class="absolute left-2 transform text-slate-400 dark:text-slate-600 w-5 h-5"
+        />
+        <slot />
+      </div>
+      <span
+        v-if="errorMessage && hasError"
+        class="text-xs text-red-400 leading-2"
+      >
+        {{ errorMessage }}
+      </span>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    label: {
+      type: String,
+      default: '',
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    icon: {
+      type: String,
+      default: '',
+    },
+    hasError: {
+      type: Boolean,
+      default: false,
+    },
+    errorMessage: {
+      type: String,
+      default: '',
+    },
+  },
+};
+</script>
diff --git a/app/javascript/v3/helpers/AuthHelper.js b/app/javascript/v3/helpers/AuthHelper.js
index 1eaea34e6..70df55331 100644
--- a/app/javascript/v3/helpers/AuthHelper.js
+++ b/app/javascript/v3/helpers/AuthHelper.js
@@ -3,7 +3,7 @@ import { DEFAULT_REDIRECT_URL } from 'dashboard/constants/globals';
 import { frontendURL } from 'dashboard/helper/URLHelper';
 
 export const hasAuthCookie = () => {
-  return !!Cookies.getJSON('cw_d_session_info');
+  return !!Cookies.get('cw_d_session_info');
 };
 
 const getSSOAccountPath = ({ ssoAccountId, user }) => {
diff --git a/app/javascript/v3/helpers/specs/RouteHelper.spec.js b/app/javascript/v3/helpers/specs/RouteHelper.spec.js
index 9c699a44f..8481a8ff4 100644
--- a/app/javascript/v3/helpers/specs/RouteHelper.spec.js
+++ b/app/javascript/v3/helpers/specs/RouteHelper.spec.js
@@ -10,10 +10,10 @@ jest.mock('dashboard/store/utils/api', () => ({
 jest.mock('../CommonHelper', () => ({ replaceRouteWithReload: jest.fn() }));
 
 jest.mock('js-cookie', () => ({
-  getJSON: jest.fn(),
+  get: jest.fn(),
 }));
 
-Cookies.getJSON.mockReturnValueOnce(true).mockReturnValue(false);
+Cookies.get.mockReturnValueOnce(true).mockReturnValue(false);
 describe('#validateRouteAccess', () => {
   it('reset cookies and continues to the login page if the SSO parameters are present', () => {
     validateRouteAccess(
@@ -40,7 +40,7 @@ describe('#validateRouteAccess', () => {
   });
 
   it('redirects to dashboard if auth cookie is present', () => {
-    Cookies.getJSON.mockImplementation(() => true);
+    Cookies.get.mockImplementation(() => true);
     validateRouteAccess({ name: 'login' }, next);
     expect(clearBrowserSessionCookies).not.toHaveBeenCalled();
     expect(replaceRouteWithReload).toHaveBeenCalledWith('/app/');
diff --git a/app/javascript/v3/views/onboarding/OnboardingStep.vue b/app/javascript/v3/views/onboarding/OnboardingStep.vue
new file mode 100644
index 000000000..2ef6da67d
--- /dev/null
+++ b/app/javascript/v3/views/onboarding/OnboardingStep.vue
@@ -0,0 +1,54 @@
+<template>
+  <div
+    class="flex items-center gap-2 p-2 text-lg font-bold mb-6 relative before:absolute before:h-10 before:w-[1px] before:bg-slate-200 before:-bottom-8 before:left-[24px] hide-before-of-last"
+    :class="{
+      'text-woot-500 ': isActive,
+      'text-slate-400': !isActive || isComplete,
+      'before:bg-woot-500': !isActive && isComplete,
+    }"
+  >
+    <div
+      class="grid w-8 h-8 border border-solid rounded-full place-content-center"
+      :class="{
+        'border-woot-500': !isActive || isComplete,
+        'border-slate-200 dark:border-slate-600': !isActive && !isComplete,
+        'text-woot-500': isComplete,
+      }"
+    >
+      <fluent-icon v-if="isComplete" size="20" icon="checkmark" />
+      <fluent-icon v-else size="20" :icon="icon" />
+    </div>
+    <span>
+      {{ title }}
+    </span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'OnboardingStep',
+  props: {
+    title: {
+      type: String,
+      required: true,
+    },
+    icon: {
+      type: String,
+      required: true,
+    },
+    isActive: {
+      type: Boolean,
+      default: false,
+    },
+    isComplete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+};
+</script>
+<style scoped>
+.hide-before-of-last:last-child::before {
+  display: none;
+}
+</style>
diff --git a/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb b/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
index ade3eb082..6a5e6cb2b 100644
--- a/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
+++ b/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
@@ -2,8 +2,10 @@ class Channels::Whatsapp::TemplatesSyncSchedulerJob < ApplicationJob
   queue_as :low
 
   def perform
-    Channel::Whatsapp.where('message_templates_last_updated <= ? OR message_templates_last_updated IS NULL',
-                            3.hours.ago).limit(Limits::BULK_EXTERNAL_HTTP_CALLS_LIMIT).all.each do |channel|
+    Channel::Whatsapp.order(Arel.sql('message_templates_last_updated IS NULL DESC, message_templates_last_updated ASC'))
+                     .where('message_templates_last_updated <= ? OR message_templates_last_updated IS NULL', 3.hours.ago)
+                     .limit(Limits::BULK_EXTERNAL_HTTP_CALLS_LIMIT)
+                     .each do |channel|
       Channels::Whatsapp::TemplatesSyncJob.perform_later(channel)
     end
   end
diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 8f61e54b5..c32e6eee2 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -6,7 +6,8 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
   def perform(channel)
     return unless should_fetch_email?(channel)
 
-    with_lock(::Redis::Alfred::EMAIL_MESSAGE_MUTEX, inbox_id: channel.inbox.id) do
+    key = format(::Redis::Alfred::EMAIL_MESSAGE_MUTEX, inbox_id: channel.inbox.id)
+    with_lock(key, 5.minutes) do
       process_email_for_channel(channel)
     end
   rescue *ExceptionList::IMAP_EXCEPTIONS => e
@@ -50,6 +51,11 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
 
     return if email_already_present?(channel, message_id)
 
+    if message_id.blank?
+      Rails.logger.info "[IMAP::FETCH_EMAIL_SERVICE] Empty message id for #{channel.email} with seq no. <#{seq_no}>."
+      return
+    end
+
     # Fetch the original mail content using the sequence no
     mail_str = imap_client.fetch(seq_no, 'RFC822')[0].attr['RFC822']
 
@@ -73,7 +79,7 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
     message_ids_with_seq = []
     seq_nums.each_slice(10).each do |batch|
       # Fetch only message-id only without mail body or contents.
-      batch_message_ids = imap_client.fetch(batch, 'BODY.PEEK[HEADER.FIELDS (MESSAGE-ID)]')
+      batch_message_ids = imap_client.fetch(batch, 'BODY.PEEK[HEADER]')
 
       # .fetch returns an array of Net::IMAP::FetchData or nil
       # (instead of an empty array) if there is no matching message.
@@ -84,7 +90,7 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
       end
 
       batch_message_ids.each do |data|
-        message_id = build_mail_from_string(data.attr['BODY[HEADER.FIELDS (MESSAGE-ID)]']).message_id
+        message_id = build_mail_from_string(data.attr['BODY[HEADER]']).message_id
         message_ids_with_seq.push([data.seqno, message_id])
       end
     end
@@ -96,7 +102,7 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
   # created between yesterday and today and returns message sequence numbers.
   # Return <message set>
   def fetch_available_mail_sequence_numbers(imap_client)
-    imap_client.search(['BEFORE', tomorrow, 'SINCE', yesterday])
+    imap_client.search(['SINCE', yesterday])
   end
 
   def fetch_mail_for_ms_provider(channel)
@@ -160,8 +166,4 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
   def yesterday
     (Time.zone.today - 1).strftime('%d-%b-%Y')
   end
-
-  def tomorrow
-    (Time.zone.today + 1).strftime('%d-%b-%Y')
-  end
 end
diff --git a/app/jobs/internal/check_new_versions_job.rb b/app/jobs/internal/check_new_versions_job.rb
index be51e7530..a141385d0 100644
--- a/app/jobs/internal/check_new_versions_job.rb
+++ b/app/jobs/internal/check_new_versions_job.rb
@@ -4,21 +4,17 @@ class Internal::CheckNewVersionsJob < ApplicationJob
   def perform
     return unless Rails.env.production?
 
-    instance_info = ChatwootHub.sync_with_hub
-    return unless instance_info
-
-    ::Redis::Alfred.set(::Redis::Alfred::LATEST_CHATWOOT_VERSION, instance_info['version'])
-    update_installation_config(key: 'INSTALLATION_PRICING_PLAN', value: instance_info['plan'])
-    update_installation_config(key: 'INSTALLATION_PRICING_PLAN_QUANTITY', value: instance_info['plan_quantity'])
-    update_installation_config(key: 'CHATWOOT_SUPPORT_WEBSITE_TOKEN', value: instance_info['chatwoot_support_website_token'])
-    update_installation_config(key: 'CHATWOOT_SUPPORT_IDENTIFIER_HASH', value: instance_info['chatwoot_support_identifier_hash'])
-    update_installation_config(key: 'CHATWOOT_SUPPORT_SCRIPT_URL', value: instance_info['chatwoot_support_script_url'])
+    @instance_info = ChatwootHub.sync_with_hub
+    update_version_info
   end
 
-  def update_installation_config(key:, value:)
-    config = InstallationConfig.find_or_initialize_by(name: key)
-    config.value = value
-    config.locked = true
-    config.save!
+  private
+
+  def update_version_info
+    return if @instance_info['version'].blank?
+
+    ::Redis::Alfred.set(::Redis::Alfred::LATEST_CHATWOOT_VERSION, @instance_info['version'])
   end
 end
+
+Internal::CheckNewVersionsJob.prepend_mod_with('Internal::CheckNewVersionsJob')
diff --git a/app/jobs/mutex_application_job.rb b/app/jobs/mutex_application_job.rb
index 98e6bf9cd..58c7cbf36 100644
--- a/app/jobs/mutex_application_job.rb
+++ b/app/jobs/mutex_application_job.rb
@@ -14,20 +14,36 @@
 class MutexApplicationJob < ApplicationJob
   class LockAcquisitionError < StandardError; end
 
-  def with_lock(key_format, *args)
-    lock_key = format(key_format, *args)
+  def with_lock(lock_key, timeout = Redis::LockManager::LOCK_TIMEOUT)
     lock_manager = Redis::LockManager.new
 
     begin
-      if lock_manager.lock(lock_key)
-        Rails.logger.info "[#{self.class.name}] Acquired lock for: #{lock_key} on attempt #{executions}"
+      if lock_manager.lock(lock_key, timeout)
+        log_attempt(lock_key, executions)
         yield
+        # release the lock after the block has been executed
+        lock_manager.unlock(lock_key)
       else
-        Rails.logger.warn "[#{self.class.name}] Failed to acquire lock on attempt #{executions}: #{lock_key}"
-        raise LockAcquisitionError, "Failed to acquire lock for key: #{lock_key}"
+        handle_failed_lock_acquisition(lock_key)
       end
-    ensure
-      lock_manager.unlock(lock_key)
+    rescue StandardError => e
+      handle_error(e, lock_manager, lock_key)
     end
   end
+
+  private
+
+  def log_attempt(lock_key, executions)
+    Rails.logger.info "[#{self.class.name}] Acquired lock for: #{lock_key} on attempt #{executions}"
+  end
+
+  def handle_error(err, lock_manager, lock_key)
+    lock_manager.unlock(lock_key) unless err.is_a?(LockAcquisitionError)
+    raise err
+  end
+
+  def handle_failed_lock_acquisition(lock_key)
+    Rails.logger.warn "[#{self.class.name}] Failed to acquire lock on attempt #{executions}: #{lock_key}"
+    raise LockAcquisitionError, "Failed to acquire lock for key: #{lock_key}"
+  end
 end
diff --git a/app/jobs/notification/delete_notification_job.rb b/app/jobs/notification/delete_notification_job.rb
new file mode 100644
index 000000000..9efaf472c
--- /dev/null
+++ b/app/jobs/notification/delete_notification_job.rb
@@ -0,0 +1,15 @@
+class Notification::DeleteNotificationJob < ApplicationJob
+  queue_as :low
+
+  def perform(user, type: :all)
+    ActiveRecord::Base.transaction do
+      if type == :all
+        # Delete all notifications
+        user.notifications.destroy_all
+      elsif type == :read
+        # Delete only read notifications
+        user.notifications.where.not(read_at: nil).destroy_all
+      end
+    end
+  end
+end
diff --git a/app/jobs/send_on_slack_job.rb b/app/jobs/send_on_slack_job.rb
index eececa409..c8a556ce7 100644
--- a/app/jobs/send_on_slack_job.rb
+++ b/app/jobs/send_on_slack_job.rb
@@ -3,7 +3,8 @@ class SendOnSlackJob < MutexApplicationJob
   retry_on LockAcquisitionError, wait: 1.second, attempts: 8
 
   def perform(message, hook)
-    with_lock(::Redis::Alfred::SLACK_MESSAGE_MUTEX, conversation_id: message.conversation_id, reference_id: hook.reference_id) do
+    key = format(::Redis::Alfred::SLACK_MESSAGE_MUTEX, conversation_id: message.conversation_id, reference_id: hook.reference_id)
+    with_lock(key) do
       Integrations::Slack::SendOnSlackService.new(message: message, hook: hook).perform
     end
   end
diff --git a/app/jobs/trigger_scheduled_items_job.rb b/app/jobs/trigger_scheduled_items_job.rb
index 82634e4d5..15b0011c8 100644
--- a/app/jobs/trigger_scheduled_items_job.rb
+++ b/app/jobs/trigger_scheduled_items_job.rb
@@ -24,3 +24,5 @@ class TriggerScheduledItemsJob < ApplicationJob
     Notification::RemoveOldNotificationJob.perform_later
   end
 end
+
+TriggerScheduledItemsJob.prepend_mod_with('TriggerScheduledItemsJob')
diff --git a/app/jobs/webhooks/facebook_events_job.rb b/app/jobs/webhooks/facebook_events_job.rb
index 4240d62b9..0694a2b85 100644
--- a/app/jobs/webhooks/facebook_events_job.rb
+++ b/app/jobs/webhooks/facebook_events_job.rb
@@ -5,7 +5,8 @@ class Webhooks::FacebookEventsJob < MutexApplicationJob
   def perform(message)
     response = ::Integrations::Facebook::MessageParser.new(message)
 
-    with_lock(::Redis::Alfred::FACEBOOK_MESSAGE_MUTEX, sender_id: response.sender_id, recipient_id: response.recipient_id) do
+    key = format(::Redis::Alfred::FACEBOOK_MESSAGE_MUTEX, sender_id: response.sender_id, recipient_id: response.recipient_id)
+    with_lock(key) do
       process_message(response)
     end
   end
diff --git a/app/jobs/webhooks/instagram_events_job.rb b/app/jobs/webhooks/instagram_events_job.rb
index 024ba4a23..825f220a7 100644
--- a/app/jobs/webhooks/instagram_events_job.rb
+++ b/app/jobs/webhooks/instagram_events_job.rb
@@ -12,7 +12,8 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
   def perform(entries)
     @entries = entries
 
-    with_lock(::Redis::Alfred::IG_MESSAGE_MUTEX, sender_id: sender_id, ig_account_id: ig_account_id) do
+    key = format(::Redis::Alfred::IG_MESSAGE_MUTEX, sender_id: sender_id, ig_account_id: ig_account_id)
+    with_lock(key) do
       process_entries(entries)
     end
   end
diff --git a/app/listeners/action_cable_listener.rb b/app/listeners/action_cable_listener.rb
index 3d6b4a48c..5aac56db3 100644
--- a/app/listeners/action_cable_listener.rb
+++ b/app/listeners/action_cable_listener.rb
@@ -7,6 +7,12 @@ class ActionCableListener < BaseListener
     broadcast(account, tokens, NOTIFICATION_CREATED, { notification: notification.push_event_data, unread_count: unread_count, count: count })
   end
 
+  def notification_updated(event)
+    notification, account, unread_count, count = extract_notification_and_account(event)
+    tokens = [event.data[:notification].user.pubsub_token]
+    broadcast(account, tokens, NOTIFICATION_UPDATED, { notification: notification.push_event_data, unread_count: unread_count, count: count })
+  end
+
   def notification_deleted(event)
     return if event.data[:notification].user.blank?
 
diff --git a/app/listeners/notification_listener.rb b/app/listeners/notification_listener.rb
index 39303450d..666bc4d13 100644
--- a/app/listeners/notification_listener.rb
+++ b/app/listeners/notification_listener.rb
@@ -1,4 +1,18 @@
 class NotificationListener < BaseListener
+  def conversation_bot_handoff(event)
+    conversation, account = extract_conversation_and_account(event)
+    return if conversation.pending?
+
+    conversation.inbox.members.each do |agent|
+      NotificationBuilder.new(
+        notification_type: 'conversation_creation',
+        user: agent,
+        account: account,
+        primary_actor: conversation
+      ).perform
+    end
+  end
+
   def conversation_created(event)
     conversation, account = extract_conversation_and_account(event)
     return if conversation.pending?
diff --git a/app/mailboxes/reply_mailbox.rb b/app/mailboxes/reply_mailbox.rb
index d60533856..0b1efd09a 100644
--- a/app/mailboxes/reply_mailbox.rb
+++ b/app/mailboxes/reply_mailbox.rb
@@ -6,11 +6,12 @@ class ReplyMailbox < ApplicationMailbox
   EMAIL_PART_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
 
   before_processing :conversation_uuid_from_to_address,
-                    :find_relative_conversation,
-                    :verify_decoded_params,
-                    :decorate_mail
+                    :find_relative_conversation
 
   def process
+    return if @conversation.blank?
+
+    decorate_mail
     create_message
     add_attachments_to_message
   end
@@ -78,12 +79,8 @@ class ReplyMailbox < ApplicationMailbox
     find_conversation_by_message_id(in_reply_to_addresses) if @conversation.blank?
   end
 
-  def verify_decoded_params
-    raise 'Conversation uuid not found' if conversation_uuid.nil?
-  end
-
   def validate_resource(resource)
-    raise "Email conversation with uuid: #{conversation_uuid} not found" if resource.nil?
+    Rails.logger.error "[App::Mailboxes::ReplyMailbox] Email conversation with uuid: #{conversation_uuid} not found" if resource.nil?
 
     resource
   end
diff --git a/app/models/account.rb b/app/models/account.rb
index c1a5773bb..a24aec775 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -32,7 +32,6 @@ class Account < ApplicationRecord
     check_for_column: false
   }.freeze
 
-  validates :name, presence: true
   validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 999, allow_nil: true }
   validates :domain, length: { maximum: 100 }
 
@@ -101,7 +100,7 @@ class Account < ApplicationRecord
                              .where(context: 'labels',
                                     taggable_type: 'Conversation',
                                     taggable_id: conversation_ids)
-                             .map { |_| _.tag.name }
+                             .map { |tagging| tagging.tag.name }
   end
 
   def webhook_data
diff --git a/app/models/article.rb b/app/models/article.rb
index c830c7a1f..9abe87857 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -43,7 +43,7 @@ class Article < ApplicationRecord
   belongs_to :account
   belongs_to :category, optional: true
   belongs_to :portal
-  belongs_to :author, class_name: 'User'
+  belongs_to :author, class_name: 'User', inverse_of: :articles
 
   before_validation :ensure_account_id
   before_validation :ensure_article_slug
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 3af08f21e..7a8725e30 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -38,7 +38,8 @@ class Attachment < ApplicationRecord
   has_one_attached :file
   validate :acceptable_file
   validates :external_url, length: { maximum: Limits::URL_LENGTH_LIMIT }
-  enum file_type: [:image, :audio, :video, :file, :location, :fallback, :share, :story_mention, :contact]
+  enum file_type: { :image => 0, :audio => 1, :video => 2, :file => 3, :location => 4, :fallback => 5, :share => 6, :story_mention => 7,
+                    :contact => 8 }
 
   def push_event_data
     return unless file_type
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 5f5d59814..955df7497 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -30,10 +30,15 @@ class AutomationRule < ApplicationRecord
 
   scope :active, -> { where(active: true) }
 
-  CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id
-                        mail_subject phone_number priority conversation_language].freeze
-  ACTIONS_ATTRS = %w[send_message add_label remove_label send_email_to_team assign_team assign_agent send_webhook_event mute_conversation
-                     send_attachment change_status resolve_conversation snooze_conversation change_priority send_email_transcript].freeze
+  def conditions_attributes
+    %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id
+       mail_subject phone_number priority conversation_language]
+  end
+
+  def actions_attributes
+    %w[send_message add_label remove_label send_email_to_team assign_team assign_agent send_webhook_event mute_conversation
+       send_attachment change_status resolve_conversation snooze_conversation change_priority send_email_transcript].freeze
+  end
 
   def file_base_data
     files.map do |file|
@@ -55,7 +60,7 @@ class AutomationRule < ApplicationRecord
     return if conditions.blank?
 
     attributes = conditions.map { |obj, _| obj['attribute_key'] }
-    conditions = attributes - CONDITIONS_ATTRS
+    conditions = attributes - conditions_attributes
     conditions -= account.custom_attribute_definitions.pluck(:attribute_key)
     errors.add(:conditions, "Automation conditions #{conditions.join(',')} not supported.") if conditions.any?
   end
@@ -64,7 +69,7 @@ class AutomationRule < ApplicationRecord
     return if actions.blank?
 
     attributes = actions.map { |obj, _| obj['action_name'] }
-    actions = attributes - ACTIONS_ATTRS
+    actions = attributes - actions_attributes
 
     errors.add(:actions, "Automation actions #{actions.join(',')} not supported.") if actions.any?
   end
@@ -78,3 +83,4 @@ class AutomationRule < ApplicationRecord
 end
 
 AutomationRule.include_mod_with('Audit::AutomationRule')
+AutomationRule.prepend_mod_with('AutomationRule')
diff --git a/app/models/canned_response.rb b/app/models/canned_response.rb
index 22fd0b218..b70f1c32d 100644
--- a/app/models/canned_response.rb
+++ b/app/models/canned_response.rb
@@ -11,10 +11,10 @@
 #
 
 class CannedResponse < ApplicationRecord
-  validates_presence_of :content
-  validates_presence_of :short_code
-  validates_presence_of :account
-  validates_uniqueness_of :short_code, scope: :account_id
+  validates :content, presence: true
+  validates :short_code, presence: true
+  validates :account, presence: true
+  validates :short_code, uniqueness: { scope: :account_id }
 
   belongs_to :account
 
diff --git a/app/models/channel/email.rb b/app/models/channel/email.rb
index 0d519ec2d..9518599f2 100644
--- a/app/models/channel/email.rb
+++ b/app/models/channel/email.rb
@@ -8,7 +8,6 @@
 #  imap_address              :string           default("")
 #  imap_enable_ssl           :boolean          default(TRUE)
 #  imap_enabled              :boolean          default(FALSE)
-#  imap_inbox_synced_at      :datetime
 #  imap_login                :string           default("")
 #  imap_password             :string           default("")
 #  imap_port                 :integer          default(0)
@@ -41,7 +40,7 @@ class Channel::Email < ApplicationRecord
   AUTHORIZATION_ERROR_THRESHOLD = 10
 
   self.table_name = 'channel_email'
-  EDITABLE_ATTRS = [:email, :imap_enabled, :imap_login, :imap_password, :imap_address, :imap_port, :imap_enable_ssl, :imap_inbox_synced_at,
+  EDITABLE_ATTRS = [:email, :imap_enabled, :imap_login, :imap_password, :imap_address, :imap_port, :imap_enable_ssl,
                     :smtp_enabled, :smtp_login, :smtp_password, :smtp_address, :smtp_port, :smtp_domain, :smtp_enable_starttls_auto,
                     :smtp_enable_ssl_tls, :smtp_openssl_verify_mode, :smtp_authentication, :provider].freeze
 
diff --git a/app/models/channel/facebook_page.rb b/app/models/channel/facebook_page.rb
index 5cac0d124..ce5f5d221 100644
--- a/app/models/channel/facebook_page.rb
+++ b/app/models/channel/facebook_page.rb
@@ -46,20 +46,20 @@ class Channel::FacebookPage < ApplicationRecord
 
   def subscribe
     # ref https://developers.facebook.com/docs/messenger-platform/reference/webhook-events
-    response = Facebook::Messenger::Subscriptions.subscribe(
+    Facebook::Messenger::Subscriptions.subscribe(
       access_token: page_access_token,
       subscribed_fields: %w[
         messages message_deliveries message_echoes message_reads standby messaging_handovers
       ]
     )
-  rescue => e
+  rescue StandardError => e
     Rails.logger.debug { "Rescued: #{e.inspect}" }
     true
   end
 
   def unsubscribe
     Facebook::Messenger::Subscriptions.unsubscribe(access_token: page_access_token)
-  rescue => e
+  rescue StandardError => e
     Rails.logger.debug { "Rescued: #{e.inspect}" }
     true
   end
@@ -73,6 +73,7 @@ class Channel::FacebookPage < ApplicationRecord
     delete_instagram_story(message) if story_link.blank?
     story_link
   rescue Koala::Facebook::ClientError => e
+    Rails.logger.debug { "Instagram Story Expired: #{e.inspect}" }
     delete_instagram_story(message)
   end
 
diff --git a/app/models/concerns/account_cache_revalidator.rb b/app/models/concerns/account_cache_revalidator.rb
index 32d7500f8..b5ff5a473 100644
--- a/app/models/concerns/account_cache_revalidator.rb
+++ b/app/models/concerns/account_cache_revalidator.rb
@@ -2,7 +2,7 @@ module AccountCacheRevalidator
   extend ActiveSupport::Concern
 
   included do
-    after_commit :update_account_cache, on: [:create, :update]
+    after_commit :update_account_cache, on: [:create, :update, :destroy]
   end
 
   def update_account_cache
diff --git a/app/models/concerns/cache_keys.rb b/app/models/concerns/cache_keys.rb
index 7a01f0925..3ad9bbadc 100644
--- a/app/models/concerns/cache_keys.rb
+++ b/app/models/concerns/cache_keys.rb
@@ -4,6 +4,8 @@ module CacheKeys
   include CacheKeysHelper
   include Events::Types
 
+  CACHE_KEYS_EXPIRY = 72.hours
+
   included do
     class_attribute :cacheable_models
     self.cacheable_models = [Label, Inbox, Team]
@@ -18,26 +20,26 @@ module CacheKeys
     keys
   end
 
-  def invalidate_cache_key_for(key)
-    prefixed_cache_key = get_prefixed_cache_key(id, key)
-    Redis::Alfred.delete(prefixed_cache_key)
-    dispatch_cache_update_event
-  end
-
   def update_cache_key(key)
-    prefixed_cache_key = get_prefixed_cache_key(id, key)
-    Redis::Alfred.set(prefixed_cache_key, Time.now.utc.to_i)
+    update_cache_key_for_account(id, key)
     dispatch_cache_update_event
   end
 
   def reset_cache_keys
     self.class.cacheable_models.each do |model|
-      invalidate_cache_key_for(model.name.underscore)
+      update_cache_key_for_account(id, model.name.underscore)
     end
+
+    dispatch_cache_update_event
   end
 
   private
 
+  def update_cache_key_for_account(account_id, key)
+    prefixed_cache_key = get_prefixed_cache_key(account_id, key)
+    Redis::Alfred.setex(prefixed_cache_key, Time.now.utc.to_i, CACHE_KEYS_EXPIRY)
+  end
+
   def dispatch_cache_update_event
     Rails.configuration.dispatcher.dispatch(ACCOUNT_CACHE_INVALIDATED, Time.zone.now, cache_keys: cache_keys, account: self)
   end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 176109f24..af3f605a7 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -7,10 +7,14 @@
 #  id                    :integer          not null, primary key
 #  additional_attributes :jsonb
 #  contact_type          :integer          default("visitor")
+#  country_code          :string           default("")
 #  custom_attributes     :jsonb
 #  email                 :string
 #  identifier            :string
 #  last_activity_at      :datetime
+#  last_name             :string           default("")
+#  location              :string           default("")
+#  middle_name           :string           default("")
 #  name                  :string           default("")
 #  phone_number          :string
 #  created_at            :datetime         not null
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 27bc79996..fb2ae8b77 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -89,7 +89,7 @@ class Conversation < ApplicationRecord
 
   belongs_to :account
   belongs_to :inbox
-  belongs_to :assignee, class_name: 'User', optional: true
+  belongs_to :assignee, class_name: 'User', optional: true, inverse_of: :assigned_conversations
   belongs_to :contact
   belongs_to :contact_inbox
   belongs_to :team, optional: true
diff --git a/app/models/csat_survey_response.rb b/app/models/csat_survey_response.rb
index 68edf0ab1..7bcc25d58 100644
--- a/app/models/csat_survey_response.rb
+++ b/app/models/csat_survey_response.rb
@@ -26,7 +26,7 @@ class CsatSurveyResponse < ApplicationRecord
   belongs_to :conversation
   belongs_to :contact
   belongs_to :message
-  belongs_to :assigned_agent, class_name: 'User', optional: true
+  belongs_to :assigned_agent, class_name: 'User', optional: true, inverse_of: :csat_survey_responses
 
   validates :rating, presence: true, inclusion: { in: [1, 2, 3, 4, 5] }
   validates :account_id, presence: true
diff --git a/app/models/macro.rb b/app/models/macro.rb
index a54e93339..64065a342 100644
--- a/app/models/macro.rb
+++ b/app/models/macro.rb
@@ -21,7 +21,7 @@ class Macro < ApplicationRecord
 
   belongs_to :account
   belongs_to :created_by,
-             class_name: :User, optional: true
+             class_name: :User, optional: true, inverse_of: :macros
   belongs_to :updated_by,
              class_name: :User, optional: true
   has_many_attached :files
diff --git a/app/models/message.rb b/app/models/message.rb
index 48507adb7..143e35041 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -118,7 +118,7 @@ class Message < ApplicationRecord
   belongs_to :account
   belongs_to :inbox
   belongs_to :conversation, touch: true
-  belongs_to :sender, polymorphic: true, required: false
+  belongs_to :sender, polymorphic: true, optional: true
 
   has_many :attachments, dependent: :destroy, autosave: true, before_add: :validate_attachments_limit
   has_one :csat_survey_response, dependent: :destroy_async
@@ -139,8 +139,8 @@ class Message < ApplicationRecord
       conversation_id: conversation.display_id,
       conversation: conversation_push_event_data
     )
-    data.merge!(echo_id: echo_id) if echo_id.present?
-    data.merge!(attachments: attachments.map(&:push_event_data)) if attachments.present?
+    data[:echo_id] = echo_id if echo_id.present?
+    data[:attachments] = attachments.map(&:push_event_data) if attachments.present?
     merge_sender_attributes(data)
   end
 
@@ -163,8 +163,8 @@ class Message < ApplicationRecord
   end
 
   def merge_sender_attributes(data)
-    data.merge!(sender: sender.push_event_data) if sender && !sender.is_a?(AgentBot)
-    data.merge!(sender: sender.push_event_data(inbox)) if sender.is_a?(AgentBot)
+    data[:sender] = sender.push_event_data if sender && !sender.is_a?(AgentBot)
+    data[:sender] = sender.push_event_data(inbox) if sender.is_a?(AgentBot)
     data
   end
 
@@ -184,7 +184,7 @@ class Message < ApplicationRecord
       sender: sender.try(:webhook_data),
       source_id: source_id
     }
-    data.merge!(attachments: attachments.map(&:push_event_data)) if attachments.present?
+    data[:attachments] = attachments.map(&:push_event_data) if attachments.present?
     data
   end
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index db8fbb8ea..e0b31b457 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -46,6 +46,7 @@ class Notification < ApplicationRecord
   before_create :set_last_activity_at
   after_create_commit :process_notification_delivery, :dispatch_create_event
   after_destroy_commit :dispatch_destroy_event
+  after_update_commit :dispatch_update_event
 
   PRIMARY_ACTORS = ['Conversation'].freeze
 
@@ -60,6 +61,8 @@ class Notification < ApplicationRecord
       secondary_actor: secondary_actor&.push_event_data,
       user: user&.push_event_data,
       created_at: created_at.to_i,
+      last_activity_at: last_activity_at.to_i,
+      snoozed_until: snoozed_until,
       account_id: account_id
 
     }
@@ -73,7 +76,8 @@ class Notification < ApplicationRecord
   def primary_actor_data
     {
       id: primary_actor.push_event_data[:id],
-      meta: primary_actor.push_event_data[:meta]
+      meta: primary_actor.push_event_data[:meta],
+      inbox_id: primary_actor.push_event_data[:inbox_id]
     }
   end
 
@@ -140,6 +144,10 @@ class Notification < ApplicationRecord
     Rails.configuration.dispatcher.dispatch(NOTIFICATION_CREATED, Time.zone.now, notification: self)
   end
 
+  def dispatch_update_event
+    Rails.configuration.dispatcher.dispatch(NOTIFICATION_UPDATED, Time.zone.now, notification: self)
+  end
+
   def dispatch_destroy_event
     Rails.configuration.dispatcher.dispatch(NOTIFICATION_DELETED, Time.zone.now, notification: self)
   end
diff --git a/app/models/telegram_bot.rb b/app/models/telegram_bot.rb
index 8468e233f..725250053 100644
--- a/app/models/telegram_bot.rb
+++ b/app/models/telegram_bot.rb
@@ -13,5 +13,5 @@
 class TelegramBot < ApplicationRecord
   belongs_to :account
   has_one :inbox, as: :channel, dependent: :destroy_async
-  validates_uniqueness_of :auth_key, scope: :account_id
+  validates :auth_key, uniqueness: { scope: :account_id }
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 25ae2826a..ba638f637 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,22 +68,21 @@ class User < ApplicationRecord
   # work because :validatable in devise overrides this.
   # validates_uniqueness_of :email, scope: :account_id
 
-  validates :email, :name, presence: true
-  validates_length_of :name, minimum: 1, maximum: 255
+  validates :email, presence: true
 
   has_many :account_users, dependent: :destroy_async
   has_many :accounts, through: :account_users
   accepts_nested_attributes_for :account_users
 
-  has_many :assigned_conversations, foreign_key: 'assignee_id', class_name: 'Conversation', dependent: :nullify
+  has_many :assigned_conversations, foreign_key: 'assignee_id', class_name: 'Conversation', dependent: :nullify, inverse_of: :assignee
   alias_attribute :conversations, :assigned_conversations
-  has_many :csat_survey_responses, foreign_key: 'assigned_agent_id', dependent: :nullify
+  has_many :csat_survey_responses, foreign_key: 'assigned_agent_id', dependent: :nullify, inverse_of: :assigned_agent
   has_many :conversation_participants, dependent: :destroy_async
   has_many :participating_conversations, through: :conversation_participants, source: :conversation
 
   has_many :inbox_members, dependent: :destroy_async
   has_many :inboxes, through: :inbox_members, source: :inbox
-  has_many :messages, as: :sender
+  has_many :messages, as: :sender, dependent: :nullify
   has_many :invitees, through: :account_users, class_name: 'User', foreign_key: 'inviter_id', source: :inviter, dependent: :nullify
 
   has_many :custom_filters, dependent: :destroy_async
@@ -95,12 +94,16 @@ class User < ApplicationRecord
   has_many :notifications, dependent: :destroy_async
   has_many :team_members, dependent: :destroy_async
   has_many :teams, through: :team_members
-  has_many :articles, foreign_key: 'author_id', dependent: :nullify
+  has_many :articles, foreign_key: 'author_id', dependent: :nullify, inverse_of: :author
   has_many :portal_members, class_name: :PortalMember, dependent: :destroy_async
   has_many :portals, through: :portal_members, source: :portal,
                      class_name: :Portal,
                      dependent: :nullify
-  has_many :macros, foreign_key: 'created_by_id'
+  # rubocop:disable Rails/HasManyOrHasOneDependent
+  # we are handling this in `remove_macros` callback
+  has_many :macros, foreign_key: 'created_by_id', inverse_of: :created_by
+  # rubocop:enable Rails/HasManyOrHasOneDependent
+
   before_validation :set_password_and_uid, on: :create
   after_destroy :remove_macros
 
@@ -161,3 +164,4 @@ class User < ApplicationRecord
 end
 
 User.include_mod_with('Audit::User')
+User.include_mod_with('Concerns::User')
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index b19874fd1..cba1720ec 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -14,4 +14,8 @@ class UserPolicy < ApplicationPolicy
   def destroy?
     @account_user.administrator?
   end
+
+  def bulk_create?
+    @account_user.administrator?
+  end
 end
diff --git a/app/services/action_service.rb b/app/services/action_service.rb
index 5a38db47f..7a9a14d0d 100644
--- a/app/services/action_service.rb
+++ b/app/services/action_service.rb
@@ -89,3 +89,5 @@ class ActionService
     @conversation.additional_attributes['type'] == 'tweet'
   end
 end
+
+ActionService.include_mod_with('ActionService')
diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index be791b38a..514ba3e1f 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -7,7 +7,12 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
 
   def perform_reply
     send_message_to_facebook fb_text_message_params if message.content.present?
-    send_message_to_facebook fb_attachment_message_params if message.attachments.present?
+
+    if message.attachments.present?
+      message.attachments.each do |attachment|
+        send_message_to_facebook fb_attachment_message_params(attachment)
+      end
+    end
   rescue Facebook::Messenger::FacebookError => e
     # TODO : handle specific errors or else page will get disconnected
     handle_facebook_error(e)
@@ -41,8 +46,7 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
     "#{error_code} - #{error_message}"
   end
 
-  def fb_attachment_message_params
-    attachment = message.attachments.first
+  def fb_attachment_message_params(attachment)
     {
       recipient: { id: contact.get_source_id(inbox.id) },
       message: {
@@ -64,14 +68,6 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
     'file'
   end
 
-  def fb_message_params
-    if message.attachments.blank?
-      fb_text_message_params
-    else
-      fb_attachment_message_params
-    end
-  end
-
   def sent_first_outgoing_message_after_24_hours?
     # we can send max 1 message after 24 hour window
     conversation.messages.outgoing.where('id > ?', conversation.last_incoming_message.id).count == 1
diff --git a/app/services/instagram/send_on_instagram_service.rb b/app/services/instagram/send_on_instagram_service.rb
index df24c1c25..a681745d8 100644
--- a/app/services/instagram/send_on_instagram_service.rb
+++ b/app/services/instagram/send_on_instagram_service.rb
@@ -14,8 +14,13 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
   end
 
   def perform_reply
-    send_to_facebook_page attachament_message_params if message.attachments.present?
-    send_to_facebook_page message_params
+    if message.attachments.present?
+      message.attachments.each do |attachment|
+        send_to_facebook_page attachment_message_params(attachment)
+      end
+    end
+
+    send_to_facebook_page message_params if message.content.present?
   rescue StandardError => e
     ChatwootExceptionTracker.new(e, account: message.account, user: message.sender).capture_exception
     # TODO : handle specific errors or else page will get disconnected
@@ -33,8 +38,7 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
     merge_human_agent_tag(params)
   end
 
-  def attachament_message_params
-    attachment = message.attachments.first
+  def attachment_message_params(attachment)
     params = {
       recipient: { id: contact.get_source_id(inbox.id) },
       message: {
diff --git a/app/services/instagram/webhooks_base_service.rb b/app/services/instagram/webhooks_base_service.rb
index 26e2e486f..419270d70 100644
--- a/app/services/instagram/webhooks_base_service.rb
+++ b/app/services/instagram/webhooks_base_service.rb
@@ -24,7 +24,9 @@ class Instagram::WebhooksBaseService
   def update_instagram_profile_link(user)
     return unless user['username']
 
+    # TODO: Remove this once we show the social_instagram_user_name in the UI instead of the username
     @contact.additional_attributes = @contact.additional_attributes.merge({ 'social_profiles': { 'instagram': user['username'] } })
+    @contact.additional_attributes = @contact.additional_attributes.merge({ 'social_instagram_user_name': user['username'] })
     @contact.save
   end
 end
diff --git a/app/services/line/incoming_message_service.rb b/app/services/line/incoming_message_service.rb
index 121ba1ce2..2d6988476 100644
--- a/app/services/line/incoming_message_service.rb
+++ b/app/services/line/incoming_message_service.rb
@@ -139,7 +139,14 @@ class Line::IncomingMessageService
   def contact_attributes
     {
       name: line_contact_info['displayName'],
-      avatar_url: line_contact_info['pictureUrl']
+      avatar_url: line_contact_info['pictureUrl'],
+      additional_attributes: additional_attributes
+    }
+  end
+
+  def additional_attributes
+    {
+      social_line_user_id: line_contact_info['userId']
     }
   end
 
diff --git a/app/services/microsoft/refresh_oauth_token_service.rb b/app/services/microsoft/refresh_oauth_token_service.rb
index d9ad6aa50..a038dd68b 100644
--- a/app/services/microsoft/refresh_oauth_token_service.rb
+++ b/app/services/microsoft/refresh_oauth_token_service.rb
@@ -1,48 +1,39 @@
-# refer: https://gitlab.com/gitlab-org/ruby/gems/gitlab-mail_room/-/blob/master/lib/mail_room/microsoft_graph/connection.rb
-# refer: https://github.com/microsoftgraph/msgraph-sample-rubyrailsapp/tree/b4a6869fe4a438cde42b161196484a929f1bee46
-# https://learn.microsoft.com/en-us/azure/active-directory/develop/active-directory-configurable-token-lifetimes
+# Refer: https://learn.microsoft.com/en-us/entra/identity-platform/configurable-token-lifetimes
 class Microsoft::RefreshOauthTokenService
   pattr_initialize [:channel!]
 
-  # if the token is not expired yet then skip the refresh token step
+  # Additional references: https://gitlab.com/gitlab-org/ruby/gems/gitlab-mail_room/-/blob/master/lib/mail_room/microsoft_graph/connection.rb
   def access_token
-    provider_config = channel.provider_config.with_indifferent_access
-    if Time.current.utc >= expires_on(provider_config['expires_on'])
-      # Token expired, refresh
-      new_hash = refresh_tokens
-      new_hash[:access_token]
-    else
-      provider_config[:access_token]
-    end
+    return provider_config[:access_token] unless access_token_expired?
+
+    refreshed_tokens = refresh_tokens
+    refreshed_tokens[:access_token]
   end
 
-  def expires_on(expiry)
-    # we will give it a 5 minute gap for safety
-    expiry.presence ? DateTime.parse(expiry) - 5.minutes : Time.current.utc
+  def access_token_expired?
+    expiry = provider_config[:expires_on]
+
+    return true if expiry.blank?
+
+    # Adding a 5 minute window to expiry check to avoid any race
+    # conditions during the fetch operation. This would assure that the
+    # tokens are updated when we fetch the emails.
+    Time.current.utc >= DateTime.parse(expiry) - 5.minutes
   end
 
-  # <RefreshTokensSnippet>
+  # Refresh the access tokens using the refresh token
+  # Refer: https://github.com/microsoftgraph/msgraph-sample-rubyrailsapp/tree/b4a6869fe4a438cde42b161196484a929f1bee46
   def refresh_tokens
-    token_hash = channel.provider_config.with_indifferent_access
-    oauth_strategy = ::MicrosoftGraphAuth.new(
-      nil, ENV.fetch('AZURE_APP_ID', nil), ENV.fetch('AZURE_APP_SECRET', nil)
-    )
+    oauth_strategy = build_oauth_strategy
+    token_service = build_token_service(oauth_strategy)
 
-    token_service = OAuth2::AccessToken.new(
-      oauth_strategy.client, token_hash['access_token'],
-      refresh_token: token_hash['refresh_token']
-    )
-
-    # Refresh the tokens
     new_tokens = token_service.refresh!.to_hash.slice(:access_token, :refresh_token, :expires_at)
 
     update_channel_provider_config(new_tokens)
-    channel.provider_config
+    channel.reload.provider_config
   end
-  # </RefreshTokensSnippet>
 
   def update_channel_provider_config(new_tokens)
-    new_tokens = new_tokens.with_indifferent_access
     channel.provider_config = {
       access_token: new_tokens[:access_token],
       refresh_token: new_tokens[:refresh_token],
@@ -50,4 +41,24 @@ class Microsoft::RefreshOauthTokenService
     }
     channel.save!
   end
+
+  private
+
+  def provider_config
+    @provider_config ||= channel.provider_config.with_indifferent_access
+  end
+
+  # Builds the OAuth strategy for Microsoft Graph
+  def build_oauth_strategy
+    ::MicrosoftGraphAuth.new(nil, ENV.fetch('AZURE_APP_ID'), ENV.fetch('AZURE_APP_SECRET'))
+  end
+
+  # Builds the token service using OAuth2
+  def build_token_service(oauth_strategy)
+    OAuth2::AccessToken.new(
+      oauth_strategy.client,
+      provider_config[:access_token],
+      refresh_token: provider_config[:refresh_token]
+    )
+  end
 end
diff --git a/app/services/telegram/incoming_message_service.rb b/app/services/telegram/incoming_message_service.rb
index d4eeb53d5..d18994a00 100644
--- a/app/services/telegram/incoming_message_service.rb
+++ b/app/services/telegram/incoming_message_service.rb
@@ -78,8 +78,11 @@ class Telegram::IncomingMessageService
 
   def additional_attributes
     {
+      # TODO: Remove this once we show the social_telegram_user_name in the UI instead of the username
       username: telegram_params_username,
-      language_code: telegram_params_language_code
+      language_code: telegram_params_language_code,
+      social_telegram_user_id: telegram_params_from_id,
+      social_telegram_user_name: telegram_params_username
     }
   end
 
diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index 2d3b4efd3..f057fadbd 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -19,7 +19,13 @@ class Whatsapp::IncomingMessageBaseService
   private
 
   def process_messages
-    # message allready exists so we don't need to process
+    # We don't support reactions & ephemeral message now, we need to skip processing the message
+    # if the webhook event is a reaction or an ephermal message or an unsupported message.
+    return if unprocessable_message_type?(message_type)
+
+    # Multiple webhook event can be received against the same message due to misconfigurations in the Meta
+    # business manager account. While we have not found the core reason yet, the following line ensure that
+    # there are no duplicate messages created.
     return if find_message_by_source_id(@processed_params[:messages].first[:id]) || message_under_process?
 
     cache_message_source_id_in_redis
@@ -49,8 +55,6 @@ class Whatsapp::IncomingMessageBaseService
   end
 
   def create_messages
-    return if unprocessable_message_type?(message_type)
-
     message = @processed_params[:messages].first
     log_error(message) && return if error_webhook_event?(message)
 
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index 76a31576e..c5474314b 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -44,7 +44,7 @@ module Whatsapp::IncomingMessageServiceHelpers
   end
 
   def unprocessable_message_type?(message_type)
-    %w[reaction ephemeral unsupported].include?(message_type)
+    %w[reaction ephemeral unsupported request_welcome].include?(message_type)
   end
 
   def brazil_phone_number?(phone_number)
diff --git a/app/views/api/v1/accounts/notifications/index.json.jbuilder b/app/views/api/v1/accounts/notifications/index.json.jbuilder
index b46dcb9ec..ae86372c9 100644
--- a/app/views/api/v1/accounts/notifications/index.json.jbuilder
+++ b/app/views/api/v1/accounts/notifications/index.json.jbuilder
@@ -20,6 +20,7 @@ json.data do
       json.user notification.user.push_event_data
       json.created_at notification.created_at.to_i
       json.last_activity_at notification.last_activity_at.to_i
+      json.snoozed_until notification.snoozed_until
     end
   end
 end
diff --git a/app/views/fields/account_features_field/_form.html.erb b/app/views/fields/account_features_field/_form.html.erb
index c0ef0f425..ebaa23803 100644
--- a/app/views/fields/account_features_field/_form.html.erb
+++ b/app/views/fields/account_features_field/_form.html.erb
@@ -4,11 +4,15 @@
 <div class="field-unit__field feature-container">
     <% field.data.each do |key,val| %>
     <div class='feature-cell'>
-    <% if ['audit_logs', 'response_bot'].include? key %>
-    <span class='icon-container'><i class="ion ion-asterisk"></i></span>
+    <% is_premium = SuperAdmin::AccountFeaturesHelper.account_premium_features.include? key %>
+    <% if is_premium  %>
+    <span class='icon-container'>
+      <svg class="inline" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 512 512"><path d="M480 224l-186.828 7.487L401.688 64l-59.247-32L256 208 169.824 32l-59.496 32 108.5 167.487L32 224v64l185.537-10.066L113.65 448l55.969 32L256 304l86.381 176 55.949-32-103.867-170.066L480 288z" fill="currentColor"/></svg>
+    </span>
     <% end %>
     <span><%= key %></span> 
-    <span class='value-container'><%= check_box "enabled_features", "feature_#{key}", { checked: val }, true, false  %> </span>
+    <% should_disable = is_premium && ChatwootHub.pricing_plan == 'community' %>
+    <span class='value-container'><%= check_box "enabled_features", "feature_#{key}", { checked: val, disabled: should_disable  }, true, false  %> </span>
     </div>
   <% end %>
 </div>
diff --git a/app/views/fields/account_features_field/_show.html.erb b/app/views/fields/account_features_field/_show.html.erb
index d67c0c860..c34665393 100644
--- a/app/views/fields/account_features_field/_show.html.erb
+++ b/app/views/fields/account_features_field/_show.html.erb
@@ -1,8 +1,10 @@
 <div class='feature-container'>
   <% field.data.each do |key,val| %>
     <div class='feature-cell'>
-    <% if ['audit_logs', 'response_bot'].include? key %>
-    <span class='icon-container'><i class="ion ion-asterisk"></i></span>
+    <% if SuperAdmin::AccountFeaturesHelper.account_premium_features.include? key %>
+    <span class='icon-container'>
+      <svg class="inline" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 512 512"><path d="M480 224l-186.828 7.487L401.688 64l-59.247-32L256 208 169.824 32l-59.496 32 108.5 167.487L32 224v64l185.537-10.066L113.65 448l55.969 32L256 304l86.381 176 55.949-32-103.867-170.066L480 288z" fill="currentColor"/></svg>
+    </span>
     <% end %>
     <span><%= key %></span> 
     <span class='value-container'><%= val.present? ? '✅' : '❌' %> </span>
diff --git a/app/views/public/api/v1/portals/articles/_article_header.html.erb b/app/views/public/api/v1/portals/articles/_article_header.html.erb
index 4adc6a728..9121b790a 100644
--- a/app/views/public/api/v1/portals/articles/_article_header.html.erb
+++ b/app/views/public/api/v1/portals/articles/_article_header.html.erb
@@ -30,9 +30,8 @@
 </h1>
 <div class="flex flex-col items-start justify-between w-full pt-6 md:flex-row md:items-center">
   <div class="flex items-start space-x-1">
-    <div class="pr-px mt-0.5 min-w-[20px] min-h-[20px]">
-      <%= render "public/api/v1/portals/thumbnail", author: article.author, size: 5 %>
-    </div>
-    <span class="flex items-center text-base font-medium text-slate-600 dark:text-slate-400"><%= "#{I18n.t('public_portal.common.by')} #{article.author&.available_name || article.author&.name || ''}" %> • <%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %></span>
+    <span class="flex items-center text-base font-medium text-slate-600 dark:text-slate-400">
+     <%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %>
+    </span>
   </div>
 </div>
diff --git a/app/views/public/api/v1/portals/categories/show.html.erb b/app/views/public/api/v1/portals/categories/show.html.erb
index 9ce4a7650..3e36b4753 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -32,17 +32,7 @@
             <h3 id="<%= !@is_plain_layout_enabled ? 'category-name' : '' %>" class="text-lg text-slate-900 tracking-[0.28px] dark:text-slate-50 font-semibold <%= @is_plain_layout_enabled ? 'group-hover:underline' : '' %>"><%= article.title %></h3>
             <p class="text-base font-normal text-slate-600 dark:text-slate-200 line-clamp-1 break-all"><%= render_category_content(article.content) %></p>
           </div>
-          <div class="flex flex-row items-center gap-1">
-            <div class="flex flex-row items-center gap-1">
-              <% author = article.author %>
-              <%= render "public/api/v1/portals/thumbnail", author: author, size: 5 %>
-              <% if author&.name.present? %>
-                <span class="text-sm text-slate-600 dark:text-slate-400 font-medium flex items-center"><%= "#{I18n.t('public_portal.common.by')} #{author&.name}" %></span>
-              <% end %>
-            </div>
-            <span class="text-slate-600 dark:text-slate-400">•</span>
-            <span class="text-sm text-slate-600 dark:text-slate-400 font-medium flex items-center"><%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %></span>
-          </div>
+          <span class="text-sm text-slate-600 dark:text-slate-400 font-medium flex items-center"><%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %></span>
         </div>
       </a>
     </div>  
diff --git a/app/views/super_admin/accounts/show.html.erb b/app/views/super_admin/accounts/show.html.erb
index 65cb6c567..fb8947f69 100644
--- a/app/views/super_admin/accounts/show.html.erb
+++ b/app/views/super_admin/accounts/show.html.erb
@@ -34,16 +34,24 @@ as well as a link to its edit page.
 
 <section class="main-content__body">
   <dl>
-    <% page.attributes.each do |attribute| %>
-      <dt class="attribute-label" id="<%= attribute.name %>">
-      <%= t(
-        "helpers.label.#{resource_name}.#{attribute.name}",
-        default: attribute.name.titleize,
-      ) %>
-      </dt>
+    <% page.attributes.each do |title, attributes| %>
+      <fieldset class="<%= "field-unit--nested" if title.present? %>">
+        <% if title.present? %>
+          <legend><%= t "helpers.label.#{page.resource_name}.#{title}", default: title %></legend>
+        <% end %>
 
-      <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
-          ><%= render_field attribute, page: page %></dd>
+        <% attributes.each do |attribute| %>
+          <dt class="attribute-label" id="<%= attribute.name %>">
+          <%= t(
+            "helpers.label.#{resource_name}.#{attribute.name}",
+            default: page.resource.class.human_attribute_name(attribute.name),
+          ) %>
+          </dt>
+
+          <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
+              ><%= render_field attribute, page: page %></dd>
+        <% end %>
+      </fieldset>
     <% end %>
   </dl>
 </section>
@@ -69,13 +77,15 @@ as well as a link to its edit page.
     </div>
   <% end %>
 
-  <% account_user_page.attributes.each do |attribute| -%>
-    <% if attribute.name == "account" %>
-      <%= f.hidden_field('account_id', value: page.resource.id) %>
-    <% else %>
-    <div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
-      <%= render_field attribute, f: f %>
-    </div>
+  <% account_user_page.attributes.each do |title, attributes| -%>
+    <% attributes.each do |attribute| %>
+      <% if attribute.name == "account" %>
+        <%= f.hidden_field('account_id', value: page.resource.id) %>
+      <% else %>
+      <div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
+        <%= render_field attribute, f: f %>
+      </div>
+      <% end %>
     <% end %>
   <% end -%>
 
diff --git a/app/views/super_admin/app_configs/show.html.erb b/app/views/super_admin/app_configs/show.html.erb
index 239723069..83f99f6bd 100644
--- a/app/views/super_admin/app_configs/show.html.erb
+++ b/app/views/super_admin/app_configs/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for(:title) do %>
-  Configure Settings
+  Configure Settings - <%= @config.titleize %>
 <% end %>
 <header class="main-content__header" role="banner">
   <h1 class="main-content__page-title" id="page-title">
diff --git a/app/views/super_admin/settings/show.html.erb b/app/views/super_admin/settings/show.html.erb
index 45dd46c47..db8db06e5 100644
--- a/app/views/super_admin/settings/show.html.erb
+++ b/app/views/super_admin/settings/show.html.erb
@@ -13,6 +13,15 @@
   </div>
 </header>
 <section class="main-content__body">
+
+  <% if Redis::Alfred.get(Redis::Alfred::CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING) %>
+    <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative mb-5" role="alert">
+    <strong class="font-bold">Alert!</strong>
+    <span class="block sm:inline">Unauthorized premium changes detected in Chatwoot. To keep using them, please upgrade your plan. 
+      Contact for help :</span><span class="inline rounded-full bg-red-200 px-2  text-white  ml-2">sales@chatwoot.com</span>
+    </div>
+  <% end %>
+
   <div class="bg-white py-2 px-3">
     <div class="mb-4">
       <div class="flex items-center gap-2">
@@ -44,7 +53,7 @@
     <% if ChatwootHub.pricing_plan != 'community' &&  User.count > ChatwootHub.pricing_plan_quantity %>
     <div role="alert">
       <div class="border border-t-0 border-red-400 rounded-b bg-red-100 px-4 py-3 text-red-700">
-        <p>You have <%= User.count %> agents. Please add more licenses.</p>
+        <p>You have <%= User.count %> agents. Please add more licenses to add more users.</p>
       </div>
     </div>
     <% end %>
diff --git a/app/views/super_admin/users/show.html.erb b/app/views/super_admin/users/show.html.erb
index 37a79b121..a5bc2bf39 100644
--- a/app/views/super_admin/users/show.html.erb
+++ b/app/views/super_admin/users/show.html.erb
@@ -34,16 +34,24 @@ as well as a link to its edit page.
 
 <section class="main-content__body">
   <dl>
-    <% page.attributes.each do |attribute| %>
-      <dt class="attribute-label" id="<%= attribute.name %>">
-      <%= t(
-        "helpers.label.#{resource_name}.#{attribute.name}",
-        default: attribute.name.titleize,
-      ) %>
-      </dt>
+    <% page.attributes.each do |title, attributes| %>
+      <fieldset class="<%= "field-unit--nested" if title.present? %>">
+        <% if title.present? %>
+          <legend><%= t "helpers.label.#{page.resource_name}.#{title}", default: title %></legend>
+        <% end %>
 
-      <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
-          ><%= render_field attribute, page: page %></dd>
+        <% attributes.each do |attribute| %>
+          <dt class="attribute-label" id="<%= attribute.name %>">
+          <%= t(
+            "helpers.label.#{resource_name}.#{attribute.name}",
+            default: page.resource.class.human_attribute_name(attribute.name),
+          ) %>
+          </dt>
+
+          <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
+              ><%= render_field attribute, page: page %></dd>
+        <% end %>
+      </fieldset>
     <% end %>
   </dl>
 </section>
@@ -69,14 +77,16 @@ as well as a link to its edit page.
     </div>
   <% end %>
 
-  <% account_user_page.attributes.each do |attribute| -%>
-    <% if attribute.name == "user" %>
-      <%= f.hidden_field('user_id', value: page.resource.id) %>
-    <% else %>
-    <div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
-      <%= render_field attribute, f: f %>
-    </div>
-    <% end %>
+  <% account_user_page.attributes.each do |title, attributes| -%>
+    <% attributes.each do |attribute| %>
+      <% if attribute.name == "user" %>
+        <%= f.hidden_field('user_id', value: page.resource.id) %>
+      <% else %>
+      <div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
+        <%= render_field attribute, f: f %>
+      </div>
+      <% end %>
+    <% end %>  
   <% end -%>
 
   <div class="form-actions">
diff --git a/app/workers/email_reply_worker.rb b/app/workers/email_reply_worker.rb
index dddbae3dd..20cc70d5e 100644
--- a/app/workers/email_reply_worker.rb
+++ b/app/workers/email_reply_worker.rb
@@ -8,6 +8,9 @@ class EmailReplyWorker
     return unless message.email_notifiable_message?
 
     # send the email
-    ConversationReplyMailer.with(account: message.account).email_reply(message).deliver_later
+    ConversationReplyMailer.with(account: message.account).email_reply(message).deliver_now
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: message.account).capture_exception
+    message.update!(status: :failed, external_error: e.message)
   end
 end
diff --git a/config/features.yml b/config/features.yml
index 1bb355fc8..529ad37d9 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -11,6 +11,7 @@
   enabled: false
 - name: disable_branding
   enabled: false
+  premium:  true
 - name: email_continuity_on_api_channel
   enabled: false
 - name: help_center
@@ -55,9 +56,13 @@
   enabled: false
 - name: audit_logs
   enabled: false
+  premium: true
 - name: response_bot
   enabled: false
+  premium: true
 - name: message_reply_to
   enabled: false
 - name: insert_article_in_reply
   enabled: false
+- name: inbox_view
+  enabled: false
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 3c6b7611f..99974f4f7 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -94,6 +94,11 @@ class Rack::Attack
     end
   end
 
+  ## Resend confirmation throttling
+  throttle('resend_confirmation/ip', limit: 5, period: 30.minutes) do |req|
+    req.ip if req.path_without_extentions == '/api/v1/profile/resend_confirmation' && req.post?
+  end
+
   ## Prevent Brute-Force Signup Attacks ###
   throttle('accounts/ip', limit: 5, period: 30.minutes) do |req|
     req.ip if req.path_without_extentions == '/api/v1/accounts' && req.post?
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 0778ab922..2643461e2 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -1,5 +1,20 @@
-# if you don't specify locked attribute, the default value will be true
-# which means the particular config will be locked
+# This file contains all the installation wide configuration which controls various settings in Chatwoot
+# This is internal config and should not be modified by the user directly in database
+# Chatwoot might override and modify these values during the upgrade process
+# Configs which can be modified by the user are available in the dashboard under appropriate UI
+#
+# name: the name of the config referenced in the code
+# value: the value of the config
+# display_title: the title of the config displayed in the dashboard UI
+# description: the description of the config displayed in the dashboard UI
+# locked: if you don't specify locked attribute in yaml, the default value will be true, 
+#         which means the particular config will be locked and won't be available in `super_admin/installation_configs`
+# premium: These values get overwritten unless the user is on a premium plan
+# type: The type of the config. Default is text,  boolean is also supported
+
+
+
+# ------- Branding Related Config ------- #
 - name: INSTALLATION_NAME
   value: 'Chatwoot'
   display_title: 'Installation Name'
@@ -41,32 +56,20 @@
   display_title: 'Chatwoot Metadata'
   description: 'Display default Chatwoot metadata like favicons and upgrade warnings'
   type: boolean
-- name: MAILER_INBOUND_EMAIL_DOMAIN
-  value:
-  locked: false
-- name: MAILER_SUPPORT_EMAIL
-  value:
+# ------- End of Branding Related Config ------- #
+
+
+
+# ------- Signup & Account Related Config ------- #
+- name: ENABLE_ACCOUNT_SIGNUP
+  display_title: 'Enable Account Signup'
+  value: false
+  description: 'Allow users to signup for new accounts'
   locked: false
+  type: boolean
 - name: CREATE_NEW_ACCOUNT_FROM_DASHBOARD
   value: false
-  locked: false
-- name: INSTALLATION_EVENTS_WEBHOOK_URL
-  value:
-  locked: false
-- name: CHATWOOT_INBOX_TOKEN
-  value:
-  locked: false
-- name: CHATWOOT_INBOX_HMAC_KEY
-  value:
-  locked: false
-- name: API_CHANNEL_NAME
-  value:
-- name: API_CHANNEL_THUMBNAIL
-  value:
-- name: ANALYTICS_TOKEN
-  value:
-- name: DIRECT_UPLOADS_ENABLED
-  value: false
+  description: 'Allow users to create new accounts from the dashboard'
   locked: false
 - name: HCAPTCHA_SITE_KEY
   value:
@@ -74,34 +77,107 @@
 - name: HCAPTCHA_SERVER_KEY
   value:
   locked: false
-- name: LOGOUT_REDIRECT_LINK
-  value: /app/login
+- name: INSTALLATION_EVENTS_WEBHOOK_URL
+  value:
+  display_title: 'System events Webhook URL'
+  description: 'The URL to which the system events like new accounts created will be sent'
   locked: false
-- name: DISABLE_USER_PROFILE_UPDATE
+- name: DIRECT_UPLOADS_ENABLED
+  type: boolean
   value: false
+  description: 'Enable direct uploads to cloud storage'
+  locked: false
+# ------- End of Account Related Config ------- #
+
+
+
+# ------- Email Related Config ------- #
+- name: MAILER_INBOUND_EMAIL_DOMAIN
+  value:
+  description: 'The domain name to be used for generating conversation continuity emails (reply+id@domain.com)'
+  locked: false
+- name: MAILER_SUPPORT_EMAIL
+  value:
+  locked: false
+# ------- End of Email Related Config ------- #
+
+
+# ------- Facebook Channel Related Config ------- #
+- name: FB_APP_ID 
+  display_title: 'Facebook App ID'
+  locked: false
+- name: FB_VERIFY_TOKEN 
+  display_title: 'Facebook Verify Token'
+  description: 'The verify token used for Facebook Messenger Webhook'
+  locked: false
+- name: FB_APP_SECRET
+  display_title: 'Facebook App Secret'
+  locked: false
+- name: IG_VERIFY_TOKEN
+  display_title: 'Instagram Verify Token'
+  description: 'The verify token used for Instagram Webhook'
   locked: false
 - name: ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT
+  display_title: 'Enable human agent'
   value: false
   locked: false
-- name: CSML_BOT_HOST
+  description: 'Enable human agent for messenger channel for longer message back period. Needs additional app approval: https://developers.facebook.com/docs/features-reference/human-agent/'
+  type: boolean
+# ------- End of Facebook Channel Related Config ------- #
+
+# ------- Chatwoot Internal Config for Cloud ----#
+- name: CHATWOOT_INBOX_TOKEN
   value:
+  description: 'The Chatwoot Inbox Token for Contact Support in Cloud'
   locked: false
-- name: CSML_BOT_API_KEY
+- name: CHATWOOT_INBOX_HMAC_KEY
   value:
+  description: 'The Chatwoot Inbox HMAC Key for Contact Support in Cloud'
   locked: false
 - name: CHATWOOT_CLOUD_PLANS
   value:
+  description: 'Config to store stripe plans for cloud'
 - name: DEPLOYMENT_ENV
   value: self-hosted
-- name: CSML_EDITOR_HOST
+  description: 'The deployment environment of the installation, to differentiate between Chatwoot cloud and self-hosted'
+- name: ANALYTICS_TOKEN
   value:
+  description: 'The June.so analytics token for Chatwoot cloud'
+# ------- End of Chatwoot Internal Config for Cloud ----#
+
+
+# ------- Chatwoot Internal Config for Self Hosted ----#
 - name: INSTALLATION_PRICING_PLAN
   value: 'community'
+  description: 'The pricing plan for the installation, retrieved from the billing API'
 - name: INSTALLATION_PRICING_PLAN_QUANTITY
   value: 0
+  description: 'The number of licenses purchased for the installation, retrieved from the billing API'
 - name: CHATWOOT_SUPPORT_WEBSITE_TOKEN
   value:
+  description: 'The Chatwoot website token, used to identify the Chatwoot inbox and display the "Contact Support" option on the billing page'
 - name: CHATWOOT_SUPPORT_SCRIPT_URL
   value:
+  description: 'The Chatwoot script base URL, to display the "Contact Support" option on the billing page'
 - name: CHATWOOT_SUPPORT_IDENTIFIER_HASH
   value:
+  description: 'The Chatwoot identifier hash, to validate the contact in the live chat window.'
+# ------- End of Chatwoot Internal Config for Self Hosted ----#
+
+## ------ Configs added for enterprise clients ------ ##
+- name: API_CHANNEL_NAME
+  value:
+  description: 'Custom name for the API channel'
+- name: API_CHANNEL_THUMBNAIL
+  value:
+  description: 'Custom thumbnail for the API channel'
+- name: LOGOUT_REDIRECT_LINK
+  value: /app/login
+  locked: false
+  description: 'Redirect to a different link after logout'
+- name: DISABLE_USER_PROFILE_UPDATE
+  value: false
+  locked: false
+  description: 'Disable rendering profile update page for users'
+
+## ------ End of Configs added for enterprise clients ------ ##
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e6629ae8d..da4f35032 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -45,6 +45,7 @@ en:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
       email_already_exists: "You have already signed up for an account with %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
diff --git a/config/routes.rb b/config/routes.rb
index ec838c107..210d5bc0e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,7 +44,9 @@ Rails.application.routes.draw do
             resource :contact_merge, only: [:create]
           end
           resource :bulk_actions, only: [:create]
-          resources :agents, only: [:index, :create, :update, :destroy]
+          resources :agents, only: [:index, :create, :update, :destroy] do
+            post :bulk_create, on: :collection
+          end
           resources :agent_bots, only: [:index, :create, :show, :update, :destroy] do
             delete :avatar, on: :member
           end
@@ -173,9 +175,11 @@ Rails.application.routes.draw do
             collection do
               post :read_all
               get :unread_count
+              post :destroy_all
             end
             member do
               post :snooze
+              post :unread
             end
           end
           resource :notification_settings, only: [:show, :update]
@@ -247,6 +251,7 @@ Rails.application.routes.draw do
           post :availability
           post :auto_offline
           put :set_active_account
+          post :resend_confirmation
         end
       end
 
@@ -287,16 +292,18 @@ Rails.application.routes.draw do
     end
 
     namespace :v2 do
-      resources :accounts, only: [], module: :accounts do
-        resources :reports, only: [:index] do
-          collection do
-            get :summary
-            get :agents
-            get :inboxes
-            get :labels
-            get :teams
-            get :conversations
-            get :conversation_traffic
+      resources :accounts, only: [:create] do
+        scope module: :accounts do
+          resources :reports, only: [:index] do
+            collection do
+              get :summary
+              get :agents
+              get :inboxes
+              get :labels
+              get :teams
+              get :conversations
+              get :conversation_traffic
+            end
           end
         end
       end
diff --git a/db/migrate/20200225162150_init_schema.rb b/db/migrate/20200225162150_init_schema.rb
deleted file mode 100644
index 9b6bd39c3..000000000
--- a/db/migrate/20200225162150_init_schema.rb
+++ /dev/null
@@ -1,280 +0,0 @@
-class InitSchema < ActiveRecord::Migration[6.0]
-  def up
-    # These are extensions that must be enabled in order to support this database
-    enable_extension 'plpgsql'
-    create_table 'account_users' do |t|
-      t.bigint 'account_id'
-      t.bigint 'user_id'
-      t.integer 'role', default: 0
-      t.bigint 'inviter_id'
-      t.datetime 'created_at', precision: 6, null: false
-      t.datetime 'updated_at', precision: 6, null: false
-      t.index %w[account_id user_id], name: 'uniq_user_id_per_account_id', unique: true
-      t.index ['account_id'], name: 'index_account_users_on_account_id'
-      t.index ['user_id'], name: 'index_account_users_on_user_id'
-    end
-    create_table 'accounts', id: :serial do |t|
-      t.string 'name', null: false
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-    end
-    create_table 'active_storage_attachments' do |t|
-      t.string 'name', null: false
-      t.string 'record_type', null: false
-      t.bigint 'record_id', null: false
-      t.bigint 'blob_id', null: false
-      t.datetime 'created_at', null: false
-      t.index ['blob_id'], name: 'index_active_storage_attachments_on_blob_id'
-      t.index %w[record_type record_id name blob_id], name: 'index_active_storage_attachments_uniqueness', unique: true
-    end
-    create_table 'active_storage_blobs' do |t|
-      t.string 'key', null: false
-      t.string 'filename', null: false
-      t.string 'content_type'
-      t.text 'metadata'
-      t.bigint 'byte_size', null: false
-      t.string 'checksum', null: false
-      t.datetime 'created_at', null: false
-      t.index ['key'], name: 'index_active_storage_blobs_on_key', unique: true
-    end
-    create_table 'agent_bot_inboxes' do |t|
-      t.integer 'inbox_id'
-      t.integer 'agent_bot_id'
-      t.integer 'status', default: 0
-      t.datetime 'created_at', precision: 6, null: false
-      t.datetime 'updated_at', precision: 6, null: false
-    end
-    create_table 'agent_bots' do |t|
-      t.string 'name'
-      t.string 'description'
-      t.string 'outgoing_url'
-      t.string 'auth_token'
-      t.datetime 'created_at', precision: 6, null: false
-      t.datetime 'updated_at', precision: 6, null: false
-    end
-    create_table 'attachments', id: :serial do |t|
-      t.integer 'file_type', default: 0
-      t.string 'external_url'
-      t.float 'coordinates_lat', default: 0.0
-      t.float 'coordinates_long', default: 0.0
-      t.integer 'message_id', null: false
-      t.integer 'account_id', null: false
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.string 'fallback_title'
-      t.string 'extension'
-    end
-    create_table 'canned_responses', id: :serial do |t|
-      t.integer 'account_id', null: false
-      t.string 'short_code'
-      t.text 'content'
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-    end
-    create_table 'channel_facebook_pages', id: :serial do |t|
-      t.string 'name', null: false
-      t.string 'page_id', null: false
-      t.string 'user_access_token', null: false
-      t.string 'page_access_token', null: false
-      t.integer 'account_id', null: false
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.index %w[page_id account_id], name: 'index_channel_facebook_pages_on_page_id_and_account_id', unique: true
-      t.index ['page_id'], name: 'index_channel_facebook_pages_on_page_id'
-    end
-    create_table 'channel_twitter_profiles' do |t|
-      t.string 'name'
-      t.string 'profile_id', null: false
-      t.string 'twitter_access_token', null: false
-      t.string 'twitter_access_token_secret', null: false
-      t.integer 'account_id', null: false
-      t.datetime 'created_at', precision: 6, null: false
-      t.datetime 'updated_at', precision: 6, null: false
-    end
-    create_table 'channel_web_widgets', id: :serial do |t|
-      t.string 'website_name'
-      t.string 'website_url'
-      t.integer 'account_id'
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.string 'website_token'
-      t.string 'widget_color', default: '#1f93ff'
-      t.index ['website_token'], name: 'index_channel_web_widgets_on_website_token', unique: true
-    end
-    create_table 'contact_inboxes' do |t|
-      t.bigint 'contact_id'
-      t.bigint 'inbox_id'
-      t.string 'source_id', null: false
-      t.datetime 'created_at', precision: 6, null: false
-      t.datetime 'updated_at', precision: 6, null: false
-      t.index ['contact_id'], name: 'index_contact_inboxes_on_contact_id'
-      t.index %w[inbox_id source_id], name: 'index_contact_inboxes_on_inbox_id_and_source_id', unique: true
-      t.index ['inbox_id'], name: 'index_contact_inboxes_on_inbox_id'
-      t.index ['source_id'], name: 'index_contact_inboxes_on_source_id'
-    end
-    create_table 'contacts', id: :serial do |t|
-      t.string 'name'
-      t.string 'email'
-      t.string 'phone_number'
-      t.integer 'account_id', null: false
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.string 'pubsub_token'
-      t.jsonb 'additional_attributes'
-      t.index ['account_id'], name: 'index_contacts_on_account_id'
-      t.index ['pubsub_token'], name: 'index_contacts_on_pubsub_token', unique: true
-    end
-    create_table 'conversations', id: :serial do |t|
-      t.integer 'account_id', null: false
-      t.integer 'inbox_id', null: false
-      t.integer 'status', default: 0, null: false
-      t.integer 'assignee_id'
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.bigint 'contact_id'
-      t.integer 'display_id', null: false
-      t.datetime 'user_last_seen_at'
-      t.datetime 'agent_last_seen_at'
-      t.boolean 'locked', default: false
-      t.jsonb 'additional_attributes'
-      t.bigint 'contact_inbox_id'
-      t.index %w[account_id display_id], name: 'index_conversations_on_account_id_and_display_id', unique: true
-      t.index ['account_id'], name: 'index_conversations_on_account_id'
-      t.index ['contact_inbox_id'], name: 'index_conversations_on_contact_inbox_id'
-    end
-    create_table 'inbox_members', id: :serial do |t|
-      t.integer 'user_id', null: false
-      t.integer 'inbox_id', null: false
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.index ['inbox_id'], name: 'index_inbox_members_on_inbox_id'
-    end
-    create_table 'inboxes', id: :serial do |t|
-      t.integer 'channel_id', null: false
-      t.integer 'account_id', null: false
-      t.string 'name', null: false
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.string 'channel_type'
-      t.boolean 'enable_auto_assignment', default: true
-      t.index ['account_id'], name: 'index_inboxes_on_account_id'
-    end
-    create_table 'messages', id: :serial do |t|
-      t.text 'content'
-      t.integer 'account_id', null: false
-      t.integer 'inbox_id', null: false
-      t.integer 'conversation_id', null: false
-      t.integer 'message_type', null: false
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.boolean 'private', default: false
-      t.integer 'user_id'
-      t.integer 'status', default: 0
-      t.string 'source_id'
-      t.integer 'content_type', default: 0
-      t.json 'content_attributes', default: {}
-      t.bigint 'contact_id'
-      t.index ['contact_id'], name: 'index_messages_on_contact_id'
-      t.index ['conversation_id'], name: 'index_messages_on_conversation_id'
-      t.index ['source_id'], name: 'index_messages_on_source_id'
-    end
-    create_table 'notification_settings' do |t|
-      t.integer 'account_id'
-      t.integer 'user_id'
-      t.integer 'email_flags', default: 0, null: false
-      t.datetime 'created_at', precision: 6, null: false
-      t.datetime 'updated_at', precision: 6, null: false
-      t.index %w[account_id user_id], name: 'by_account_user', unique: true
-    end
-    create_table 'subscriptions', id: :serial do |t|
-      t.string 'pricing_version'
-      t.integer 'account_id'
-      t.datetime 'expiry'
-      t.string 'billing_plan', default: 'trial'
-      t.string 'stripe_customer_id'
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.integer 'state', default: 0
-      t.boolean 'payment_source_added', default: false
-    end
-    create_table 'taggings', id: :serial do |t|
-      t.integer 'tag_id'
-      t.string 'taggable_type'
-      t.integer 'taggable_id'
-      t.string 'tagger_type'
-      t.integer 'tagger_id'
-      t.string 'context', limit: 128
-      t.datetime 'created_at'
-      t.index ['context'], name: 'index_taggings_on_context'
-      t.index %w[tag_id taggable_id taggable_type context tagger_id tagger_type], name: 'taggings_idx', unique: true
-      t.index ['tag_id'], name: 'index_taggings_on_tag_id'
-      t.index %w[taggable_id taggable_type context], name: 'index_taggings_on_taggable_id_and_taggable_type_and_context'
-      t.index %w[taggable_id taggable_type tagger_id context], name: 'taggings_idy'
-      t.index ['taggable_id'], name: 'index_taggings_on_taggable_id'
-      t.index %w[taggable_type taggable_id], name: 'index_taggings_on_taggable_type_and_taggable_id'
-      t.index ['taggable_type'], name: 'index_taggings_on_taggable_type'
-      t.index %w[tagger_id tagger_type], name: 'index_taggings_on_tagger_id_and_tagger_type'
-      t.index ['tagger_id'], name: 'index_taggings_on_tagger_id'
-      t.index %w[tagger_type tagger_id], name: 'index_taggings_on_tagger_type_and_tagger_id'
-    end
-    create_table 'tags', id: :serial do |t|
-      t.string 'name'
-      t.integer 'taggings_count', default: 0
-      t.index ['name'], name: 'index_tags_on_name', unique: true
-    end
-    create_table 'telegram_bots', id: :serial do |t|
-      t.string 'name'
-      t.string 'auth_key'
-      t.integer 'account_id'
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-    end
-    create_table 'users', id: :serial do |t|
-      t.string 'provider', default: 'email', null: false
-      t.string 'uid', default: '', null: false
-      t.string 'encrypted_password', default: '', null: false
-      t.string 'reset_password_token'
-      t.datetime 'reset_password_sent_at'
-      t.datetime 'remember_created_at'
-      t.integer 'sign_in_count', default: 0, null: false
-      t.datetime 'current_sign_in_at'
-      t.datetime 'last_sign_in_at'
-      t.string 'current_sign_in_ip'
-      t.string 'last_sign_in_ip'
-      t.string 'confirmation_token'
-      t.datetime 'confirmed_at'
-      t.datetime 'confirmation_sent_at'
-      t.string 'unconfirmed_email'
-      t.string 'name', null: false
-      t.string 'nickname'
-      t.string 'email'
-      t.json 'tokens'
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.string 'pubsub_token'
-      t.index ['email'], name: 'index_users_on_email'
-      t.index ['pubsub_token'], name: 'index_users_on_pubsub_token', unique: true
-      t.index ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
-      t.index %w[uid provider], name: 'index_users_on_uid_and_provider', unique: true
-    end
-    create_table 'webhooks' do |t|
-      t.integer 'account_id'
-      t.integer 'inbox_id'
-      t.string 'url'
-      t.datetime 'created_at', precision: 6, null: false
-      t.datetime 'updated_at', precision: 6, null: false
-      t.integer 'webhook_type', default: 0
-    end
-    add_foreign_key 'account_users', 'accounts'
-    add_foreign_key 'account_users', 'users'
-    add_foreign_key 'active_storage_attachments', 'active_storage_blobs', column: 'blob_id'
-    add_foreign_key 'contact_inboxes', 'contacts'
-    add_foreign_key 'contact_inboxes', 'inboxes'
-    add_foreign_key 'conversations', 'contact_inboxes'
-    add_foreign_key 'messages', 'contacts'
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration, 'The initial migration is not revertable'
-  end
-end
diff --git a/db/migrate/20200309170810_create_access_tokens.rb b/db/migrate/20200309170810_create_access_tokens.rb
deleted file mode 100644
index fa6cf8058..000000000
--- a/db/migrate/20200309170810_create_access_tokens.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class CreateAccessTokens < ActiveRecord::Migration[6.0]
-  def change
-    create_table :access_tokens do |t|
-      t.references :owner, polymorphic: true, index: true
-      t.string :token, index: { unique: true }
-      t.timestamps
-    end
-
-    remove_column :agent_bots, :auth_token, :string
-
-    [::User, ::AgentBot].each do |access_tokenable|
-      generate_access_tokens(access_tokenable)
-    end
-  end
-
-  def generate_access_tokens(access_tokenable)
-    access_tokenable.find_in_batches do |record_batch|
-      record_batch.each do |record|
-        record.create_access_token if record.access_token.blank?
-      end
-    end
-  end
-end
diff --git a/db/migrate/20200309213132_add_account_id_to_agent_bot_inboxes.rb b/db/migrate/20200309213132_add_account_id_to_agent_bot_inboxes.rb
deleted file mode 100644
index be77b9dbc..000000000
--- a/db/migrate/20200309213132_add_account_id_to_agent_bot_inboxes.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class AddAccountIdToAgentBotInboxes < ActiveRecord::Migration[6.0]
-  def change
-    add_column :agent_bot_inboxes, :account_id, :integer, index: true
-
-    AgentBotInbox.all.each do |agent_bot_inbox|
-      agent_bot_inbox.account_id = agent_bot_inbox.inbox.account_id
-      agent_bot_inbox.save!
-    end
-  end
-end
diff --git a/db/migrate/20200310062527_create_events.rb b/db/migrate/20200310062527_create_events.rb
deleted file mode 100644
index ee5492a0f..000000000
--- a/db/migrate/20200310062527_create_events.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class CreateEvents < ActiveRecord::Migration[6.0]
-  def change
-    create_table :events do |t|
-      t.string :name
-      t.float :value
-      t.integer :account_id
-      t.integer :inbox_id
-      t.integer :user_id
-      t.integer :conversation_id
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200310070540_add_index_to_event.rb b/db/migrate/20200310070540_add_index_to_event.rb
deleted file mode 100644
index 45eadea6f..000000000
--- a/db/migrate/20200310070540_add_index_to_event.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddIndexToEvent < ActiveRecord::Migration[6.0]
-  def change
-    add_index :events, :name
-    add_index :events, :created_at
-    add_index :events, :account_id
-    add_index :events, :inbox_id
-    add_index :events, :user_id
-  end
-end
diff --git a/db/migrate/20200311083854_add_index_to_message.rb b/db/migrate/20200311083854_add_index_to_message.rb
deleted file mode 100644
index 7ad85e78f..000000000
--- a/db/migrate/20200311083854_add_index_to_message.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddIndexToMessage < ActiveRecord::Migration[6.0]
-  def change
-    add_index :messages, :account_id
-    add_index :messages, :inbox_id
-    add_index :messages, :user_id
-  end
-end
diff --git a/db/migrate/20200325210612_add_locale_to_account.rb b/db/migrate/20200325210612_add_locale_to_account.rb
deleted file mode 100644
index 08ecff067..000000000
--- a/db/migrate/20200325210612_add_locale_to_account.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddLocaleToAccount < ActiveRecord::Migration[6.0]
-  def change
-    add_column :accounts, :locale, :integer, default: 0
-  end
-end
diff --git a/db/migrate/20200330071706_create_channel_twilio_sms.rb b/db/migrate/20200330071706_create_channel_twilio_sms.rb
deleted file mode 100644
index 545c845e6..000000000
--- a/db/migrate/20200330071706_create_channel_twilio_sms.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateChannelTwilioSms < ActiveRecord::Migration[6.0]
-  def change
-    create_table :channel_twilio_sms do |t|
-      t.string :phone_number, null: false
-      t.string :auth_token, null: false
-      t.string :account_sid, null: false
-      t.integer :account_id, null: false
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200330115622_create_action_mailbox_tables.action_mailbox.rb b/db/migrate/20200330115622_create_action_mailbox_tables.action_mailbox.rb
deleted file mode 100644
index a5dd66e02..000000000
--- a/db/migrate/20200330115622_create_action_mailbox_tables.action_mailbox.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# This migration comes from action_mailbox (originally 20180917164000)
-class CreateActionMailboxTables < ActiveRecord::Migration[6.0]
-  def change
-    create_table :action_mailbox_inbound_emails do |t|
-      t.integer :status, default: 0, null: false
-      t.string  :message_id, null: false
-      t.string  :message_checksum, null: false
-
-      t.timestamps
-
-      t.index [:message_id, :message_checksum], name: 'index_action_mailbox_inbound_emails_uniqueness', unique: true
-    end
-  end
-end
diff --git a/db/migrate/20200331095710_add_identifier_to_contact.rb b/db/migrate/20200331095710_add_identifier_to_contact.rb
deleted file mode 100644
index f34557c57..000000000
--- a/db/migrate/20200331095710_add_identifier_to_contact.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddIdentifierToContact < ActiveRecord::Migration[6.0]
-  def change
-    add_column :contacts, :identifier, :string, index: true, default: nil
-    add_index :contacts, ['identifier', :account_id], unique: true, name: 'uniq_identifier_per_account_contact'
-    add_index :contacts, ['email', :account_id], unique: true, name: 'uniq_email_per_account_contact'
-  end
-end
diff --git a/db/migrate/20200404092329_add_conversation_uuid.rb b/db/migrate/20200404092329_add_conversation_uuid.rb
deleted file mode 100644
index 19de9110c..000000000
--- a/db/migrate/20200404092329_add_conversation_uuid.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddConversationUuid < ActiveRecord::Migration[6.0]
-  def change
-    enable_extension 'pgcrypto'
-    add_column :conversations, :uuid, :uuid, default: 'gen_random_uuid()', null: false
-  end
-end
diff --git a/db/migrate/20200404135009_add_unique_validation_index.rb b/db/migrate/20200404135009_add_unique_validation_index.rb
deleted file mode 100644
index 7dcab8c46..000000000
--- a/db/migrate/20200404135009_add_unique_validation_index.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddUniqueValidationIndex < ActiveRecord::Migration[6.0]
-  def change
-    add_index :channel_twitter_profiles, [:account_id, :profile_id], unique: true
-    add_index :channel_twilio_sms, [:account_id, :phone_number], unique: true
-    add_index :webhooks, [:account_id, :url], unique: true
-  end
-end
diff --git a/db/migrate/20200410145519_devise_create_super_admins.rb b/db/migrate/20200410145519_devise_create_super_admins.rb
deleted file mode 100644
index 4a74847dc..000000000
--- a/db/migrate/20200410145519_devise_create_super_admins.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class DeviseCreateSuperAdmins < ActiveRecord::Migration[6.0]
-  def change
-    return if ActiveRecord::Base.connection.table_exists? 'super_admins'
-
-    create_table :super_admins do |t|
-      ## Database authenticatable
-      t.string :email,              null: false, default: ''
-      t.string :encrypted_password, null: false, default: ''
-
-      ## Recoverable
-      # t.string   :reset_password_token
-      # t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      t.integer  :sign_in_count, default: 0, null: false
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.inet     :current_sign_in_ip
-      t.inet     :last_sign_in_ip
-
-      ## Confirmable
-      # t.string   :confirmation_token
-      # t.datetime :confirmed_at
-      # t.datetime :confirmation_sent_at
-      # t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-      t.timestamps null: false
-    end
-
-    add_index :super_admins, :email, unique: true
-    # add_index :super_admins, :reset_password_token, unique: true
-    # add_index :super_admins, :confirmation_token,   unique: true
-    # add_index :super_admins, :unlock_token,         unique: true
-  end
-end
diff --git a/db/migrate/20200411125638_add_domain_to_accounts.rb b/db/migrate/20200411125638_add_domain_to_accounts.rb
deleted file mode 100644
index fdb5ea8f9..000000000
--- a/db/migrate/20200411125638_add_domain_to_accounts.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddDomainToAccounts < ActiveRecord::Migration[6.0]
-  def change
-    change_table :accounts, bulk: true do |t|
-      t.string :domain, limit: 100
-      t.string :support_email, limit: 100
-      t.integer :settings_flags, default: 0, null: false
-    end
-  end
-end
diff --git a/db/migrate/20200417093432_remove_name_from_channels.rb b/db/migrate/20200417093432_remove_name_from_channels.rb
deleted file mode 100644
index 1b246801d..000000000
--- a/db/migrate/20200417093432_remove_name_from_channels.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-class RemoveNameFromChannels < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :channel_facebook_pages, :name, :string
-    remove_column :channel_twitter_profiles, :name, :string
-    migrate_web_widget_name_to_inbox
-    remove_column :channel_web_widgets, :website_name, :string
-
-    add_column :channel_web_widgets, :welcome_title, :string
-    add_column :channel_web_widgets, :welcome_tagline, :string
-    add_column :channel_web_widgets, :agent_away_message, :string
-    purge_orphan_facebook_pages
-    remove_avatars_from_channel_to_inbox
-  end
-
-  def purge_orphan_facebook_pages
-    Channel::FacebookPage.all.each do |facebook_page|
-      facebook_page.destroy! if facebook_page.inbox.nil?
-    end
-  end
-
-  def migrate_web_widget_name_to_inbox
-    Channel::WebWidget.all.each do |widget|
-      widget.inbox.name = widget.website_name
-      widget.save!
-    end
-  end
-
-  def remove_avatars_from_channel_to_inbox
-    Channel::FacebookPage.all.each do |facebook_page|
-      next unless facebook_page.avatar
-
-      facebook_page.avatar.purge
-    end
-  end
-end
diff --git a/db/migrate/20200418124534_add_sender_to_messages.rb b/db/migrate/20200418124534_add_sender_to_messages.rb
deleted file mode 100644
index 79a1a2a03..000000000
--- a/db/migrate/20200418124534_add_sender_to_messages.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class AddSenderToMessages < ActiveRecord::Migration[6.0]
-  def change
-    add_reference :messages, :sender, polymorphic: true, index: true
-    add_sender_from_message
-    remove_index :messages, name: 'index_messages_on_contact_id', column: 'contact_id'
-    remove_index :messages, name: 'index_messages_on_user_id', column: 'user_id'
-    remove_column :messages, :user_id, :integer
-    remove_column :messages, :contact_id, :integer
-  end
-
-  def add_sender_from_message
-    ::Message.find_in_batches do |messages_batch|
-      Rails.logger.info "migrated till #{messages_batch.first.id}\n"
-      messages_batch.each do |message|
-        # rubocop:disable Rails/SkipsModelValidations
-        message.update_columns(sender_id: message.user.id, sender_type: 'User') if message.user.present?
-        message.update_columns(sender_id: message.contact.id, sender_type: 'Contact') if message.contact.present?
-        message.update_columns(sender_id: message.conversation.contact.id, sender_type: 'Contact') if message.sender.nil? && message.incoming?
-        # rubocop:enable Rails/SkipsModelValidations
-      end
-    end
-  end
-end
diff --git a/db/migrate/20200422130153_create_notifications.rb b/db/migrate/20200422130153_create_notifications.rb
deleted file mode 100644
index cace1f981..000000000
--- a/db/migrate/20200422130153_create_notifications.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-class CreateNotifications < ActiveRecord::Migration[6.0]
-  def change
-    create_table :notifications do |t|
-      t.references :account, index: true, null: false
-      t.references :user, index: true, null: false
-      t.integer :notification_type, null: false
-      t.references :primary_actor, polymorphic: true, null: false, index: { name: 'uniq_primary_actor_per_account_notifications' }
-      t.references :secondary_actor, polymorphic: true, index: { name: 'uniq_secondary_actor_per_account_notifications' }
-      t.timestamp :read_at, default: nil
-
-      t.timestamps
-    end
-
-    create_table :notification_subscriptions do |t|
-      t.references :user, index: true, null: false
-      t.integer :subscription_type, null: false
-      t.jsonb :subscription_attributes, null: false, default: '{}'
-      t.timestamps
-    end
-
-    add_column :notification_settings, :push_flags, :integer, default: 0, null: false
-    add_push_settings_to_users
-  end
-
-  def add_push_settings_to_users
-    ::User.find_in_batches do |users_batch|
-      users_batch.each do |user|
-        user_notification_setting = user.notification_settings.first
-        user_notification_setting.push_conversation_assignment = true
-        user_notification_setting.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20200429082655_add_medium_to_twilio_sms.rb b/db/migrate/20200429082655_add_medium_to_twilio_sms.rb
deleted file mode 100644
index d54429104..000000000
--- a/db/migrate/20200429082655_add_medium_to_twilio_sms.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddMediumToTwilioSms < ActiveRecord::Migration[6.0]
-  def change
-    add_column :channel_twilio_sms, :medium, :integer, index: true, default: 0
-  end
-end
diff --git a/db/migrate/20200430163438_create_integrations_hooks.rb b/db/migrate/20200430163438_create_integrations_hooks.rb
deleted file mode 100644
index 487297bf6..000000000
--- a/db/migrate/20200430163438_create_integrations_hooks.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class CreateIntegrationsHooks < ActiveRecord::Migration[6.0]
-  def change
-    create_table :integrations_hooks do |t|
-      t.integer :status, default: 0
-      t.integer :inbox_id
-      t.integer :account_id
-      t.string :app_id
-      t.text :settings
-      t.integer :hook_type, default: 0
-      t.string :reference_id
-      t.string :access_token
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200503151130_add_account_feature_flag.rb b/db/migrate/20200503151130_add_account_feature_flag.rb
deleted file mode 100644
index 9b0628867..000000000
--- a/db/migrate/20200503151130_add_account_feature_flag.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddAccountFeatureFlag < ActiveRecord::Migration[6.0]
-  def change
-    add_column :accounts, :feature_flags, :integer, index: true, default: 0, null: false
-  end
-end
diff --git a/db/migrate/20200504144712_add_index_on_notification_subscriptions.rb b/db/migrate/20200504144712_add_index_on_notification_subscriptions.rb
deleted file mode 100644
index e07285e4a..000000000
--- a/db/migrate/20200504144712_add_index_on_notification_subscriptions.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddIndexOnNotificationSubscriptions < ActiveRecord::Migration[6.0]
-  def change
-    add_column :notification_subscriptions, :identifier, :string
-    add_index :notification_subscriptions, :identifier, unique: true
-  end
-end
diff --git a/db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb b/db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb
deleted file mode 100644
index 41b9cda56..000000000
--- a/db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddHideInputFlagToBotConfig < ActiveRecord::Migration[6.0]
-  def change
-    add_column :agent_bots, :hide_input_for_bot_conversations, :boolean, default: false
-  end
-end
diff --git a/db/migrate/20200510112339_create_installation_config.rb b/db/migrate/20200510112339_create_installation_config.rb
deleted file mode 100644
index 7397bb7bf..000000000
--- a/db/migrate/20200510112339_create_installation_config.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateInstallationConfig < ActiveRecord::Migration[6.0]
-  def change
-    create_table :installation_configs do |t|
-      t.string :name, null: false
-      t.jsonb :serialized_value, null: false, default: '{}'
-      t.timestamps
-    end
-
-    add_index :installation_configs, [:name, :created_at], unique: true
-
-    ConfigLoader.new.process
-  end
-end
diff --git a/db/migrate/20200510154151_add_reference_id_to_conversation.rb b/db/migrate/20200510154151_add_reference_id_to_conversation.rb
deleted file mode 100644
index 5bc0af68a..000000000
--- a/db/migrate/20200510154151_add_reference_id_to_conversation.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddReferenceIdToConversation < ActiveRecord::Migration[6.0]
-  def change
-    add_column :conversations, :reference_id, :string
-  end
-end
diff --git a/db/migrate/20200520125815_add_active_at_to_account_users.rb b/db/migrate/20200520125815_add_active_at_to_account_users.rb
deleted file mode 100644
index b46557f53..000000000
--- a/db/migrate/20200520125815_add_active_at_to_account_users.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddActiveAtToAccountUsers < ActiveRecord::Migration[6.0]
-  def change
-    add_column :account_users, :active_at, :datetime, default: nil
-  end
-end
diff --git a/db/migrate/20200522115645_reload_config.rb b/db/migrate/20200522115645_reload_config.rb
deleted file mode 100644
index 530ec9218..000000000
--- a/db/migrate/20200522115645_reload_config.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ReloadConfig < ActiveRecord::Migration[6.0]
-  def change
-    ConfigLoader.new.process
-  end
-end
diff --git a/db/migrate/20200605130625_agent_away_message_to_auto_reply.rb b/db/migrate/20200605130625_agent_away_message_to_auto_reply.rb
deleted file mode 100644
index 0cb7fa4a8..000000000
--- a/db/migrate/20200605130625_agent_away_message_to_auto_reply.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class AgentAwayMessageToAutoReply < ActiveRecord::Migration[6.0]
-  def change
-    add_column :inboxes, :greeting_enabled, :boolean, default: false
-    add_column :inboxes, :greeting_message, :string
-
-    migrate_agent_away_to_greeting
-
-    remove_column :channel_web_widgets, :agent_away_message, :string
-  end
-
-  def migrate_agent_away_to_greeting
-    ::Channel::WebWidget.find_in_batches do |widget_batch|
-      widget_batch.each do |widget|
-        inbox = widget.inbox
-        inbox.greeting_enabled = true
-        inbox.greeting_message = widget.agent_away_message
-        widget.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20200606132552_create_labels.rb b/db/migrate/20200606132552_create_labels.rb
deleted file mode 100644
index 81ac698e9..000000000
--- a/db/migrate/20200606132552_create_labels.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateLabels < ActiveRecord::Migration[6.0]
-  def change
-    create_table :labels do |t|
-      t.string :title
-      t.text :description
-      t.string :color
-      t.boolean :show_on_sidebar
-      t.references :account, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200607140737_remove_subscriptions.rb b/db/migrate/20200607140737_remove_subscriptions.rb
deleted file mode 100644
index 33f756083..000000000
--- a/db/migrate/20200607140737_remove_subscriptions.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class RemoveSubscriptions < ActiveRecord::Migration[6.0]
-  def change
-    drop_table :subscriptions do |t|
-      t.string 'pricing_version'
-      t.integer 'account_id'
-      t.datetime 'expiry'
-      t.string 'billing_plan', default: 'trial'
-      t.string 'stripe_customer_id'
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.integer 'state', default: 0
-      t.boolean 'payment_source_added', default: false
-    end
-  end
-end
diff --git a/db/migrate/20200610143132_rename_reference_id.rb b/db/migrate/20200610143132_rename_reference_id.rb
deleted file mode 100644
index e15e642a2..000000000
--- a/db/migrate/20200610143132_rename_reference_id.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RenameReferenceId < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :conversations, :reference_id, :identifier
-  end
-end
diff --git a/db/migrate/20200625124400_migrate_and_add_unique_index_to_labels.rb b/db/migrate/20200625124400_migrate_and_add_unique_index_to_labels.rb
deleted file mode 100644
index 02e9fcd49..000000000
--- a/db/migrate/20200625124400_migrate_and_add_unique_index_to_labels.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class MigrateAndAddUniqueIndexToLabels < ActiveRecord::Migration[6.0]
-  def change
-    add_index :labels, [:title, :account_id], unique: true
-    migrate_existing_tags
-  end
-
-  private
-
-  def migrate_existing_tags
-    ::ActsAsTaggableOn::Tag.all.each do |tag|
-      tag.taggings.each do |tagging|
-        ensure_label_for_account(tag.name, tagging.taggable.account)
-      end
-    end
-  end
-
-  def ensure_label_for_account(name, account)
-    account.labels.where(title: name.downcase).first_or_create
-  end
-end
diff --git a/db/migrate/20200625154254_add_default_value_to_color.rb b/db/migrate/20200625154254_add_default_value_to_color.rb
deleted file mode 100644
index 9257cc3ae..000000000
--- a/db/migrate/20200625154254_add_default_value_to_color.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddDefaultValueToColor < ActiveRecord::Migration[6.0]
-  def up
-    Label.where(color: nil).find_each { |u| u.update(color: '#1f93ff') }
-
-    change_column :labels, :color, :string, default: '#1f93ff', null: false
-  end
-
-  def down
-    change_column :labels, :color, :string, default: nil, null: true
-  end
-end
diff --git a/db/migrate/20200627115105_create_api_channel.rb b/db/migrate/20200627115105_create_api_channel.rb
deleted file mode 100644
index 3c9e92553..000000000
--- a/db/migrate/20200627115105_create_api_channel.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreateApiChannel < ActiveRecord::Migration[6.0]
-  def change
-    create_table :channel_api do |t|
-      t.integer :account_id, null: false
-      t.string :webhook_url, null: false
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200629122646_add_availability_to_user.rb b/db/migrate/20200629122646_add_availability_to_user.rb
deleted file mode 100644
index dd062af15..000000000
--- a/db/migrate/20200629122646_add_availability_to_user.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddAvailabilityToUser < ActiveRecord::Migration[6.0]
-  def change
-    add_column :users, :availability, :integer, default: 0
-  end
-end
diff --git a/db/migrate/20200704135408_create_kbase_portals.rb b/db/migrate/20200704135408_create_kbase_portals.rb
deleted file mode 100644
index 3d460456e..000000000
--- a/db/migrate/20200704135408_create_kbase_portals.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class CreateKbasePortals < ActiveRecord::Migration[6.0]
-  def change
-    create_table :kbase_portals do |t|
-      t.integer :account_id, null: false
-      t.string :name, null: false
-      t.string :slug, null: false
-      t.string :custom_domain
-      t.string :color
-      t.string :homepage_link
-      t.string :page_title
-      t.text   :header_text
-
-      t.index :slug, unique: true
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200704135810_create_kbase_categories.rb b/db/migrate/20200704135810_create_kbase_categories.rb
deleted file mode 100644
index 22f33bc21..000000000
--- a/db/migrate/20200704135810_create_kbase_categories.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateKbaseCategories < ActiveRecord::Migration[6.0]
-  def change
-    create_table :kbase_categories do |t|
-      t.integer :account_id, null: false
-      t.integer :portal_id, null: false
-      t.string :name
-      t.text :description
-      t.integer :position
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200704140029_create_kbase_folders.rb b/db/migrate/20200704140029_create_kbase_folders.rb
deleted file mode 100644
index d2f9f5e02..000000000
--- a/db/migrate/20200704140029_create_kbase_folders.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateKbaseFolders < ActiveRecord::Migration[6.0]
-  def change
-    create_table :kbase_folders do |t|
-      t.integer :account_id, null: false
-      t.integer :category_id, null: false
-      t.string :name
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200704140509_create_kbase_articles.rb b/db/migrate/20200704140509_create_kbase_articles.rb
deleted file mode 100644
index 2d2e12a1f..000000000
--- a/db/migrate/20200704140509_create_kbase_articles.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class CreateKbaseArticles < ActiveRecord::Migration[6.0]
-  def change
-    create_table :kbase_articles do |t|
-      t.integer :account_id, null: false
-      t.integer :portal_id, null: false
-      t.integer :category_id
-      t.integer :folder_id
-      t.integer :author_id
-      t.string :title
-      t.text :description
-      t.text :content
-      t.integer :status
-      t.integer :views
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200704173104_add_twitter_feature_flag.rb b/db/migrate/20200704173104_add_twitter_feature_flag.rb
deleted file mode 100644
index 047313d70..000000000
--- a/db/migrate/20200704173104_add_twitter_feature_flag.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTwitterFeatureFlag < ActiveRecord::Migration[6.0]
-  def change
-    ConfigLoader.new.process
-  end
-end
diff --git a/db/migrate/20200709145000_remove_multiple_feature_flags.rb b/db/migrate/20200709145000_remove_multiple_feature_flags.rb
deleted file mode 100644
index a7384a529..000000000
--- a/db/migrate/20200709145000_remove_multiple_feature_flags.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class RemoveMultipleFeatureFlags < ActiveRecord::Migration[6.0]
-  def change
-    current_config = InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').last
-    InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').where.not(id: current_config.id).destroy_all
-    ConfigLoader.new.process
-    update_existing_accounts
-  end
-
-  def update_existing_accounts
-    feature_config = InstallationConfig.find_by(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS')
-    facebook_config = feature_config.value.find { |value| value['name'] == 'channel_facebook' }
-    twitter_config = feature_config.value.find { |value| value['name'] == 'channel_twitter' }
-    Account.find_in_batches do |account_batch|
-      account_batch.each do |account|
-        account.enable_features('channel_facebook') if facebook_config['enabled']
-        account.enable_features('channel_twitter') if twitter_config['enabled']
-        account.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20200715124113_create_email_channel.rb b/db/migrate/20200715124113_create_email_channel.rb
deleted file mode 100644
index ca066aacb..000000000
--- a/db/migrate/20200715124113_create_email_channel.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateEmailChannel < ActiveRecord::Migration[6.0]
-  def change
-    create_table :channel_email do |t|
-      t.integer :account_id, null: false
-      t.string :email, null: false, index: { unique: true }
-      t.string :forward_to_address, null: false, index: { unique: true }
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20200719171437_rename_nick_name_to_display_name.rb b/db/migrate/20200719171437_rename_nick_name_to_display_name.rb
deleted file mode 100644
index 35a53a3c1..000000000
--- a/db/migrate/20200719171437_rename_nick_name_to_display_name.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RenameNickNameToDisplayName < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :users, :nickname, :display_name
-  end
-end
diff --git a/db/migrate/20200725131651_create_email_templates.rb b/db/migrate/20200725131651_create_email_templates.rb
deleted file mode 100644
index 00cef28eb..000000000
--- a/db/migrate/20200725131651_create_email_templates.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateEmailTemplates < ActiveRecord::Migration[6.0]
-  def change
-    create_table :email_templates do |t|
-      t.string :name, null: false
-      t.text :body, null: false
-      t.integer :account_id, null: true
-      t.integer :template_type, default: 1
-      t.integer :locale, default: 0, null: false
-      t.timestamps
-    end
-    add_index :email_templates, [:name, :account_id], unique: true
-  end
-end
diff --git a/db/migrate/20200730080242_add_feature_setting_to_website_inbox.rb b/db/migrate/20200730080242_add_feature_setting_to_website_inbox.rb
deleted file mode 100644
index 7ffbe401f..000000000
--- a/db/migrate/20200730080242_add_feature_setting_to_website_inbox.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddFeatureSettingToWebsiteInbox < ActiveRecord::Migration[6.0]
-  def change
-    add_column :channel_web_widgets, :feature_flags, :integer, default: 3, null: false
-  end
-end
diff --git a/db/migrate/20200802170002_reset_agent_last_seen_at.rb b/db/migrate/20200802170002_reset_agent_last_seen_at.rb
deleted file mode 100644
index b6d4198a7..000000000
--- a/db/migrate/20200802170002_reset_agent_last_seen_at.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ResetAgentLastSeenAt < ActiveRecord::Migration[6.0]
-  def change
-    # rubocop:disable Rails/SkipsModelValidations
-    ::Conversation.where('agent_last_seen_at > ?', DateTime.now.utc).update_all(agent_last_seen_at: DateTime.now.utc)
-    # rubocop:enable Rails/SkipsModelValidations
-  end
-end
diff --git a/db/migrate/20200819190629_add_custom_attributes_to_contacts.rb b/db/migrate/20200819190629_add_custom_attributes_to_contacts.rb
deleted file mode 100644
index 9fb865885..000000000
--- a/db/migrate/20200819190629_add_custom_attributes_to_contacts.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddCustomAttributesToContacts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :contacts, :custom_attributes, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20200828175931_add_external_source_ids_to_messages.rb b/db/migrate/20200828175931_add_external_source_ids_to_messages.rb
deleted file mode 100644
index 772a18364..000000000
--- a/db/migrate/20200828175931_add_external_source_ids_to_messages.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class AddExternalSourceIdsToMessages < ActiveRecord::Migration[6.0]
-  def change
-    add_column :messages, :external_source_ids, :jsonb, default: {}
-    migrate_slack_external_source_ids
-  end
-
-  def migrate_slack_external_source_ids
-    Message.where('source_id LIKE ?', 'slack_%').find_in_batches do |message_batch|
-      message_batch.each do |message|
-        message.external_source_id_slack = message.source_id.split('slack_')[1]
-        message.source_id = nil
-        message.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20200907094912_rename_user_last_seen.rb b/db/migrate/20200907094912_rename_user_last_seen.rb
deleted file mode 100644
index 66740c509..000000000
--- a/db/migrate/20200907094912_rename_user_last_seen.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RenameUserLastSeen < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :conversations, :user_last_seen_at, :contact_last_seen_at
-  end
-end
diff --git a/db/migrate/20200907171106_add_reply_time_to_web_widget.rb b/db/migrate/20200907171106_add_reply_time_to_web_widget.rb
deleted file mode 100644
index 900a1bf0c..000000000
--- a/db/migrate/20200907171106_add_reply_time_to_web_widget.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddReplyTimeToWebWidget < ActiveRecord::Migration[6.0]
-  def change
-    add_column :channel_web_widgets, :reply_time, :integer, default: 0
-  end
-end
diff --git a/db/migrate/20200927135222_add_last_activity_at_to_conversation.rb b/db/migrate/20200927135222_add_last_activity_at_to_conversation.rb
deleted file mode 100644
index 353c414cd..000000000
--- a/db/migrate/20200927135222_add_last_activity_at_to_conversation.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-class AddLastActivityAtToConversation < ActiveRecord::Migration[6.0]
-  def up
-    add_column :conversations,
-               :last_activity_at,
-               :datetime,
-               default: -> { 'CURRENT_TIMESTAMP' },
-               index: true
-
-    add_last_activity_at_to_conversations
-
-    change_column_null(:conversations, :last_activity_at, false)
-  end
-
-  def down
-    remove_column(:conversations, :last_activity_at)
-  end
-
-  private
-
-  def add_last_activity_at_to_conversations
-    ::Conversation.find_in_batches do |conversation_batch|
-      Rails.logger.info "Migrated till #{conversation_batch.first.id}\n"
-      conversation_batch.each do |conversation|
-        # rubocop:disable Rails/SkipsModelValidations
-        last_activity_at = if conversation.messages.last
-                             conversation.messages.last.created_at
-                           else
-                             conversation.created_at
-                           end
-        conversation.update_columns(last_activity_at: last_activity_at)
-        # rubocop:enable Rails/SkipsModelValidations
-      end
-    end
-  end
-end
diff --git a/db/migrate/20201003105618_add_auto_resolve_duration_to_account.rb b/db/migrate/20201003105618_add_auto_resolve_duration_to_account.rb
deleted file mode 100644
index 03dfb3362..000000000
--- a/db/migrate/20201003105618_add_auto_resolve_duration_to_account.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddAutoResolveDurationToAccount < ActiveRecord::Migration[6.0]
-  def change
-    add_column :accounts, :auto_resolve_duration, :integer
-  end
-end
diff --git a/db/migrate/20201011152227_add_email_address_to_inbox.rb b/db/migrate/20201011152227_add_email_address_to_inbox.rb
deleted file mode 100644
index 2691c563d..000000000
--- a/db/migrate/20201011152227_add_email_address_to_inbox.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddEmailAddressToInbox < ActiveRecord::Migration[6.0]
-  def up
-    add_column :inboxes, :email_address, :string
-  end
-
-  def down
-    remove_column(:inboxes, :email_address)
-  end
-end
diff --git a/db/migrate/20201019173944_add_default_value_to_jsonb_colums.rb b/db/migrate/20201019173944_add_default_value_to_jsonb_colums.rb
deleted file mode 100644
index 1b6394af9..000000000
--- a/db/migrate/20201019173944_add_default_value_to_jsonb_colums.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddDefaultValueToJsonbColums < ActiveRecord::Migration[6.0]
-  def change
-    change_column_default :contacts, :additional_attributes, from: nil, to: {}
-    change_column_default :conversations, :additional_attributes, from: nil, to: {}
-    change_column_default :installation_configs, :serialized_value, from: '{}', to: {}
-    change_column_default :notification_subscriptions, :subscription_attributes, from: '{}', to: {}
-  end
-end
diff --git a/db/migrate/20201027135006_create_working_hours.rb b/db/migrate/20201027135006_create_working_hours.rb
deleted file mode 100644
index 6d06e385f..000000000
--- a/db/migrate/20201027135006_create_working_hours.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-class CreateWorkingHours < ActiveRecord::Migration[6.0]
-  def change
-    create_table :working_hours do |t|
-      t.belongs_to :inbox
-      t.belongs_to :account
-
-      t.integer :day_of_week, null: false
-      t.boolean :closed_all_day, default: false
-      t.integer :open_hour
-      t.integer :open_minutes
-      t.integer :close_hour
-      t.integer :close_minutes
-
-      t.timestamps
-    end
-
-    add_column :accounts, :timezone, :string, default: 'UTC'
-
-    change_table :inboxes, bulk: true do |t|
-      t.boolean :working_hours_enabled, default: false
-      t.string :out_of_office_message
-    end
-
-    Inbox.where.not(id: WorkingHour.select(:inbox_id)).each do |inbox|
-      create_working_hours_for_inbox(inbox)
-    end
-  end
-
-  private
-
-  def create_working_hours_for_inbox(inbox)
-    inbox.working_hours.create!(day_of_week: 1, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
-    inbox.working_hours.create!(day_of_week: 2, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
-    inbox.working_hours.create!(day_of_week: 3, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
-    inbox.working_hours.create!(day_of_week: 4, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
-    inbox.working_hours.create!(day_of_week: 5, open_hour: 9, open_minutes: 0, close_hour: 17, close_minutes: 0)
-    inbox.working_hours.create!(day_of_week: 6, closed_all_day: true)
-    inbox.working_hours.create!(day_of_week: 7, closed_all_day: true)
-  end
-end
diff --git a/db/migrate/20201123195011_create_platform_apps.rb b/db/migrate/20201123195011_create_platform_apps.rb
deleted file mode 100644
index bfa36fc89..000000000
--- a/db/migrate/20201123195011_create_platform_apps.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CreatePlatformApps < ActiveRecord::Migration[6.0]
-  def change
-    create_table :platform_apps do |t|
-      t.string :name, null: false
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20201124101124_create_platform_app_permissibles.rb b/db/migrate/20201124101124_create_platform_app_permissibles.rb
deleted file mode 100644
index 309d4f36a..000000000
--- a/db/migrate/20201124101124_create_platform_app_permissibles.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreatePlatformAppPermissibles < ActiveRecord::Migration[6.0]
-  def change
-    create_table :platform_app_permissibles do |t|
-      t.references :platform_app, index: true, null: false
-      t.references :permissible, null: false, polymorphic: true, index: { name: :index_platform_app_permissibles_on_permissibles }
-      t.timestamps
-    end
-
-    add_index :platform_app_permissibles, [:platform_app_id, :permissible_id, :permissible_type], unique: true, name: 'unique_permissibles_index'
-  end
-end
diff --git a/db/migrate/20201125121240_create_triggers_accounts_insert_or_conversations_insert.rb b/db/migrate/20201125121240_create_triggers_accounts_insert_or_conversations_insert.rb
deleted file mode 100644
index 5ea5d38a5..000000000
--- a/db/migrate/20201125121240_create_triggers_accounts_insert_or_conversations_insert.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# This migration was auto-generated via `rake db:generate_trigger_migration'.
-# While you can edit this file, any changes you make to the definitions here
-# will be undone by the next auto-generated trigger migration.
-
-class CreateTriggersAccountsInsertOrConversationsInsert < ActiveRecord::Migration[6.0]
-  def up
-    create_trigger('accounts_after_insert_row_tr', generated: true, compatibility: 1)
-      .on('accounts')
-      .after(:insert)
-      .for_each(:row) do
-      "execute format('create sequence IF NOT EXISTS conv_dpid_seq_%s', NEW.id);"
-    end
-
-    create_trigger('conversations_before_insert_row_tr', generated: true, compatibility: 1)
-      .on('conversations')
-      .before(:insert)
-      .for_each(:row) do
-      "NEW.display_id := nextval('conv_dpid_seq_' || NEW.account_id);"
-    end
-  end
-
-  def down
-    drop_trigger('accounts_after_insert_row_tr', 'accounts', generated: true)
-
-    drop_trigger('conversations_before_insert_row_tr', 'conversations', generated: true)
-  end
-end
diff --git a/db/migrate/20201125123131_conv_dpid_seq_for_existing_accnts.rb b/db/migrate/20201125123131_conv_dpid_seq_for_existing_accnts.rb
deleted file mode 100644
index 73acb8ae8..000000000
--- a/db/migrate/20201125123131_conv_dpid_seq_for_existing_accnts.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class ConvDpidSeqForExistingAccnts < ActiveRecord::Migration[6.0]
-  def up
-    ::Account.find_in_batches do |accounts_batch|
-      Rails.logger.info "migrated till #{accounts_batch.first.id}\n"
-      accounts_batch.each do |account|
-        display_id = Conversation.where(account_id: account.id).maximum('display_id')
-        display_id ||= 0 # for accounts with out conversations
-        ActiveRecord::Base.connection.exec_query("create sequence IF NOT EXISTS conv_dpid_seq_#{account.id} START #{display_id + 1}")
-      end
-    end
-  end
-
-  def down
-    ::Account.find_in_batches do |accounts_batch|
-      Rails.logger.info "migrated till #{accounts_batch.first.id}\n"
-      accounts_batch.each do |account|
-        ActiveRecord::Base.connection.exec_query("drop sequence IF EXISTS conv_dpid_seq_#{account.id}")
-      end
-    end
-  end
-end
diff --git a/db/migrate/20210105185632_enable_pg_stats_extention.rb b/db/migrate/20210105185632_enable_pg_stats_extention.rb
deleted file mode 100644
index f03b0dc20..000000000
--- a/db/migrate/20210105185632_enable_pg_stats_extention.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class EnablePgStatsExtention < ActiveRecord::Migration[6.0]
-  def change
-    enable_extension 'pg_stat_statements'
-  end
-end
diff --git a/db/migrate/20210109211805_add_ui_settings_to_users.rb b/db/migrate/20210109211805_add_ui_settings_to_users.rb
deleted file mode 100644
index f8b18a971..000000000
--- a/db/migrate/20210109211805_add_ui_settings_to_users.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddUiSettingsToUsers < ActiveRecord::Migration[6.0]
-  def up
-    add_column :users, :ui_settings, :jsonb, default: {}
-  end
-
-  def down
-    remove_column :users, :ui_settings, :jsonb
-  end
-end
diff --git a/db/migrate/20210112174124_add_hmac_token_to_inbox.rb b/db/migrate/20210112174124_add_hmac_token_to_inbox.rb
deleted file mode 100644
index cd614cd16..000000000
--- a/db/migrate/20210112174124_add_hmac_token_to_inbox.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class AddHmacTokenToInbox < ActiveRecord::Migration[6.0]
-  def change
-    add_column :channel_web_widgets, :hmac_token, :string
-    add_index :channel_web_widgets, :hmac_token, unique: true
-    set_up_existing_webwidgets
-    add_column :contact_inboxes, :hmac_verified, :boolean, default: false
-  end
-
-  def set_up_existing_webwidgets
-    ::Channel::WebWidget.find_in_batches do |webwidgets_batch|
-      Rails.logger.info "migrated till #{webwidgets_batch.first.id}\n"
-      webwidgets_batch.map(&:regenerate_hmac_token)
-    end
-  end
-end
diff --git a/db/migrate/20210113045116_add_locked_attribute_to_installation_config.rb b/db/migrate/20210113045116_add_locked_attribute_to_installation_config.rb
deleted file mode 100644
index c3715d244..000000000
--- a/db/migrate/20210113045116_add_locked_attribute_to_installation_config.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class AddLockedAttributeToInstallationConfig < ActiveRecord::Migration[6.0]
-  def up
-    add_column :installation_configs, :locked, :boolean, default: true, null: false
-    purge_duplicates
-    add_index :installation_configs, :name, unique: true
-  end
-
-  def down
-    remove_column :installation_configs, :locked
-    remove_index :installation_configs, :name
-  end
-
-  def purge_duplicates
-    config_names = InstallationConfig.all.map(&:name).uniq
-
-    config_names.each do |name|
-      ids = InstallationConfig.where(name: name).pluck(&:id)
-      next if ids.size <= 1
-
-      # preserve the last config and destroy rest
-      ids.sort!
-      ids.pop
-      InstallationConfig.where(id: ids).destroy_all
-    end
-  end
-end
diff --git a/db/migrate/20210114202310_create_teams.rb b/db/migrate/20210114202310_create_teams.rb
deleted file mode 100644
index cccc891c2..000000000
--- a/db/migrate/20210114202310_create_teams.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class CreateTeams < ActiveRecord::Migration[6.0]
-  def change
-    create_table :teams do |t|
-      t.string :name, null: false
-      t.text :description
-      t.boolean :allow_auto_assign, default: true
-      t.references :account, null: false, foreign_key: true
-
-      t.timestamps
-    end
-
-    create_table :team_members do |t|
-      t.references :team, null: false, foreign_key: true
-      t.references :user, null: false, foreign_key: true
-      t.timestamps
-    end
-
-    add_reference :conversations, :team, foreign_key: true
-  end
-end
diff --git a/db/migrate/20210126121313_addunique_index_to_team_members.rb b/db/migrate/20210126121313_addunique_index_to_team_members.rb
deleted file mode 100644
index 1a1db98eb..000000000
--- a/db/migrate/20210126121313_addunique_index_to_team_members.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AdduniqueIndexToTeamMembers < ActiveRecord::Migration[6.0]
-  def change
-    add_index :teams, [:name, :account_id], unique: true
-    add_index :team_members, [:team_id, :user_id], unique: true
-  end
-end
diff --git a/db/migrate/20210201150037_create_data_imports.rb b/db/migrate/20210201150037_create_data_imports.rb
deleted file mode 100644
index 349453a8d..000000000
--- a/db/migrate/20210201150037_create_data_imports.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class CreateDataImports < ActiveRecord::Migration[6.0]
-  def change
-    create_table :data_imports do |t|
-      t.references :account, null: false, foreign_key: true
-      t.string :data_type, null: false
-      t.integer :status, null: false, default: 0
-      t.text :processing_errors
-      t.integer :total_records
-      t.integer :processed_records
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb b/db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb
deleted file mode 100644
index 646dd2139..000000000
--- a/db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class AddRequestForEmailOnChannelWebWidget < ActiveRecord::Migration[6.0]
-  def up
-    change_table :channel_web_widgets, bulk: true do |t|
-      t.column :pre_chat_form_enabled, :boolean, default: false
-      t.column :pre_chat_form_options, :jsonb, default: {}
-    end
-  end
-
-  def down
-    change_table :channel_web_widgets, bulk: true do |t|
-      t.remove :pre_chat_form_enabled
-      t.remove :pre_chat_form_options
-    end
-  end
-end
diff --git a/db/migrate/20210217154129_remove_orphan_inbox_members_from_inboxes.rb b/db/migrate/20210217154129_remove_orphan_inbox_members_from_inboxes.rb
deleted file mode 100644
index 6dbd89ce8..000000000
--- a/db/migrate/20210217154129_remove_orphan_inbox_members_from_inboxes.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class RemoveOrphanInboxMembersFromInboxes < ActiveRecord::Migration[6.0]
-  def change
-    Account.all.map do |account|
-      user_ids = account.users.all.map(&:id)
-      inboxes = account.inboxes
-      inboxes.each do |inbox|
-        inbox.inbox_members.each do |inbox_member|
-          inbox_member.destroy! unless user_ids.include?(inbox_member.user_id)
-        end
-      end
-    end
-  end
-end
diff --git a/db/migrate/20210219085719_remove_old_notifications.rb b/db/migrate/20210219085719_remove_old_notifications.rb
deleted file mode 100644
index 06021a341..000000000
--- a/db/migrate/20210219085719_remove_old_notifications.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveOldNotifications < ActiveRecord::Migration[6.0]
-  def change
-    Notification.where(notification_type: 'assigned_conversation_new_message').destroy_all
-  end
-end
diff --git a/db/migrate/20210222131048_change_working_hours_to_zero.rb b/db/migrate/20210222131048_change_working_hours_to_zero.rb
deleted file mode 100644
index 7d163e55e..000000000
--- a/db/migrate/20210222131048_change_working_hours_to_zero.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class ChangeWorkingHoursToZero < ActiveRecord::Migration[6.0]
-  # rubocop:disable Rails/SkipsModelValidations
-  def up
-    WorkingHour.where(day_of_week: 7).update_all(day_of_week: 0)
-  end
-
-  def down
-    WorkingHour.where(day_of_week: 0).update_all(day_of_week: 7)
-  end
-  # rubocop:enable Rails/SkipsModelValidations
-end
diff --git a/db/migrate/20210222131155_switch_time_zone_from_account_to_inbox.rb b/db/migrate/20210222131155_switch_time_zone_from_account_to_inbox.rb
deleted file mode 100644
index b30d3dffc..000000000
--- a/db/migrate/20210222131155_switch_time_zone_from_account_to_inbox.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class SwitchTimeZoneFromAccountToInbox < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :accounts, :timezone, :string, default: 'UTC'
-    add_column :inboxes, :timezone, :string, default: 'UTC'
-  end
-end
diff --git a/db/migrate/20210303192243_rename_channel_email_forward_address.rb b/db/migrate/20210303192243_rename_channel_email_forward_address.rb
deleted file mode 100644
index 1ccec24f5..000000000
--- a/db/migrate/20210303192243_rename_channel_email_forward_address.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RenameChannelEmailForwardAddress < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :channel_email, :forward_to_address, :forward_to_email
-  end
-end
diff --git a/db/migrate/20210306170117_add_last_activity_at_to_contacts.rb b/db/migrate/20210306170117_add_last_activity_at_to_contacts.rb
deleted file mode 100644
index b35c064fc..000000000
--- a/db/migrate/20210306170117_add_last_activity_at_to_contacts.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class AddLastActivityAtToContacts < ActiveRecord::Migration[6.0]
-  def up
-    # rubocop:disable Rails/SkipsModelValidations
-    add_column :contacts, :last_activity_at, :datetime, index: true, default: nil
-    Conversation.find_in_batches do |conversation_batch|
-      conversation_batch.each do |conversation|
-        contact = conversation.contact
-        if contact.last_activity_at.nil? || conversation.updated_at > contact.last_activity_at
-          contact.update_columns(last_activity_at: conversation.updated_at)
-        end
-      end
-    end
-
-    Contact.where(additional_attributes: nil).update_all(additional_attributes: {})
-    Contact.where(phone_number: '').update_all(phone_number: nil)
-    # rubocop:enable Rails/SkipsModelValidations
-  end
-
-  def down
-    remove_column :contacts, :last_activity_at, :datetime, index: true, default: nil
-  end
-end
diff --git a/db/migrate/20210315101919_enable_email_channel.rb b/db/migrate/20210315101919_enable_email_channel.rb
deleted file mode 100644
index 194a4c5a3..000000000
--- a/db/migrate/20210315101919_enable_email_channel.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class EnableEmailChannel < ActiveRecord::Migration[6.0]
-  def change
-    current_config = InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').last
-    current_config.value.each { |v| v['enabled'] = true if %w[inbound_emails channel_email].include?(v['name']) }
-    current_config.save!
-
-    ConfigLoader.new.process
-
-    Account.find_in_batches do |account_batch|
-      account_batch.each do |account|
-        account.enable_features('inbound_emails')
-        account.enable_features('channel_email')
-        account.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20210425093724_convert_integration_hook_settings_field.rb b/db/migrate/20210425093724_convert_integration_hook_settings_field.rb
deleted file mode 100644
index 3ba021291..000000000
--- a/db/migrate/20210425093724_convert_integration_hook_settings_field.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class ConvertIntegrationHookSettingsField < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :integrations_hooks, :settings, :text
-    add_column :integrations_hooks, :settings, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20210426191914_migration_remove_locked_from_conversation.rb b/db/migrate/20210426191914_migration_remove_locked_from_conversation.rb
deleted file mode 100644
index 402935f28..000000000
--- a/db/migrate/20210426191914_migration_remove_locked_from_conversation.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class MigrationRemoveLockedFromConversation < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :conversations, :locked, :boolean
-  end
-end
diff --git a/db/migrate/20210428135041_add_campaigns.rb b/db/migrate/20210428135041_add_campaigns.rb
deleted file mode 100644
index 7df93a347..000000000
--- a/db/migrate/20210428135041_add_campaigns.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class AddCampaigns < ActiveRecord::Migration[6.0]
-  def change
-    create_table :campaigns do |t|
-      t.integer :display_id, null: false
-      t.string :title, null: false
-      t.text :description
-      t.text :content, null: false
-      t.integer :sender_id
-      t.boolean :enabled, default: true
-      t.references :account, null: false, foreign_key: true
-      t.references :inbox, null: false, foreign_key: true
-      t.column :trigger_rules, :jsonb, default: {}
-      t.timestamps
-    end
-
-    add_reference :conversations, :campaign, foreign_key: true
-  end
-end
diff --git a/db/migrate/20210428151147_create_triggers_accounts_insert_or_campaigns_insert.rb b/db/migrate/20210428151147_create_triggers_accounts_insert_or_campaigns_insert.rb
deleted file mode 100644
index 3fdc4f18e..000000000
--- a/db/migrate/20210428151147_create_triggers_accounts_insert_or_campaigns_insert.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# This migration was auto-generated via `rake db:generate_trigger_migration'.
-# While you can edit this file, any changes you make to the definitions here
-# will be undone by the next auto-generated trigger migration.
-
-class CreateTriggersAccountsInsertOrCampaignsInsert < ActiveRecord::Migration[6.0]
-  def up
-    create_trigger('camp_dpid_before_insert', generated: true, compatibility: 1)
-      .on('accounts')
-      .name('camp_dpid_before_insert')
-      .after(:insert)
-      .for_each(:row) do
-      "execute format('create sequence IF NOT EXISTS camp_dpid_seq_%s', NEW.id);"
-    end
-
-    create_trigger('campaigns_before_insert_row_tr', generated: true, compatibility: 1)
-      .on('campaigns')
-      .before(:insert)
-      .for_each(:row) do
-      "NEW.display_id := nextval('camp_dpid_seq_' || NEW.account_id);"
-    end
-  end
-
-  def down
-    drop_trigger('camp_dpid_before_insert', 'accounts', generated: true)
-
-    drop_trigger('campaigns_before_insert_row_tr', 'campaigns', generated: true)
-  end
-end
diff --git a/db/migrate/20210430095748_add_camp_dp_id_seq_for_existing_accounts.rb b/db/migrate/20210430095748_add_camp_dp_id_seq_for_existing_accounts.rb
deleted file mode 100644
index 1b37e8345..000000000
--- a/db/migrate/20210430095748_add_camp_dp_id_seq_for_existing_accounts.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class AddCampDpIdSeqForExistingAccounts < ActiveRecord::Migration[6.0]
-  def up
-    ::Account.find_in_batches do |accounts_batch|
-      Rails.logger.info "migrated till #{accounts_batch.first.id}\n"
-      accounts_batch.each do |account|
-        display_id = account.campaigns.count
-        ActiveRecord::Base.connection.exec_query("create sequence IF NOT EXISTS camp_dpid_seq_#{account.id} START #{display_id + 1}")
-      end
-    end
-  end
-
-  def down
-    ::Account.find_in_batches do |accounts_batch|
-      Rails.logger.info "migrated till #{accounts_batch.first.id}\n"
-      accounts_batch.each do |account|
-        ActiveRecord::Base.connection.exec_query("drop sequence IF EXISTS camp_dpid_seq_#{account.id}")
-      end
-    end
-  end
-end
diff --git a/db/migrate/20210430100138_rename_campaign_content_to_message.rb b/db/migrate/20210430100138_rename_campaign_content_to_message.rb
deleted file mode 100644
index 161ef299e..000000000
--- a/db/migrate/20210430100138_rename_campaign_content_to_message.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RenameCampaignContentToMessage < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :campaigns, :content, :message
-  end
-end
diff --git a/db/migrate/20210513083044_remove_not_null_from_webhook_url_channel_api.rb b/db/migrate/20210513083044_remove_not_null_from_webhook_url_channel_api.rb
deleted file mode 100644
index 790c52ec5..000000000
--- a/db/migrate/20210513083044_remove_not_null_from_webhook_url_channel_api.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveNotNullFromWebhookUrlChannelApi < ActiveRecord::Migration[6.0]
-  def change
-    change_column :channel_api, :webhook_url, :string, null: true
-  end
-end
diff --git a/db/migrate/20210513143021_rename_events_to_report_events.rb b/db/migrate/20210513143021_rename_events_to_report_events.rb
deleted file mode 100644
index 9241ff7b2..000000000
--- a/db/migrate/20210513143021_rename_events_to_report_events.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RenameEventsToReportEvents < ActiveRecord::Migration[6.0]
-  def change
-    rename_table :events, :reporting_events
-  end
-end
diff --git a/db/migrate/20210520200729_add_account_id_to_agent_bots.rb b/db/migrate/20210520200729_add_account_id_to_agent_bots.rb
deleted file mode 100644
index cd4a26073..000000000
--- a/db/migrate/20210520200729_add_account_id_to_agent_bots.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddAccountIdToAgentBots < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :agent_bots, :hide_input_for_bot_conversations, :boolean
-    add_reference :agent_bots, :account, foreign_key: true
-  end
-end
diff --git a/db/migrate/20210527173755_remove_super_admin_access_tokes.rb b/db/migrate/20210527173755_remove_super_admin_access_tokes.rb
deleted file mode 100644
index 18ad7d4f8..000000000
--- a/db/migrate/20210527173755_remove_super_admin_access_tokes.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveSuperAdminAccessTokes < ActiveRecord::Migration[6.0]
-  def change
-    AccessToken.where(owner_type: 'SuperAdmin').destroy_all
-  end
-end
diff --git a/db/migrate/20210602182058_add_hmac_to_api_channel.rb b/db/migrate/20210602182058_add_hmac_to_api_channel.rb
deleted file mode 100644
index f441c2829..000000000
--- a/db/migrate/20210602182058_add_hmac_to_api_channel.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class AddHmacToApiChannel < ActiveRecord::Migration[6.0]
-  def change
-    add_column :channel_api, :identifier, :string
-    add_index :channel_api, :identifier, unique: true
-    add_column :channel_api, :hmac_token, :string
-    add_index :channel_api, :hmac_token, unique: true
-    add_column :channel_api, :hmac_mandatory, :boolean, default: false
-    add_column :channel_web_widgets, :hmac_mandatory, :boolean, default: false
-    set_up_existing_api_channels
-  end
-
-  def set_up_existing_api_channels
-    ::Channel::Api.find_in_batches do |api_channels_batch|
-      Rails.logger.info "migrated till #{api_channels_batch.first.id}\n"
-      api_channels_batch.map(&:regenerate_hmac_token)
-      api_channels_batch.map(&:regenerate_identifier)
-    end
-  end
-end
diff --git a/db/migrate/20210609133433_add_email_collect_to_inboxes.rb b/db/migrate/20210609133433_add_email_collect_to_inboxes.rb
deleted file mode 100644
index f4da1f73e..000000000
--- a/db/migrate/20210609133433_add_email_collect_to_inboxes.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddEmailCollectToInboxes < ActiveRecord::Migration[6.0]
-  def change
-    add_column :inboxes, :enable_email_collect, :boolean, default: true
-  end
-end
diff --git a/db/migrate/20210611180221_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20210611180221_add_service_name_to_active_storage_blobs.active_storage.rb
deleted file mode 100644
index 9967a1323..000000000
--- a/db/migrate/20210611180221_add_service_name_to_active_storage_blobs.active_storage.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# This migration comes from active_storage (originally 20190112182829)
-class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
-  def up
-    unless column_exists?(:active_storage_blobs, :service_name)
-      add_column :active_storage_blobs, :service_name, :string
-
-      if configured_service = ActiveStorage::Blob.service.name
-        ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
-      end
-
-      change_column :active_storage_blobs, :service_name, :string, null: false
-    end
-  end
-
-  def down
-    remove_column :active_storage_blobs, :service_name
-  end
-end
diff --git a/db/migrate/20210611180222_create_active_storage_variant_records.active_storage.rb b/db/migrate/20210611180222_create_active_storage_variant_records.active_storage.rb
deleted file mode 100644
index 71b27d1c1..000000000
--- a/db/migrate/20210611180222_create_active_storage_variant_records.active_storage.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# This migration comes from active_storage (originally 20191206030411)
-class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
-  def change
-    create_table :active_storage_variant_records do |t|
-      t.belongs_to :blob, null: false, index: false
-      t.string :variation_digest, null: false
-
-      t.index %i[blob_id variation_digest], name: 'index_active_storage_variant_records_uniqueness', unique: true
-      t.foreign_key :active_storage_blobs, column: :blob_id
-    end
-  end
-end
diff --git a/db/migrate/20210618073042_create_notes.rb b/db/migrate/20210618073042_create_notes.rb
deleted file mode 100644
index 1e7b091a7..000000000
--- a/db/migrate/20210618073042_create_notes.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateNotes < ActiveRecord::Migration[6.0]
-  def change
-    create_table :notes do |t|
-      t.text :content, null: false
-      t.references :account, foreign_key: true, null: false
-      t.references :contact, foreign_key: true, null: false
-      t.references :user, foreign_key: true
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20210618095823_add_csat_toggle_for_inbox.rb b/db/migrate/20210618095823_add_csat_toggle_for_inbox.rb
deleted file mode 100644
index bcdfd839c..000000000
--- a/db/migrate/20210618095823_add_csat_toggle_for_inbox.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddCsatToggleForInbox < ActiveRecord::Migration[6.0]
-  def change
-    add_column :inboxes, :csat_survey_enabled, :boolean, default: false
-  end
-end
diff --git a/db/migrate/20210623150613_create_custom_filters.rb b/db/migrate/20210623150613_create_custom_filters.rb
deleted file mode 100644
index fe9d920ce..000000000
--- a/db/migrate/20210623150613_create_custom_filters.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateCustomFilters < ActiveRecord::Migration[6.0]
-  def change
-    create_table :custom_filters do |t|
-      t.string :name, null: false
-      t.integer :filter_type, null: false, default: 0
-      t.jsonb :query, null: false, default: '{}'
-      t.references :account, index: true, null: false
-      t.references :user, index: true, null: false
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20210623155413_create_csat_survey_responses.rb b/db/migrate/20210623155413_create_csat_survey_responses.rb
deleted file mode 100644
index 02c232b24..000000000
--- a/db/migrate/20210623155413_create_csat_survey_responses.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class CreateCsatSurveyResponses < ActiveRecord::Migration[6.0]
-  def change
-    create_table :csat_survey_responses do |t|
-      t.references :account, null: false, foreign_key: true
-      t.references :conversation, null: false, foreign_key: true
-      t.references :message, null: false, foreign_key: true, index: { unique: true }
-      t.integer :rating, null: false
-      t.text :feedback_message
-      t.references :contact, null: false, foreign_key: true
-      t.references :assigned_agent, foreign_key: { to_table: :users }
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20210707142801_add_campaign_type_to_campaigns.rb b/db/migrate/20210707142801_add_campaign_type_to_campaigns.rb
deleted file mode 100644
index c89cecea5..000000000
--- a/db/migrate/20210707142801_add_campaign_type_to_campaigns.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class AddCampaignTypeToCampaigns < ActiveRecord::Migration[6.0]
-  def change
-    change_table :campaigns, bulk: true do |t|
-      t.integer :campaign_type, default: 0, null: false, index: true
-      t.integer :campaign_status, default: 0, null: false, index: true
-      t.jsonb :audience, default: []
-      t.datetime :scheduled_at, index: true
-    end
-  end
-end
diff --git a/db/migrate/20210708140842_remove_notifications_without_primary_actor.rb b/db/migrate/20210708140842_remove_notifications_without_primary_actor.rb
deleted file mode 100644
index 1c365bd69..000000000
--- a/db/migrate/20210708140842_remove_notifications_without_primary_actor.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class RemoveNotificationsWithoutPrimaryActor < ActiveRecord::Migration[6.0]
-  def change
-    deleted_ids = []
-    Notification.where(primary_actor_type: 'Conversation').pluck(:primary_actor_id).uniq.each_slice(1000) do |id_list|
-      deleted_ids << (id_list - Conversation.where(id: id_list).pluck(:id))
-    end
-    Notification.where(primary_actor_type: 'Conversation', primary_actor_id: deleted_ids).destroy_all
-  end
-end
diff --git a/db/migrate/20210714110714_remove_duplicate_access_tokens_for_existing_users.rb b/db/migrate/20210714110714_remove_duplicate_access_tokens_for_existing_users.rb
deleted file mode 100644
index 23cacbf8a..000000000
--- a/db/migrate/20210714110714_remove_duplicate_access_tokens_for_existing_users.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class RemoveDuplicateAccessTokensForExistingUsers < ActiveRecord::Migration[6.0]
-  def up
-    # find all models and group them on owner
-    grouped_tokens = AccessToken.all.group_by(&:owner)
-    grouped_tokens.each_value do |duplicates|
-      # we want to keep the latest token as it is being used in all requests
-      duplicates.pop
-      # Remaining ones are duplicates, delete them all
-      duplicates.each { |duplicate| AccessToken.find_by(id: duplicate).destroy }
-    end
-  end
-end
diff --git a/db/migrate/20210721182458_add_snoozed_until_to_conversations.rb b/db/migrate/20210721182458_add_snoozed_until_to_conversations.rb
deleted file mode 100644
index 9e4fbca41..000000000
--- a/db/migrate/20210721182458_add_snoozed_until_to_conversations.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddSnoozedUntilToConversations < ActiveRecord::Migration[6.0]
-  def change
-    add_column :conversations, :snoozed_until, :datetime
-  end
-end
diff --git a/db/migrate/20210722095814_add_custom_attribute_definition.rb b/db/migrate/20210722095814_add_custom_attribute_definition.rb
deleted file mode 100644
index 3aae0b2f7..000000000
--- a/db/migrate/20210722095814_add_custom_attribute_definition.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class AddCustomAttributeDefinition < ActiveRecord::Migration[6.0]
-  def change
-    create_table :custom_attribute_definitions do |t|
-      t.string :attribute_display_name
-      t.string :attribute_key
-      t.integer :attribute_display_type, default: 0
-      t.integer :default_value
-      t.integer :attribute_model, default: 0
-      t.references :account, index: true
-
-      t.timestamps
-    end
-
-    add_index :custom_attribute_definitions, [:attribute_key, :attribute_model], unique: true, name: 'attribute_key_model_index'
-  end
-end
diff --git a/db/migrate/20210723094412_add_index_to_conversations.rb b/db/migrate/20210723094412_add_index_to_conversations.rb
deleted file mode 100644
index ad31696d1..000000000
--- a/db/migrate/20210723094412_add_index_to_conversations.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddIndexToConversations < ActiveRecord::Migration[6.0]
-  def change
-    add_index :conversations, [:status, :account_id]
-    add_index :conversations, [:assignee_id, :account_id]
-  end
-end
diff --git a/db/migrate/20210723095657_add_index_to_contacts.rb b/db/migrate/20210723095657_add_index_to_contacts.rb
deleted file mode 100644
index aeccfa1de..000000000
--- a/db/migrate/20210723095657_add_index_to_contacts.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddIndexToContacts < ActiveRecord::Migration[6.0]
-  def change
-    add_index :contacts, [:phone_number, :account_id]
-  end
-end
diff --git a/db/migrate/20210824152852_add_description_to_custom_attribute_definition.rb b/db/migrate/20210824152852_add_description_to_custom_attribute_definition.rb
deleted file mode 100644
index 45ca3ba9f..000000000
--- a/db/migrate/20210824152852_add_description_to_custom_attribute_definition.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddDescriptionToCustomAttributeDefinition < ActiveRecord::Migration[6.1]
-  def change
-    add_column :custom_attribute_definitions, :attribute_description, :text
-  end
-end
diff --git a/db/migrate/20210827120929_add_custom_attributes_to_user.rb b/db/migrate/20210827120929_add_custom_attributes_to_user.rb
deleted file mode 100644
index 4eb709284..000000000
--- a/db/migrate/20210827120929_add_custom_attributes_to_user.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddCustomAttributesToUser < ActiveRecord::Migration[6.1]
-  def change
-    add_column :users, :custom_attributes, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20210828124043_add_telegram_channel.rb b/db/migrate/20210828124043_add_telegram_channel.rb
deleted file mode 100644
index 58466550c..000000000
--- a/db/migrate/20210828124043_add_telegram_channel.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class AddTelegramChannel < ActiveRecord::Migration[6.1]
-  def change
-    create_table :channel_telegram do |t|
-      t.string :bot_name
-      t.integer :account_id, null: false
-      t.string :bot_token, null: false, index: { unique: true }
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20210829124254_add_line_channel.rb b/db/migrate/20210829124254_add_line_channel.rb
deleted file mode 100644
index 54995b5b7..000000000
--- a/db/migrate/20210829124254_add_line_channel.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddLineChannel < ActiveRecord::Migration[6.1]
-  def change
-    create_table :channel_line do |t|
-      t.integer :account_id, null: false
-      t.string :line_channel_id, null: false, index: { unique: true }
-      t.string :line_channel_secret, null: false
-      t.string :line_channel_token, null: false
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20210902181438_add_instagram_id_to_facebook_page.rb b/db/migrate/20210902181438_add_instagram_id_to_facebook_page.rb
deleted file mode 100644
index 391fac835..000000000
--- a/db/migrate/20210902181438_add_instagram_id_to_facebook_page.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddInstagramIdToFacebookPage < ActiveRecord::Migration[6.1]
-  def up
-    add_column :channel_facebook_pages, :instagram_id, :string
-  end
-
-  def down
-    remove_column :channel_facebook_pages, :instagram_id, :string
-  end
-end
diff --git a/db/migrate/20210916060144_add_custom_attributes_to_conversations.rb b/db/migrate/20210916060144_add_custom_attributes_to_conversations.rb
deleted file mode 100644
index ef5f8cac1..000000000
--- a/db/migrate/20210916060144_add_custom_attributes_to_conversations.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddCustomAttributesToConversations < ActiveRecord::Migration[6.1]
-  def change
-    add_column :conversations, :custom_attributes, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20210916112533_add_whatsapp_channel.rb b/db/migrate/20210916112533_add_whatsapp_channel.rb
deleted file mode 100644
index 7e1f35951..000000000
--- a/db/migrate/20210916112533_add_whatsapp_channel.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddWhatsappChannel < ActiveRecord::Migration[6.1]
-  def change
-    create_table :channel_whatsapp do |t|
-      t.integer :account_id, null: false
-      t.string :phone_number, null: false, index: { unique: true }
-      t.string :provider, default: 'default'
-      t.jsonb :provider_config, default: {}
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20210922082754_add_assignee_last_seen.rb b/db/migrate/20210922082754_add_assignee_last_seen.rb
deleted file mode 100644
index 41ff17818..000000000
--- a/db/migrate/20210922082754_add_assignee_last_seen.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddAssigneeLastSeen < ActiveRecord::Migration[6.1]
-  def change
-    add_column :conversations, :assignee_last_seen_at, :datetime
-  end
-end
diff --git a/db/migrate/20210923132659_set_content_type_text_for_the_old_messages.rb b/db/migrate/20210923132659_set_content_type_text_for_the_old_messages.rb
deleted file mode 100644
index d9af6f19b..000000000
--- a/db/migrate/20210923132659_set_content_type_text_for_the_old_messages.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class SetContentTypeTextForTheOldMessages < ActiveRecord::Migration[6.1]
-  def change
-    change_column_null(:messages, :content_type, false, 0)
-  end
-end
diff --git a/db/migrate/20210923190418_add_online_status_to_account_users.rb b/db/migrate/20210923190418_add_online_status_to_account_users.rb
deleted file mode 100644
index 00b2d4999..000000000
--- a/db/migrate/20210923190418_add_online_status_to_account_users.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class AddOnlineStatusToAccountUsers < ActiveRecord::Migration[6.1]
-  def change
-    change_table :account_users, bulk: true do |t|
-      t.integer :availability, default: 0, null: false
-      t.boolean :auto_offline, default: true, null: false
-    end
-  end
-
-  # run as a seperate data migration if you want to migrate the user statuses
-  def update_existing_user_availability
-    User.find_in_batches do |user_batch|
-      user_batch.each do |user|
-        availability = user.availability
-        user.account_users.update(availability: availability)
-      end
-    end
-  end
-end
diff --git a/db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb b/db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb
deleted file mode 100644
index 480f17d66..000000000
--- a/db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTriggerOnlyDuringBusinessHoursCollectToCampaigns < ActiveRecord::Migration[6.1]
-  def change
-    add_column :campaigns, :trigger_only_during_business_hours, :boolean, default: false
-  end
-end
diff --git a/db/migrate/20211012135050_add_limits_to_accounts.rb b/db/migrate/20211012135050_add_limits_to_accounts.rb
deleted file mode 100644
index 8f5b28c25..000000000
--- a/db/migrate/20211012135050_add_limits_to_accounts.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddLimitsToAccounts < ActiveRecord::Migration[6.1]
-  def change
-    add_column :accounts, :limits, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb b/db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb
deleted file mode 100644
index 7bd7aca50..000000000
--- a/db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-class AddImapSmtpConfigToChannelEmail < ActiveRecord::Migration[6.1]
-  def change
-    change_table :channel_email, bulk: true do |t|
-      # IMAP
-      t.boolean :imap_enabled, default: false
-      t.string :imap_address, default: ''
-      t.integer :imap_port, default: 0
-      t.string :imap_email, default: ''
-      t.string :imap_password, default: ''
-      t.boolean :imap_enable_ssl, default: true
-      t.datetime :imap_inbox_synced_at
-
-      # SMTP
-      t.boolean :smtp_enabled, default: false
-      t.string :smtp_address, default: ''
-      t.integer :smtp_port, default: 0
-      t.string :smtp_email, default: ''
-      t.string :smtp_password, default: ''
-      t.string :smtp_domain, default: ''
-      t.boolean :smtp_enable_starttls_auto, default: true
-      t.string :smtp_authentication, default: 'login'
-    end
-  end
-end
diff --git a/db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb b/db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb
deleted file mode 100644
index 02846a2c9..000000000
--- a/db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTweetEnabledFlagToTwitterChannel < ActiveRecord::Migration[6.1]
-  def change
-    add_column :channel_twitter_profiles, :tweets_enabled, :boolean, default: true
-  end
-end
diff --git a/db/migrate/20211110101046_create_automation_rules.rb b/db/migrate/20211110101046_create_automation_rules.rb
deleted file mode 100644
index ee7349413..000000000
--- a/db/migrate/20211110101046_create_automation_rules.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class CreateAutomationRules < ActiveRecord::Migration[6.1]
-  def change
-    create_table :automation_rules do |t|
-      t.bigint :account_id, null: false
-      t.string :name, null: false
-      t.text :description
-      t.string :event_name, null: false
-      t.jsonb :conditions, null: false, default: '{}'
-      t.jsonb :actions, null: false, default: '{}'
-      t.timestamps
-      t.index :account_id, name: 'index_automation_rules_on_account_id'
-    end
-  end
-end
diff --git a/db/migrate/20211116131740_add_values_to_custom_attribute_definitions.rb b/db/migrate/20211116131740_add_values_to_custom_attribute_definitions.rb
deleted file mode 100644
index 2625fe30c..000000000
--- a/db/migrate/20211116131740_add_values_to_custom_attribute_definitions.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddValuesToCustomAttributeDefinitions < ActiveRecord::Migration[6.1]
-  def change
-    add_column :custom_attribute_definitions, :values, :jsonb, default: []
-  end
-end
diff --git a/db/migrate/20211118100301_change_values_to_attribute_values_in_custom_attribute_definitions.rb b/db/migrate/20211118100301_change_values_to_attribute_values_in_custom_attribute_definitions.rb
deleted file mode 100644
index fdf8fd661..000000000
--- a/db/migrate/20211118100301_change_values_to_attribute_values_in_custom_attribute_definitions.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeValuesToAttributeValuesInCustomAttributeDefinitions < ActiveRecord::Migration[6.1]
-  def change
-    rename_column :custom_attribute_definitions, :values, :attribute_values
-  end
-end
diff --git a/db/migrate/20211122061012_add_pub_sub_token_to_contact_inbox.rb b/db/migrate/20211122061012_add_pub_sub_token_to_contact_inbox.rb
deleted file mode 100644
index 7ba816efc..000000000
--- a/db/migrate/20211122061012_add_pub_sub_token_to_contact_inbox.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddPubSubTokenToContactInbox < ActiveRecord::Migration[6.1]
-  def change
-    add_column :contact_inboxes, :pubsub_token, :string
-    add_index :contact_inboxes, :pubsub_token, unique: true
-  end
-end
diff --git a/db/migrate/20211122112607_remove_invalid_migration.rb b/db/migrate/20211122112607_remove_invalid_migration.rb
deleted file mode 100644
index 51a9701c8..000000000
--- a/db/migrate/20211122112607_remove_invalid_migration.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class RemoveInvalidMigration < ActiveRecord::Migration[6.1]
-  def change
-    return unless ActiveRecord::Base.connection.table_exists? 'actions'
-
-    drop_table :actions do |t|
-      t.string :name
-      t.jsonb :execution_list
-      t.datetime :created_at
-      t.datetime :updated_at
-      t.index ['name'], name: 'index_actions_on_name'
-    end
-  end
-end
diff --git a/db/migrate/20211129120040_add_templates_to_whatsapp_channel.rb b/db/migrate/20211129120040_add_templates_to_whatsapp_channel.rb
deleted file mode 100644
index 247fd9095..000000000
--- a/db/migrate/20211129120040_add_templates_to_whatsapp_channel.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class AddTemplatesToWhatsappChannel < ActiveRecord::Migration[6.1]
-  def up
-    change_table :channel_whatsapp, bulk: true do |t|
-      t.column :message_templates, :jsonb, default: {}
-      t.column :message_templates_last_updated, :datetime
-    end
-  end
-
-  def down
-    change_table :channel_whatsapp, bulk: true do |t|
-      t.remove :message_templates
-      t.remove :message_templates_last_updated
-    end
-  end
-end
diff --git a/db/migrate/20211201224513_create_mentions.rb b/db/migrate/20211201224513_create_mentions.rb
deleted file mode 100644
index 736be1ccf..000000000
--- a/db/migrate/20211201224513_create_mentions.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateMentions < ActiveRecord::Migration[6.1]
-  def change
-    create_table :mentions do |t|
-      t.references :user, null: false, foreign_key: true
-      t.references :conversation, null: false, foreign_key: true
-      t.references :account, index: true, null: false
-      t.datetime :mentioned_at, null: false
-      t.timestamps
-    end
-
-    add_index :mentions, [:user_id, :conversation_id], unique: true
-  end
-end
diff --git a/db/migrate/20211207113102_remove_attribute_key_index_on_custom_attribute_definition.rb b/db/migrate/20211207113102_remove_attribute_key_index_on_custom_attribute_definition.rb
deleted file mode 100644
index 9beed0de6..000000000
--- a/db/migrate/20211207113102_remove_attribute_key_index_on_custom_attribute_definition.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class RemoveAttributeKeyIndexOnCustomAttributeDefinition < ActiveRecord::Migration[6.1]
-  def change
-    remove_index :custom_attribute_definitions, [:attribute_key, :account_id], name: 'attribute_key_model_index',
-                                                                               if_exists: true
-    add_index :custom_attribute_definitions, [:attribute_key, :account_id], unique: true, name: 'attribute_key_index', if_not_exists: true
-  end
-end
diff --git a/db/migrate/20211208081344_add_attribute_model_index_on_custom_attribute_definition.rb b/db/migrate/20211208081344_add_attribute_model_index_on_custom_attribute_definition.rb
deleted file mode 100644
index a79826668..000000000
--- a/db/migrate/20211208081344_add_attribute_model_index_on_custom_attribute_definition.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddAttributeModelIndexOnCustomAttributeDefinition < ActiveRecord::Migration[6.1]
-  def change
-    remove_index :custom_attribute_definitions, [:attribute_key, :account_id], name: 'attribute_key_index',
-                                                                               if_exists: true
-    add_index :custom_attribute_definitions, [:attribute_key, :attribute_model, :account_id], unique: true, name: 'attribute_key_model_index',
-                                                                                              if_not_exists: true
-  end
-end
diff --git a/db/migrate/20211208085931_update_contact_inbox_foreign_key.rb b/db/migrate/20211208085931_update_contact_inbox_foreign_key.rb
deleted file mode 100644
index 100d410d6..000000000
--- a/db/migrate/20211208085931_update_contact_inbox_foreign_key.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class UpdateContactInboxForeignKey < ActiveRecord::Migration[6.1]
-  def change
-    remove_foreign_key :contact_inboxes, :contacts
-    add_foreign_key :contact_inboxes, :contacts, on_delete: :cascade
-
-    remove_foreign_key :contact_inboxes, :inboxes
-    add_foreign_key :contact_inboxes, :inboxes, on_delete: :cascade
-
-    remove_foreign_key :conversations, :contact_inboxes
-    add_foreign_key :conversations, :contact_inboxes, on_delete: :cascade
-  end
-end
diff --git a/db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb b/db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb
deleted file mode 100644
index 4c44ac2bb..000000000
--- a/db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class AddAllowMessagesAfterResolvedToInbox < ActiveRecord::Migration[6.1]
-  def change
-    add_column :inboxes, :allow_messages_after_resolved, :boolean, default: true
-
-    update_csat_enabled_inboxes
-  end
-
-  def update_csat_enabled_inboxes
-    ::Inbox.where(channel_type: 'Channel::WebWidget', csat_survey_enabled: true).find_in_batches do |inboxes_batch|
-      inboxes_batch.each do |inbox|
-        inbox.allow_messages_after_resolved = false
-        inbox.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20211219031453_update_foreign_keys_on_delete.rb b/db/migrate/20211219031453_update_foreign_keys_on_delete.rb
deleted file mode 100644
index 61e71cc52..000000000
--- a/db/migrate/20211219031453_update_foreign_keys_on_delete.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-class UpdateForeignKeysOnDelete < ActiveRecord::Migration[6.1]
-  def change
-    remove_foreign_key 'account_users', 'accounts'
-    add_foreign_key 'account_users', 'accounts', on_delete: :cascade
-
-    remove_foreign_key 'account_users', 'users'
-    add_foreign_key 'account_users', 'users', on_delete: :cascade
-
-    remove_foreign_key 'agent_bots', 'accounts'
-    add_foreign_key 'agent_bots', 'accounts', on_delete: :cascade
-
-    remove_foreign_key 'campaigns', 'accounts'
-    add_foreign_key 'campaigns', 'accounts', on_delete: :cascade
-
-    remove_foreign_key 'campaigns', 'inboxes'
-    add_foreign_key 'campaigns', 'inboxes', on_delete: :cascade
-
-    remove_foreign_key 'conversations', 'campaigns'
-    add_foreign_key 'conversations', 'campaigns', on_delete: :cascade
-
-    remove_foreign_key 'conversations', 'teams'
-    add_foreign_key 'conversations', 'teams', on_delete: :cascade
-
-    remove_foreign_key 'csat_survey_responses', 'accounts'
-    add_foreign_key 'csat_survey_responses', 'accounts', on_delete: :cascade
-
-    remove_foreign_key 'csat_survey_responses', 'contacts'
-    add_foreign_key 'csat_survey_responses', 'contacts', on_delete: :cascade
-
-    remove_foreign_key 'csat_survey_responses', 'conversations'
-    add_foreign_key 'csat_survey_responses', 'conversations', on_delete: :cascade
-
-    remove_foreign_key 'csat_survey_responses', 'messages'
-    add_foreign_key 'csat_survey_responses', 'messages', on_delete: :cascade
-
-    remove_foreign_key 'csat_survey_responses', 'users', column: 'assigned_agent_id'
-    add_foreign_key 'csat_survey_responses', 'users', column: 'assigned_agent_id', on_delete: :cascade
-
-    remove_foreign_key 'data_imports', 'accounts'
-    add_foreign_key 'data_imports', 'accounts', on_delete: :cascade
-
-    remove_foreign_key 'mentions', 'conversations'
-    add_foreign_key 'mentions', 'conversations', on_delete: :cascade
-
-    remove_foreign_key 'mentions', 'users'
-    add_foreign_key 'mentions', 'users', on_delete: :cascade
-
-    remove_foreign_key 'notes', 'accounts'
-    add_foreign_key 'notes', 'accounts', on_delete: :cascade
-
-    remove_foreign_key 'notes', 'contacts'
-    add_foreign_key 'notes', 'contacts', on_delete: :cascade
-
-    remove_foreign_key 'notes', 'users'
-    add_foreign_key 'notes', 'users', on_delete: :cascade
-
-    remove_foreign_key 'team_members', 'teams'
-    add_foreign_key 'team_members', 'teams', on_delete: :cascade
-
-    remove_foreign_key 'team_members', 'users'
-    add_foreign_key 'team_members', 'users', on_delete: :cascade
-
-    remove_foreign_key 'teams', 'accounts'
-    add_foreign_key 'teams', 'accounts', on_delete: :cascade
-  end
-end
diff --git a/db/migrate/20211221125545_add_unique_index_on_inbox_members.rb b/db/migrate/20211221125545_add_unique_index_on_inbox_members.rb
deleted file mode 100644
index 0af4219e7..000000000
--- a/db/migrate/20211221125545_add_unique_index_on_inbox_members.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# ref: https://dev.to/nodefiend/rails-migration-adding-a-unique-index-and-deleting-duplicates-5cde
-
-class AddUniqueIndexOnInboxMembers < ActiveRecord::Migration[6.1]
-  def up
-    # partioning the duplicate records and then removing where more than one row is found
-    ActiveRecord::Base.connection.execute('
-      DELETE FROM inbox_members WHERE id IN (SELECT id from (
-        SELECT id, user_id, inbox_id, ROW_NUMBER() OVER w AS rnum FROM inbox_members WINDOW w AS (
-          PARTITION BY inbox_id, user_id ORDER BY id
-        )
-      ) t WHERE t.rnum > 1)
-    ')
-    add_index :inbox_members, [:inbox_id, :user_id], unique: true
-  end
-
-  def down
-    remove_index :inbox_members, [:inbox_id, :user_id]
-  end
-end
diff --git a/db/migrate/20220110090126_add_active_flag_to_automation_rule.rb b/db/migrate/20220110090126_add_active_flag_to_automation_rule.rb
deleted file mode 100644
index cd1d73270..000000000
--- a/db/migrate/20220110090126_add_active_flag_to_automation_rule.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddActiveFlagToAutomationRule < ActiveRecord::Migration[6.1]
-  def change
-    add_column :automation_rules, :active, :boolean, default: true, null: false
-  end
-end
diff --git a/db/migrate/20220111200105_update_nil_contact_attributes_to_empty_hash.rb b/db/migrate/20220111200105_update_nil_contact_attributes_to_empty_hash.rb
deleted file mode 100644
index 31881fe1d..000000000
--- a/db/migrate/20220111200105_update_nil_contact_attributes_to_empty_hash.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class UpdateNilContactAttributesToEmptyHash < ActiveRecord::Migration[6.1]
-  def change
-    # rubocop:disable Rails/SkipsModelValidations
-    Contact.where(custom_attributes: nil).update_all(custom_attributes: {})
-    Contact.where(additional_attributes: nil).update_all(additional_attributes: {})
-    # rubocop:enable Rails/SkipsModelValidations
-  end
-end
diff --git a/db/migrate/20220111223630_remove_platform_app_permissible_access_tokens.rb b/db/migrate/20220111223630_remove_platform_app_permissible_access_tokens.rb
deleted file mode 100644
index 2afbde57e..000000000
--- a/db/migrate/20220111223630_remove_platform_app_permissible_access_tokens.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemovePlatformAppPermissibleAccessTokens < ActiveRecord::Migration[6.1]
-  def change
-    AccessToken.where(owner_type: 'PlatformAppPermissible').destroy_all
-  end
-end
diff --git a/db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb b/db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb
deleted file mode 100644
index 77cddc7c5..000000000
--- a/db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddOpenSslVerifyModeToChannelEmail < ActiveRecord::Migration[6.1]
-  def change
-    change_table :channel_email, bulk: true do |t|
-      t.string :smtp_openssl_verify_mode, default: 'none'
-      t.boolean :smtp_enable_ssl_tls, default: false
-    end
-  end
-end
diff --git a/db/migrate/20220119051739_enable_conversation_continuity.rb b/db/migrate/20220119051739_enable_conversation_continuity.rb
deleted file mode 100644
index 0deb5f0d6..000000000
--- a/db/migrate/20220119051739_enable_conversation_continuity.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class EnableConversationContinuity < ActiveRecord::Migration[6.1]
-  def change
-    add_column :channel_web_widgets, :continuity_via_email, :boolean, null: false, default: true
-  end
-end
diff --git a/db/migrate/20220121055444_add_type_to_users.rb b/db/migrate/20220121055444_add_type_to_users.rb
deleted file mode 100644
index b4e0687b5..000000000
--- a/db/migrate/20220121055444_add_type_to_users.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-class AddTypeToUsers < ActiveRecord::Migration[6.1]
-  def change
-    add_column :users, :type, :string
-    migrate_existing_super_admins
-
-    drop_table :super_admins do |t|
-      t.string :email,              null: false, default: ''
-      t.string :encrypted_password, null: false, default: ''
-      t.datetime :remember_created_at
-      t.integer  :sign_in_count, default: 0, null: false
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.inet     :current_sign_in_ip
-      t.inet     :last_sign_in_ip
-      t.timestamps null: false
-    end
-  end
-
-  private
-
-  def old_super_admins
-    ActiveRecord::Base.connection.execute('SELECT * from super_admins').to_a
-  end
-
-  def create_user_account_for_super_admin(super_admin)
-    u = User.new(email: super_admin['email'], name: "SuperUser #{super_admin['id']}", encrypted_password: super_admin['encrypted_password'],
-                 confirmed_at: DateTime.now, type: 'SuperAdmin')
-    u.save(validate: false)
-  end
-
-  def migrate_existing_super_admins
-    old_super_admins.each do |super_admin|
-      user = User.find_by(email: super_admin['email'])
-      if user.present?
-        user.update(type: 'SuperAdmin')
-      else
-        Rails.logger.debug { "User with email #{super_admin['email']} not found" }
-        create_user_account_for_super_admin(super_admin)
-      end
-    end
-  end
-end
diff --git a/db/migrate/20220129024443_add_sms_channel.rb b/db/migrate/20220129024443_add_sms_channel.rb
deleted file mode 100644
index c65019f7e..000000000
--- a/db/migrate/20220129024443_add_sms_channel.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddSmsChannel < ActiveRecord::Migration[6.1]
-  def change
-    create_table :channel_sms do |t|
-      t.integer :account_id, null: false
-      t.string :phone_number, null: false, index: { unique: true }
-      t.string :provider, default: 'default'
-      t.jsonb :provider_config, default: {}
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20220131081750_add_email_signature_to_user.rb b/db/migrate/20220131081750_add_email_signature_to_user.rb
deleted file mode 100644
index 54edc049e..000000000
--- a/db/migrate/20220131081750_add_email_signature_to_user.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddEmailSignatureToUser < ActiveRecord::Migration[6.1]
-  def change
-    change_table :users, bulk: true do |t|
-      t.boolean :message_signature_enabled, null: false, default: false
-      t.text :message_signature, null: true
-    end
-  end
-end
diff --git a/db/migrate/20220207124741_add_direct_uploads_to_installation_config.rb b/db/migrate/20220207124741_add_direct_uploads_to_installation_config.rb
deleted file mode 100644
index 1261eae64..000000000
--- a/db/migrate/20220207124741_add_direct_uploads_to_installation_config.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddDirectUploadsToInstallationConfig < ActiveRecord::Migration[6.1]
-  def change
-    ConfigLoader.new.process
-  end
-end
diff --git a/db/migrate/20220215060751_remove_message_signature_enabled.rb b/db/migrate/20220215060751_remove_message_signature_enabled.rb
deleted file mode 100644
index e627ba34f..000000000
--- a/db/migrate/20220215060751_remove_message_signature_enabled.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveMessageSignatureEnabled < ActiveRecord::Migration[6.1]
-  def change
-    remove_column :users, :message_signature_enabled, :boolean
-  end
-end
diff --git a/db/migrate/20220216151613_add_open_all_day_to_working_hour.rb b/db/migrate/20220216151613_add_open_all_day_to_working_hour.rb
deleted file mode 100644
index 138f6edb6..000000000
--- a/db/migrate/20220216151613_add_open_all_day_to_working_hour.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddOpenAllDayToWorkingHour < ActiveRecord::Migration[6.1]
-  def change
-    add_column :working_hours, :open_all_day, :boolean, default: false
-  end
-end
diff --git a/db/migrate/20220218120357_add_h_captcha_key.rb b/db/migrate/20220218120357_add_h_captcha_key.rb
deleted file mode 100644
index 02b06e5d3..000000000
--- a/db/migrate/20220218120357_add_h_captcha_key.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddHCaptchaKey < ActiveRecord::Migration[6.1]
-  def change
-    ConfigLoader.new.process
-  end
-end
diff --git a/db/migrate/20220315204137_add_account_sid_unique_index_to_channel_twilio_sms.rb b/db/migrate/20220315204137_add_account_sid_unique_index_to_channel_twilio_sms.rb
deleted file mode 100644
index e9bb5e189..000000000
--- a/db/migrate/20220315204137_add_account_sid_unique_index_to_channel_twilio_sms.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-class AddAccountSidUniqueIndexToChannelTwilioSms < ActiveRecord::Migration[6.1]
-  def change
-    clear_possible_duplicates
-
-    has_duplicates = Channel::TwilioSms.select(:phone_number).group(:phone_number).having('count(*) > 1').exists?
-
-    if has_duplicates
-      raise <<~ERR.squish
-        ERROR: You have duplicate values for phone_number in "channel_twilio_sms".
-        This causes Twilio account lookup to behave unpredictably. Please eliminate the duplicates
-        and then re-run this migration.
-      ERR
-    end
-
-    remove_index :channel_twilio_sms, [:account_id, :phone_number], unique: true
-    add_index :channel_twilio_sms, :phone_number, unique: true
-    # since look ups are done via account_sid + phone_number, we need to add a unique index
-    add_index :channel_twilio_sms, [:account_sid, :phone_number], unique: true
-  end
-
-  def clear_possible_duplicates
-    # based on the look up in saas it seems like only the first inbox is used in case of duplicates,
-    # so lets try to clear our inboxes with out conversations
-    duplicate_phone_numbers = Channel::TwilioSms.select(:phone_number).group(:phone_number).having('count(*) > 1').collect(&:phone_number)
-    duplicate_phone_numbers.each do |phone_number|
-      # we are skipping the first inbox that was created
-      Channel::TwilioSms.where(phone_number: phone_number).drop(1).each do |channel|
-        inbox = channel.inbox
-        # skip inboxes with conversations
-        next if inbox.conversations.count.positive?
-
-        inbox.destroy
-      end
-    end
-
-    # clear the accounts created with twilio sandbox whatsapp number
-    # Channel::TwilioSms.where(phone_number: 'whatsapp:+14155238886').each { |channel| channel.inbox.destroy }
-  end
-end
diff --git a/db/migrate/20220316054933_add_custom_fields_to_pre_chat_form.rb b/db/migrate/20220316054933_add_custom_fields_to_pre_chat_form.rb
deleted file mode 100644
index a2fe3d9a7..000000000
--- a/db/migrate/20220316054933_add_custom_fields_to_pre_chat_form.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class AddCustomFieldsToPreChatForm < ActiveRecord::Migration[6.1]
-  def change
-    Channel::WebWidget.find_in_batches do |channels_batch|
-      channels_batch.each do |channel|
-        pre_chat_message = channel[:pre_chat_form_options]['pre_chat_message'] || 'Share your queries or comments here.'
-        pre_chat_fields = pre_chat_fields?(channel)
-        channel[:pre_chat_form_options] = {
-          'pre_chat_message': pre_chat_message,
-          'pre_chat_fields': pre_chat_fields
-        }
-        channel.save!
-      end
-    end
-  end
-
-  def pre_chat_fields?(channel)
-    email_enabled = channel[:pre_chat_form_options]['require_email'] || false
-    [
-      {
-        'field_type': 'standard', 'label': 'Email Id', 'name': 'emailAddress', 'type': 'email', 'required': true, 'enabled': email_enabled
-      },
-      {
-        'field_type': 'standard', 'label': 'Full name', 'name': 'fullName', 'type': 'text', 'required': false, 'enabled': false
-      }, {
-        'field_type': 'standard', 'label': 'Phone number', 'name': 'phoneNumber', 'type': 'text', 'required': false, 'enabled': false
-      }
-    ]
-  end
-end
diff --git a/db/migrate/20220317171031_add_messaging_service_sid_to_channel_twilio_sms.rb b/db/migrate/20220317171031_add_messaging_service_sid_to_channel_twilio_sms.rb
deleted file mode 100644
index 2c8e18ec1..000000000
--- a/db/migrate/20220317171031_add_messaging_service_sid_to_channel_twilio_sms.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddMessagingServiceSidToChannelTwilioSms < ActiveRecord::Migration[6.1]
-  def change
-    change_column_null :channel_twilio_sms, :phone_number, true
-    add_column :channel_twilio_sms, :messaging_service_sid, :string
-    add_index :channel_twilio_sms, [:messaging_service_sid], unique: true
-  end
-end
diff --git a/db/migrate/20220329131401_add_value_in_business_hours_to_reporting_event.rb b/db/migrate/20220329131401_add_value_in_business_hours_to_reporting_event.rb
deleted file mode 100644
index 4b8138eb7..000000000
--- a/db/migrate/20220329131401_add_value_in_business_hours_to_reporting_event.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddValueInBusinessHoursToReportingEvent < ActiveRecord::Migration[6.1]
-  def change
-    change_table :reporting_events, bulk: true do |t|
-      t.float :value_in_business_hours, default: nil
-      t.datetime :event_start_time, default: nil
-      t.datetime :event_end_time, default: nil
-    end
-  end
-end
diff --git a/db/migrate/20220405092033_update_web_widget_feature_flags.rb b/db/migrate/20220405092033_update_web_widget_feature_flags.rb
deleted file mode 100644
index 5b534aa15..000000000
--- a/db/migrate/20220405092033_update_web_widget_feature_flags.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class UpdateWebWidgetFeatureFlags < ActiveRecord::Migration[6.1]
-  def change
-    change_column_default(:channel_web_widgets, :feature_flags, from: 3, to: 7)
-
-    set_end_conversation_to_default
-  end
-
-  def set_end_conversation_to_default
-    ::Channel::WebWidget.find_in_batches do |widget_batch|
-      widget_batch.each do |widget|
-        widget.end_conversation = true
-        widget.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20220409044943_rename_imap_email_and_smtp_email_columns.rb b/db/migrate/20220409044943_rename_imap_email_and_smtp_email_columns.rb
deleted file mode 100644
index 4518647b4..000000000
--- a/db/migrate/20220409044943_rename_imap_email_and_smtp_email_columns.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class RenameImapEmailAndSmtpEmailColumns < ActiveRecord::Migration[6.1]
-  def change
-    rename_column :channel_email, :imap_email, :imap_login
-    rename_column :channel_email, :smtp_email, :smtp_login
-  end
-end
diff --git a/db/migrate/20220416203340_add_config_to_portal.rb b/db/migrate/20220416203340_add_config_to_portal.rb
deleted file mode 100644
index 27cd53773..000000000
--- a/db/migrate/20220416203340_add_config_to_portal.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddConfigToPortal < ActiveRecord::Migration[6.1]
-  def change
-    add_column :kbase_portals, :config, :jsonb, default: { allowed_locales: ['en'] }
-  end
-end
diff --git a/db/migrate/20220416205519_add_locale_to_kbase_category.rb b/db/migrate/20220416205519_add_locale_to_kbase_category.rb
deleted file mode 100644
index 04cdc4bf3..000000000
--- a/db/migrate/20220416205519_add_locale_to_kbase_category.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddLocaleToKbaseCategory < ActiveRecord::Migration[6.1]
-  def change
-    add_column :kbase_categories, :locale, :string, default: 'en'
-    add_index :kbase_categories, :locale
-    add_index :kbase_categories, [:locale, :account_id]
-  end
-end
diff --git a/db/migrate/20220418094715_remove_contact_pubsub_token.rb b/db/migrate/20220418094715_remove_contact_pubsub_token.rb
deleted file mode 100644
index e625b9046..000000000
--- a/db/migrate/20220418094715_remove_contact_pubsub_token.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveContactPubsubToken < ActiveRecord::Migration[6.1]
-  def change
-    remove_column :contacts, :pubsub_token, :string
-  end
-end
diff --git a/db/migrate/20220424081117_add_subscriptions_to_webhooks.rb b/db/migrate/20220424081117_add_subscriptions_to_webhooks.rb
deleted file mode 100644
index b4e8d4dfc..000000000
--- a/db/migrate/20220424081117_add_subscriptions_to_webhooks.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class AddSubscriptionsToWebhooks < ActiveRecord::Migration[6.1]
-  def change
-    add_column :webhooks, :subscriptions, :jsonb, default: %w[
-      conversation_status_changed
-      conversation_updated
-      conversation_created
-      message_created
-      message_updated
-      webwidget_triggered
-    ]
-  end
-end
diff --git a/db/migrate/20220428101325_add_index_to_conversation_and_reporting_event.rb b/db/migrate/20220428101325_add_index_to_conversation_and_reporting_event.rb
deleted file mode 100644
index f1b982a8b..000000000
--- a/db/migrate/20220428101325_add_index_to_conversation_and_reporting_event.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddIndexToConversationAndReportingEvent < ActiveRecord::Migration[6.1]
-  def change
-    add_index :conversations, :last_activity_at
-    add_index :reporting_events, :conversation_id
-  end
-end
diff --git a/db/migrate/20220506061540_change_kbase_portals_to_portals.rb b/db/migrate/20220506061540_change_kbase_portals_to_portals.rb
deleted file mode 100644
index c9765abbb..000000000
--- a/db/migrate/20220506061540_change_kbase_portals_to_portals.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeKbasePortalsToPortals < ActiveRecord::Migration[6.1]
-  def change
-    rename_table :kbase_portals, :portals
-  end
-end
diff --git a/db/migrate/20220506064938_create_portals_members_join_table.rb b/db/migrate/20220506064938_create_portals_members_join_table.rb
deleted file mode 100644
index a24bb7356..000000000
--- a/db/migrate/20220506064938_create_portals_members_join_table.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreatePortalsMembersJoinTable < ActiveRecord::Migration[6.1]
-  def change
-    create_join_table :portals, :users, table_name: :portals_members do |t|
-      t.index :portal_id
-      t.index :user_id
-      t.index [:portal_id, :user_id], unique: true
-    end
-  end
-end
diff --git a/db/migrate/20220506072007_change_kbase_categories_to_categories.rb b/db/migrate/20220506072007_change_kbase_categories_to_categories.rb
deleted file mode 100644
index b527e3e80..000000000
--- a/db/migrate/20220506072007_change_kbase_categories_to_categories.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeKbaseCategoriesToCategories < ActiveRecord::Migration[6.1]
-  def change
-    rename_table :kbase_categories, :categories
-  end
-end
diff --git a/db/migrate/20220506080338_change_kbase_folders_to_folders.rb b/db/migrate/20220506080338_change_kbase_folders_to_folders.rb
deleted file mode 100644
index 8e0ba6642..000000000
--- a/db/migrate/20220506080338_change_kbase_folders_to_folders.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeKbaseFoldersToFolders < ActiveRecord::Migration[6.1]
-  def change
-    rename_table :kbase_folders, :folders
-  end
-end
diff --git a/db/migrate/20220506080429_change_kbase_articles_to_articles.rb b/db/migrate/20220506080429_change_kbase_articles_to_articles.rb
deleted file mode 100644
index ba041ca84..000000000
--- a/db/migrate/20220506080429_change_kbase_articles_to_articles.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeKbaseArticlesToArticles < ActiveRecord::Migration[6.1]
-  def change
-    rename_table :kbase_articles, :articles
-  end
-end
diff --git a/db/migrate/20220506163839_add_additional_attributes_to_message.rb b/db/migrate/20220506163839_add_additional_attributes_to_message.rb
deleted file mode 100644
index 713584c41..000000000
--- a/db/migrate/20220506163839_add_additional_attributes_to_message.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class AddAdditionalAttributesToMessage < ActiveRecord::Migration[6.1]
-  disable_ddl_transaction!
-
-  def up
-    add_column :messages, :additional_attributes, :jsonb, default: {}
-    add_index :messages, "((additional_attributes->'campaign_id'))", name: 'index_messages_on_additional_attributes_campaign_id', using: 'gin',
-                                                                     algorithm: :concurrently
-  end
-
-  def down
-    remove_index :messages, name: 'index_messages_on_additional_attributes_campaign_id'
-    remove_column :messages, :additional_attributes
-  end
-end
diff --git a/db/migrate/20220511072655_add_archive_column_to_portal.rb b/db/migrate/20220511072655_add_archive_column_to_portal.rb
deleted file mode 100644
index b3a504e97..000000000
--- a/db/migrate/20220511072655_add_archive_column_to_portal.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddArchiveColumnToPortal < ActiveRecord::Migration[6.1]
-  def change
-    add_column :portals, :archived, :boolean, default: false
-  end
-end
diff --git a/db/migrate/20220513145010_add_first_reply_activity_at_to_conversation.rb b/db/migrate/20220513145010_add_first_reply_activity_at_to_conversation.rb
deleted file mode 100644
index 9afb58feb..000000000
--- a/db/migrate/20220513145010_add_first_reply_activity_at_to_conversation.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class AddFirstReplyActivityAtToConversation < ActiveRecord::Migration[6.1]
-  def change
-    add_column :conversations, :first_reply_created_at, :datetime
-    add_index :conversations, :first_reply_created_at
-
-    # rubocop:disable Rails/SkipsModelValidations
-    ::Conversation.update_all(first_reply_created_at: Time.now.utc)
-    # rubocop:enable Rails/SkipsModelValidations
-
-    backfill_first_reply_activity_at_to_conversations
-  end
-
-  private
-
-  def backfill_first_reply_activity_at_to_conversations
-    ::Account.find_in_batches do |account_batch|
-      Rails.logger.info "Migrated till #{account_batch.first.id}\n"
-      account_batch.each do |account|
-        Migration::ConversationsFirstReplySchedulerJob.perform_later(account)
-      end
-    end
-  end
-end
diff --git a/db/migrate/20220525141844_create_dashboard_apps.rb b/db/migrate/20220525141844_create_dashboard_apps.rb
deleted file mode 100644
index 0e4fee9e2..000000000
--- a/db/migrate/20220525141844_create_dashboard_apps.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateDashboardApps < ActiveRecord::Migration[6.1]
-  def change
-    create_table :dashboard_apps do |t|
-      t.string :title, null: false
-      t.jsonb :content, default: []
-      t.references :account, null: false, foreign_key: true
-      t.references :user, foreign_key: true
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20220527040433_add_auto_assignment_configuration_to_inboxes.rb b/db/migrate/20220527040433_add_auto_assignment_configuration_to_inboxes.rb
deleted file mode 100644
index 31e324ce9..000000000
--- a/db/migrate/20220527040433_add_auto_assignment_configuration_to_inboxes.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddAutoAssignmentConfigurationToInboxes < ActiveRecord::Migration[6.1]
-  def change
-    add_column :inboxes, :auto_assignment_config, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20220527080906_add_reference_for_author_id.rb b/db/migrate/20220527080906_add_reference_for_author_id.rb
deleted file mode 100644
index cf7fd22fc..000000000
--- a/db/migrate/20220527080906_add_reference_for_author_id.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddReferenceForAuthorId < ActiveRecord::Migration[6.1]
-  def change
-    remove_column :articles, :author_id, :integer
-    add_reference :articles, :author, foreign_key: { to_table: :users }
-  end
-end
diff --git a/db/migrate/20220527120826_add_index_on_category_slug_and_locale.rb b/db/migrate/20220527120826_add_index_on_category_slug_and_locale.rb
deleted file mode 100644
index be17caac7..000000000
--- a/db/migrate/20220527120826_add_index_on_category_slug_and_locale.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddIndexOnCategorySlugAndLocale < ActiveRecord::Migration[6.1]
-  def change
-    add_column :categories, :slug, :string, null: false, default: ''
-    add_index :categories, [:slug, :locale, :portal_id], unique: true
-    change_column_default :categories, :slug, from: '', to: nil
-  end
-end
diff --git a/db/migrate/20220608084622_add_associated_article_id.rb b/db/migrate/20220608084622_add_associated_article_id.rb
deleted file mode 100644
index f6cefb74c..000000000
--- a/db/migrate/20220608084622_add_associated_article_id.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddAssociatedArticleId < ActiveRecord::Migration[6.1]
-  def change
-    add_reference :articles, :associated_article, foreign_key: { to_table: :articles }
-  end
-end
diff --git a/db/migrate/20220610091206_add_additional_attributes_to_api_channel.rb b/db/migrate/20220610091206_add_additional_attributes_to_api_channel.rb
deleted file mode 100644
index ca5580883..000000000
--- a/db/migrate/20220610091206_add_additional_attributes_to_api_channel.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddAdditionalAttributesToApiChannel < ActiveRecord::Migration[6.1]
-  def change
-    add_column :channel_api, :additional_attributes, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20220616154502_remove_special_characters_from_inbox_name.rb b/db/migrate/20220616154502_remove_special_characters_from_inbox_name.rb
deleted file mode 100644
index d108bb415..000000000
--- a/db/migrate/20220616154502_remove_special_characters_from_inbox_name.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class RemoveSpecialCharactersFromInboxName < ActiveRecord::Migration[6.1]
-  # This PR tried to remove special characters from the inbox name
-  # It broke in the Chatwoot Cloud as there were inboxes with valid special characters
-  # We had to push a temporary fix to continue the deployment by removing the logic
-  # from this migration. Keeping this migration here to remove inconsistency.
-
-  def change; end
-end
diff --git a/db/migrate/20220622090344_add_type_to_agent_bots.rb b/db/migrate/20220622090344_add_type_to_agent_bots.rb
deleted file mode 100644
index b247d3cfa..000000000
--- a/db/migrate/20220622090344_add_type_to_agent_bots.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class AddTypeToAgentBots < ActiveRecord::Migration[6.1]
-  def up
-    change_table :agent_bots, bulk: true do |t|
-      t.column :bot_type, :integer, default: 0
-      t.column :bot_config, :jsonb, default: {}
-    end
-  end
-
-  def down
-    change_table :agent_bots, bulk: true do |t|
-      t.remove :bot_type
-      t.remove :bot_config
-    end
-  end
-end
diff --git a/db/migrate/20220623113405_add_parent_id_to_category.rb b/db/migrate/20220623113405_add_parent_id_to_category.rb
deleted file mode 100644
index 57a694bac..000000000
--- a/db/migrate/20220623113405_add_parent_id_to_category.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddParentIdToCategory < ActiveRecord::Migration[6.1]
-  def change
-    add_reference :categories, :parent_category, foreign_key: { to_table: :categories }
-  end
-end
diff --git a/db/migrate/20220623113604_create_related_categories.rb b/db/migrate/20220623113604_create_related_categories.rb
deleted file mode 100644
index c9633c61e..000000000
--- a/db/migrate/20220623113604_create_related_categories.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateRelatedCategories < ActiveRecord::Migration[6.1]
-  def change
-    create_table :related_categories do |t|
-      t.bigint :category_id
-      t.bigint :related_category_id
-      t.timestamps
-    end
-
-    add_index :related_categories, [:category_id, :related_category_id], unique: true
-    add_index :related_categories, [:related_category_id, :category_id], unique: true
-  end
-end
diff --git a/db/migrate/20220627135753_add_linked_category_id_to_categories.rb b/db/migrate/20220627135753_add_linked_category_id_to_categories.rb
deleted file mode 100644
index 662a55879..000000000
--- a/db/migrate/20220627135753_add_linked_category_id_to_categories.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddLinkedCategoryIdToCategories < ActiveRecord::Migration[6.1]
-  def change
-    add_reference :categories, :linked_category, foreign_key: { to_table: :categories }
-  end
-end
diff --git a/db/migrate/20220628124837_create_portal_members.rb b/db/migrate/20220628124837_create_portal_members.rb
deleted file mode 100644
index 2bf062b4b..000000000
--- a/db/migrate/20220628124837_create_portal_members.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreatePortalMembers < ActiveRecord::Migration[6.1]
-  def change
-    create_table :portal_members do |t|
-      t.bigint :portal_id
-      t.bigint :user_id
-      t.timestamps
-    end
-
-    add_index :portal_members, [:portal_id, :user_id], unique: true
-    add_index :portal_members, [:user_id, :portal_id], unique: true
-  end
-end
diff --git a/db/migrate/20220706085458_rename_linked_category_column_name.rb b/db/migrate/20220706085458_rename_linked_category_column_name.rb
deleted file mode 100644
index 295b70c31..000000000
--- a/db/migrate/20220706085458_rename_linked_category_column_name.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RenameLinkedCategoryColumnName < ActiveRecord::Migration[6.1]
-  def change
-    rename_column :categories, :linked_category_id, :associated_category_id
-  end
-end
diff --git a/db/migrate/20220711090528_create_macros.rb b/db/migrate/20220711090528_create_macros.rb
deleted file mode 100644
index 35c0825a7..000000000
--- a/db/migrate/20220711090528_create_macros.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class CreateMacros < ActiveRecord::Migration[6.1]
-  def change
-    create_table :macros do |t|
-      t.bigint :account_id, null: false
-      t.string :name, null: false
-      t.integer :visibility, default: 0
-      t.references :created_by, null: false, index: true, foreign_key: { to_table: :users }
-      t.references :updated_by, null: false, index: true, foreign_key: { to_table: :users }
-      t.jsonb :actions, null: false, default: {}
-      t.timestamps
-      t.index :account_id, name: 'index_macros_on_account_id'
-    end
-  end
-end
diff --git a/db/migrate/20220712145440_sync_gravatar_for_existing_avatarables.rb b/db/migrate/20220712145440_sync_gravatar_for_existing_avatarables.rb
deleted file mode 100644
index 41405fcaa..000000000
--- a/db/migrate/20220712145440_sync_gravatar_for_existing_avatarables.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class SyncGravatarForExistingAvatarables < ActiveRecord::Migration[6.1]
-  def change
-    return if GlobalConfigService.load('DISABLE_GRAVATAR', '').present?
-
-    sync_user_avatars
-    sync_contact_avatars
-  end
-
-  private
-
-  def sync_user_avatars
-    ::User.find_in_batches do |users_batch|
-      users_batch.each do |user|
-        Avatar::AvatarFromGravatarJob.perform_later(user, user.email)
-      end
-    end
-  end
-
-  def sync_contact_avatars
-    ::Contact.where.not(email: nil).find_in_batches do |contacts_batch|
-      contacts_batch.each do |contact|
-        Avatar::AvatarFromGravatarJob.perform_later(contact, contact.email)
-      end
-    end
-  end
-end
diff --git a/db/migrate/20220718123938_add_custom_attributes_to_account.rb b/db/migrate/20220718123938_add_custom_attributes_to_account.rb
deleted file mode 100644
index 39e9abcea..000000000
--- a/db/migrate/20220718123938_add_custom_attributes_to_account.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddCustomAttributesToAccount < ActiveRecord::Migration[6.1]
-  def change
-    add_column :accounts, :custom_attributes, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20220720080126_add_meta_column_to_article.rb b/db/migrate/20220720080126_add_meta_column_to_article.rb
deleted file mode 100644
index 6cb7ca23c..000000000
--- a/db/migrate/20220720080126_add_meta_column_to_article.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddMetaColumnToArticle < ActiveRecord::Migration[6.1]
-  def change
-    add_column :articles, :meta, :jsonb, default: {}
-  end
-end
diff --git a/db/migrate/20220720123615_set_default_locale_at_accounts.rb b/db/migrate/20220720123615_set_default_locale_at_accounts.rb
deleted file mode 100644
index d17837fb9..000000000
--- a/db/migrate/20220720123615_set_default_locale_at_accounts.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class SetDefaultLocaleAtAccounts < ActiveRecord::Migration[6.1]
-  def change
-    change_column_default :accounts, :locale, from: nil, to: 0
-  end
-end
diff --git a/db/migrate/20220802133722_add_status_to_accounts.rb b/db/migrate/20220802133722_add_status_to_accounts.rb
deleted file mode 100644
index b94e8ee74..000000000
--- a/db/migrate/20220802133722_add_status_to_accounts.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddStatusToAccounts < ActiveRecord::Migration[6.1]
-  def change
-    add_column :accounts, :status, :integer, default: 0
-    add_index :accounts, :status
-  end
-end
diff --git a/db/migrate/20220802193353_add_conversation_uuid_unique_index.rb b/db/migrate/20220802193353_add_conversation_uuid_unique_index.rb
deleted file mode 100644
index 79ca8e626..000000000
--- a/db/migrate/20220802193353_add_conversation_uuid_unique_index.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddConversationUuidUniqueIndex < ActiveRecord::Migration[6.1]
-  def change
-    add_index :conversations, :uuid, unique: true
-  end
-end
diff --git a/db/migrate/20220808193420_add_conversation_participants.rb b/db/migrate/20220808193420_add_conversation_participants.rb
deleted file mode 100644
index a130a5e01..000000000
--- a/db/migrate/20220808193420_add_conversation_participants.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddConversationParticipants < ActiveRecord::Migration[6.1]
-  def change
-    create_table 'conversation_participants', force: :cascade do |t|
-      t.references :account, null: false
-      t.references :user, null: false
-      t.references :conversation, null: false
-      t.datetime 'created_at', precision: 6, null: false
-      t.datetime 'updated_at', precision: 6, null: false
-    end
-  end
-end
diff --git a/db/migrate/20220809104508_revert_cascading_indexes.rb b/db/migrate/20220809104508_revert_cascading_indexes.rb
deleted file mode 100644
index 96d3309d0..000000000
--- a/db/migrate/20220809104508_revert_cascading_indexes.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-class RevertCascadingIndexes < ActiveRecord::Migration[6.1]
-  def change
-    remove_foreign_key 'account_users', 'accounts' if foreign_key_exists? 'account_users', 'accounts'
-    remove_foreign_key 'account_users', 'users' if foreign_key_exists? 'account_users', 'users'
-    remove_foreign_key 'agent_bots', 'accounts' if foreign_key_exists? 'agent_bots', 'accounts'
-    remove_foreign_key 'campaigns', 'accounts' if foreign_key_exists? 'campaigns', 'accounts'
-    remove_foreign_key 'campaigns', 'inboxes' if foreign_key_exists? 'campaigns', 'inboxes'
-    remove_foreign_key 'conversations', 'campaigns' if foreign_key_exists? 'conversations', 'campaigns'
-    remove_foreign_key 'conversations', 'contact_inboxes' if foreign_key_exists? 'conversations', 'contact_inboxes'
-    remove_foreign_key 'conversations', 'teams' if foreign_key_exists? 'conversations', 'teams'
-    remove_foreign_key 'csat_survey_responses', 'accounts' if foreign_key_exists? 'csat_survey_responses', 'accounts'
-    remove_foreign_key 'csat_survey_responses', 'contacts' if foreign_key_exists? 'csat_survey_responses', 'contacts'
-    remove_foreign_key 'csat_survey_responses', 'conversations' if foreign_key_exists? 'csat_survey_responses', 'conversations'
-    remove_foreign_key 'csat_survey_responses', 'messages' if foreign_key_exists? 'csat_survey_responses', 'messages'
-    remove_foreign_key 'csat_survey_responses', 'users', column: 'assigned_agent_id' if foreign_key_exists? 'csat_survey_responses', 'users',
-                                                                                                            column: 'assigned_agent_id'
-    remove_foreign_key 'data_imports', 'accounts' if foreign_key_exists? 'data_imports', 'accounts'
-    remove_foreign_key 'mentions', 'conversations' if foreign_key_exists? 'mentions', 'conversations'
-    remove_foreign_key 'mentions', 'users' if foreign_key_exists? 'mentions', 'users'
-    remove_foreign_key 'notes', 'accounts' if foreign_key_exists? 'notes', 'accounts'
-    remove_foreign_key 'notes', 'contacts' if foreign_key_exists? 'notes', 'contacts'
-    remove_foreign_key 'notes', 'users' if foreign_key_exists? 'notes', 'users'
-    remove_foreign_key 'team_members', 'teams' if foreign_key_exists? 'team_members', 'teams'
-    remove_foreign_key 'team_members', 'users' if foreign_key_exists? 'team_members', 'users'
-    remove_foreign_key 'teams', 'accounts' if foreign_key_exists? 'teams', 'accounts'
-    remove_foreign_key 'contact_inboxes', 'contacts' if foreign_key_exists? 'contact_inboxes', 'contacts'
-    remove_foreign_key 'contact_inboxes', 'inboxes' if foreign_key_exists? 'contact_inboxes', 'inboxes'
-
-    remove_foreign_key 'articles', 'articles', column: 'associated_article_id' if foreign_key_exists? 'articles', 'articles',
-                                                                                                      column: 'associated_article_id'
-    remove_foreign_key 'articles', 'users', column: 'author_id' if foreign_key_exists? 'articles', 'users', column: 'author_id'
-
-    remove_foreign_key 'categories', 'categories', column: 'parent_category_id' if foreign_key_exists? 'categories', 'categories',
-                                                                                                       column: 'parent_category_id'
-    remove_foreign_key 'categories', 'categories', column: 'associated_category_id' if foreign_key_exists? 'categories', 'categories',
-                                                                                                           column: 'associated_category_id'
-
-    remove_foreign_key 'dashboard_apps', 'accounts' if foreign_key_exists? 'dashboard_apps', 'accounts'
-    remove_foreign_key 'dashboard_apps', 'users' if foreign_key_exists? 'dashboard_apps', 'users'
-
-    remove_foreign_key 'macros', 'users', column: 'created_by_id' if foreign_key_exists? 'macros', 'users', column: 'created_by_id'
-    remove_foreign_key 'macros', 'users', column: 'updated_by_id' if foreign_key_exists? 'macros', 'users', column: 'updated_by_id'
-
-    Migration::RemoveStaleNotificationsJob.perform_later
-  end
-end
diff --git a/db/migrate/20220919225556_make_help_center_custom_domain_unique.rb b/db/migrate/20220919225556_make_help_center_custom_domain_unique.rb
deleted file mode 100644
index 89267855c..000000000
--- a/db/migrate/20220919225556_make_help_center_custom_domain_unique.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class MakeHelpCenterCustomDomainUnique < ActiveRecord::Migration[6.1]
-  def change
-    add_index :portals, :custom_domain, unique: true
-  end
-end
diff --git a/db/migrate/20220920014549_enable_help_center.rb b/db/migrate/20220920014549_enable_help_center.rb
deleted file mode 100644
index 8b9f72388..000000000
--- a/db/migrate/20220920014549_enable_help_center.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class EnableHelpCenter < ActiveRecord::Migration[6.1]
-  def change
-    return if ENV['DEPLOYMENT_ENV'] == 'cloud'
-
-    Account.find_in_batches do |account_batch|
-      account_batch.each do |account|
-        account.enable_features('help_center')
-        account.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20220926164441_add_slug_to_article.rb b/db/migrate/20220926164441_add_slug_to_article.rb
deleted file mode 100644
index 4eac09b86..000000000
--- a/db/migrate/20220926164441_add_slug_to_article.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class AddSlugToArticle < ActiveRecord::Migration[6.1]
-  def up
-    add_column :articles, :slug, :string
-
-    update_past_articles_with_slug
-
-    add_index :articles, :slug
-    change_column_null(:articles, :slug, false)
-  end
-
-  def down
-    remove_column(:articles, :slug)
-  end
-
-  def update_past_articles_with_slug
-    Article.all.each_with_index do |article, index|
-      slug = article.title.underscore.parameterize(separator: '-')
-      article.update!(slug: "#{slug}-#{index}")
-    end
-  end
-end
diff --git a/db/migrate/20220930025317_add_unique_index_to_slug.rb b/db/migrate/20220930025317_add_unique_index_to_slug.rb
deleted file mode 100644
index e35f6289c..000000000
--- a/db/migrate/20220930025317_add_unique_index_to_slug.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddUniqueIndexToSlug < ActiveRecord::Migration[6.1]
-  def change
-    remove_index :articles, :slug
-    add_index :articles, :slug, unique: true
-  end
-end
diff --git a/db/migrate/20221010212946_add_index_to_message_attachments.rb b/db/migrate/20221010212946_add_index_to_message_attachments.rb
deleted file mode 100644
index 1ba2be299..000000000
--- a/db/migrate/20221010212946_add_index_to_message_attachments.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddIndexToMessageAttachments < ActiveRecord::Migration[6.1]
-  def change
-    add_index :attachments, :account_id
-    add_index :attachments, :message_id
-    add_index :conversations, :contact_id
-    add_index :conversations, :inbox_id
-  end
-end
diff --git a/db/migrate/20221017201914_add_features_to_accounts.rb b/db/migrate/20221017201914_add_features_to_accounts.rb
deleted file mode 100644
index 60f47f7d3..000000000
--- a/db/migrate/20221017201914_add_features_to_accounts.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class AddFeaturesToAccounts < ActiveRecord::Migration[6.1]
-  def change
-    Account.find_in_batches do |account_batch|
-      account_batch.each do |account|
-        account.enable_features(
-          'agent_management',
-          'automations',
-          'canned_responses',
-          'custom_attributes',
-          'inbox_management',
-          'integrations',
-          'labels',
-          'team_management',
-          'voice_recorder'
-        )
-        account.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20221029202300_add_two_features_to_accounts.rb b/db/migrate/20221029202300_add_two_features_to_accounts.rb
deleted file mode 100644
index bda92e159..000000000
--- a/db/migrate/20221029202300_add_two_features_to_accounts.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class AddTwoFeaturesToAccounts < ActiveRecord::Migration[6.1]
-  def change
-    Account.find_in_batches do |account_batch|
-      account_batch.each do |account|
-        account.enable_features(
-          'campaigns',
-          'channel_website'
-        )
-        account.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20221102082737_change_macros_created_by_to_null.rb b/db/migrate/20221102082737_change_macros_created_by_to_null.rb
deleted file mode 100644
index f3f318028..000000000
--- a/db/migrate/20221102082737_change_macros_created_by_to_null.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class ChangeMacrosCreatedByToNull < ActiveRecord::Migration[6.1]
-  def change
-    change_column_null :macros, :created_by_id, true
-    change_column_null :macros, :updated_by_id, true
-
-    remove_index :macros, :created_by_id, if_exists: true
-    remove_index :macros, :updated_by_id, if_exists: true
-  end
-end
diff --git a/db/migrate/20221109065043_add_lock_conversation_to_single_thread.rb b/db/migrate/20221109065043_add_lock_conversation_to_single_thread.rb
deleted file mode 100644
index 9a0dbd450..000000000
--- a/db/migrate/20221109065043_add_lock_conversation_to_single_thread.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddLockConversationToSingleThread < ActiveRecord::Migration[6.1]
-  def change
-    add_column :inboxes, :lock_to_single_conversation, :boolean, null: false, default: false
-  end
-end
diff --git a/db/migrate/20221116000514_enable_macros_for_all_accounts.rb b/db/migrate/20221116000514_enable_macros_for_all_accounts.rb
deleted file mode 100644
index 76bc1a8b7..000000000
--- a/db/migrate/20221116000514_enable_macros_for_all_accounts.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class EnableMacrosForAllAccounts < ActiveRecord::Migration[6.1]
-  def change
-    current_config = InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').last
-    current_config.value.each { |v| v['enabled'] = true if v['name'] == 'macros' }
-    current_config.save!
-
-    ConfigLoader.new.process
-
-    Account.find_in_batches do |account_batch|
-      account_batch.each do |account|
-        account.enable_features('macros')
-        account.enable_features('channel_email')
-        account.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20221219162759_enabled_new_features.rb b/db/migrate/20221219162759_enabled_new_features.rb
deleted file mode 100644
index 6340ad668..000000000
--- a/db/migrate/20221219162759_enabled_new_features.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class EnabledNewFeatures < ActiveRecord::Migration[6.1]
-  def change
-    Account.find_in_batches do |account_batch|
-      account_batch.each do |account|
-        account.enable_features(
-          'channel_website',
-          'campaigns',
-          'reports',
-          'crm',
-          'auto_resolve_conversations'
-        )
-        account.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20221230113108_add_ms_oauth_token_to_channel.rb b/db/migrate/20221230113108_add_ms_oauth_token_to_channel.rb
deleted file mode 100644
index d1a375599..000000000
--- a/db/migrate/20221230113108_add_ms_oauth_token_to_channel.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddMsOauthTokenToChannel < ActiveRecord::Migration[6.1]
-  def change
-    change_table :channel_email, bulk: true do |t|
-      t.jsonb :provider_config, default: {}
-      t.string :provider
-    end
-  end
-end
diff --git a/db/migrate/20230118155353_add_unique_index_to_conversation_participants.rb b/db/migrate/20230118155353_add_unique_index_to_conversation_participants.rb
deleted file mode 100644
index cf47c6ea8..000000000
--- a/db/migrate/20230118155353_add_unique_index_to_conversation_participants.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddUniqueIndexToConversationParticipants < ActiveRecord::Migration[6.1]
-  def change
-    add_index :conversation_participants, [:user_id, :conversation_id], unique: true
-  end
-end
diff --git a/db/migrate/20230202132107_install_audited.rb b/db/migrate/20230202132107_install_audited.rb
deleted file mode 100644
index a59afc0b9..000000000
--- a/db/migrate/20230202132107_install_audited.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-class InstallAudited < ActiveRecord::Migration[6.1]
-  # rubocop:disable Metrics/MethodLength
-  def self.up
-    create_table :audits, :force => true do |t|
-      t.bigint :auditable_id
-      t.string :auditable_type
-      t.bigint :associated_id
-      t.string :associated_type
-      t.bigint :user_id
-      t.string :user_type
-      t.string :username
-      t.string :action
-      t.jsonb :audited_changes
-      t.integer :version, :default => 0
-      t.string :comment
-      t.string :remote_address
-      t.string :request_uuid
-      t.datetime :created_at
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    add_index :audits, [:auditable_type, :auditable_id, :version], :name => 'auditable_index'
-    add_index :audits, [:associated_type, :associated_id], :name => 'associated_index'
-    add_index :audits, [:user_id, :user_type], :name => 'user_index'
-    add_index :audits, :request_uuid
-    add_index :audits, :created_at
-  end
-
-  def self.down
-    drop_table :audits
-  end
-end
diff --git a/db/migrate/20230209033203_update_default_on_subscriptions_webhooks.rb b/db/migrate/20230209033203_update_default_on_subscriptions_webhooks.rb
deleted file mode 100644
index 18be46ebe..000000000
--- a/db/migrate/20230209033203_update_default_on_subscriptions_webhooks.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class UpdateDefaultOnSubscriptionsWebhooks < ActiveRecord::Migration[6.1]
-  def change
-    change_column_default :webhooks, :subscriptions,
-                          from: %w[conversation_status_changed conversation_updated conversation_created
-                                   message_created message_updated webwidget_triggered],
-                          to: %w[conversation_status_changed conversation_updated conversation_created
-                                 contact_created contact_updated message_created message_updated webwidget_triggered]
-  end
-end
diff --git a/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb b/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb
deleted file mode 100644
index 35dfed168..000000000
--- a/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class UpdateReportingEventsWithIncorrectFirstResponses < ActiveRecord::Migration[6.1]
-  def change
-    Rails.logger.info "Skipping this migration, it's replaced by a new one"
-  end
-end
diff --git a/db/migrate/20230224124632_add_index_for_search_operations.rb b/db/migrate/20230224124632_add_index_for_search_operations.rb
deleted file mode 100644
index 77386a50c..000000000
--- a/db/migrate/20230224124632_add_index_for_search_operations.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddIndexForSearchOperations < ActiveRecord::Migration[6.1]
-  def change
-    enable_extension('pg_trgm')
-    Migration::AddSearchIndexesJob.perform_later
-  end
-end
diff --git a/db/migrate/20230302054408_update_reporting_events_first_response_time.rb b/db/migrate/20230302054408_update_reporting_events_first_response_time.rb
deleted file mode 100644
index 99b9fbc16..000000000
--- a/db/migrate/20230302054408_update_reporting_events_first_response_time.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class UpdateReportingEventsFirstResponseTime < ActiveRecord::Migration[6.1]
-  def change
-    ::Account.find_in_batches do |account_batch|
-      Rails.logger.info "Updated reporting events till #{account_batch.first.id}\n"
-      account_batch.each do |account|
-        Migration::UpdateFirstResponseTimeInReportingEventsJob.perform_later(account)
-      end
-    end
-  end
-end
diff --git a/db/migrate/20230306100327_add_trgm_index_to_tag_name.rb b/db/migrate/20230306100327_add_trgm_index_to_tag_name.rb
deleted file mode 100644
index d5ba0c8e1..000000000
--- a/db/migrate/20230306100327_add_trgm_index_to_tag_name.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# This migration adds a trigram index to the tags table on the name column.
-# This is used to speed up the search for tags by name, this is a heavy
-# sub query when genereating reports where labels are involved.
-#
-# Trigram indexes are used to speed up LIKE queries, they are not used for
-# equality queries. This is because the index is not a btree index, it is a
-# GIN index. This means that the index is not ordered, and so cannot be used
-# for equality queries.
-#
-# Read more: https://www.postgresql.org/docs/current/pgtrgm.html
-
-class AddTrgmIndexToTagName < ActiveRecord::Migration[6.1]
-  # disabling ddl transaction is required for concurrent index creation
-  # https://thoughtbot.com/blog/how-to-create-postgres-indexes-concurrently-in
-  disable_ddl_transaction!
-
-  def change
-    add_index :tags, 'LOWER(name) gin_trgm_ops', using: :gin, name: 'tags_name_trgm_idx', algorithm: :concurrently
-    # resolves to CREATE INDEX tags_name_trgm_idx ON public.tags USING gin (lower((name)::text) gin_trgm_ops);
-  end
-end
diff --git a/db/migrate/20230313113920_add_position_to_articles.rb b/db/migrate/20230313113920_add_position_to_articles.rb
deleted file mode 100644
index d7e195923..000000000
--- a/db/migrate/20230313113920_add_position_to_articles.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddPositionToArticles < ActiveRecord::Migration[6.1]
-  def change
-    add_column :articles, :position, :integer
-  end
-end
diff --git a/db/migrate/20230315105847_add_indexes_for_common_queries.rb b/db/migrate/20230315105847_add_indexes_for_common_queries.rb
deleted file mode 100644
index b16adb71f..000000000
--- a/db/migrate/20230315105847_add_indexes_for_common_queries.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddIndexesForCommonQueries < ActiveRecord::Migration[6.1]
-  # disabling ddl transaction is required for concurrent index creation
-  # https://thoughtbot.com/blog/how-to-create-postgres-indexes-concurrently-in
-  disable_ddl_transaction!
-
-  def change
-    ActiveRecord::Migration[6.1].add_index(:inboxes, [:channel_id, :channel_type], algorithm: :concurrently)
-    ActiveRecord::Migration[6.1].add_index(:conversations, [:account_id, :inbox_id, :status, :assignee_id], name: 'conv_acid_inbid_stat_asgnid_idx',
-                                                                                                            algorithm: :concurrently)
-  end
-end
diff --git a/db/migrate/20230321073727_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20230321073727_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
deleted file mode 100644
index 93c8b85ad..000000000
--- a/db/migrate/20230321073727_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# This migration comes from active_storage (originally 20211119233751)
-class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
-  def change
-    return unless table_exists?(:active_storage_blobs)
-
-    change_column_null(:active_storage_blobs, :checksum, true)
-  end
-end
diff --git a/db/migrate/20230327081350_add_index_to_conversations_account_id_and_id.rb b/db/migrate/20230327081350_add_index_to_conversations_account_id_and_id.rb
deleted file mode 100644
index 70fe99b81..000000000
--- a/db/migrate/20230327081350_add_index_to_conversations_account_id_and_id.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddIndexToConversationsAccountIdAndId < ActiveRecord::Migration[6.1]
-  disable_ddl_transaction!
-
-  def change
-    add_index :conversations, [:account_id, :id], name: 'index_conversations_on_id_and_account_id', algorithm: :concurrently
-  end
-end
diff --git a/db/migrate/20230328131926_drop_extra_audit_integer_column.rb b/db/migrate/20230328131926_drop_extra_audit_integer_column.rb
deleted file mode 100644
index 58a7d91c4..000000000
--- a/db/migrate/20230328131926_drop_extra_audit_integer_column.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class DropExtraAuditIntegerColumn < ActiveRecord::Migration[6.1]
-  def change
-    # this column was added unintentionally for a time in a migration but not in schema.rb, so some
-    # installations will have it and some won't.
-    remove_column :audits, :integer, :integer, default: 0, if_exists: true
-  end
-end
diff --git a/db/migrate/20230404030719_remove_settings_flags_from_account.rb b/db/migrate/20230404030719_remove_settings_flags_from_account.rb
deleted file mode 100644
index fda575506..000000000
--- a/db/migrate/20230404030719_remove_settings_flags_from_account.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class RemoveSettingsFlagsFromAccount < ActiveRecord::Migration[6.1]
-  def up
-    change_table :accounts do |t|
-      t.remove :settings_flags
-    end
-  end
-
-  def down
-    change_table :accounts do |t|
-      t.integer :settings_flags, default: 0, null: false
-    end
-  end
-end
diff --git a/db/migrate/20230405104405_update_position_for_articles.rb b/db/migrate/20230405104405_update_position_for_articles.rb
deleted file mode 100644
index b10513933..000000000
--- a/db/migrate/20230405104405_update_position_for_articles.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class UpdatePositionForArticles < ActiveRecord::Migration[6.1]
-  def change
-    # Get the unique combinations of account_id and category_id
-    groups = Article.select(:account_id, :category_id).distinct
-
-    # Iterate through the groups
-    groups.each do |group|
-      # Get articles belonging to the current group
-      articles = Article.where(account_id: group.account_id, category_id: group.category_id)
-
-      # Separate articles with a position set and those without
-      articles_with_position = articles.where.not(position: nil).order(:position, :updated_at)
-      articles_without_position = articles.where(position: nil).order(:updated_at)
-
-      # Set the position for articles with a position set, in multiples of 10
-      # why multiples of 10? because we want to leave room for articles which can be added in between in case we are editing the order from the DB
-      position_counter = 0
-      articles_with_position.each do |article|
-        position_counter += 10
-        article.update(position: position_counter)
-      end
-
-      # Set the position for articles without a position, starting from where the last position ended
-      articles_without_position.each do |article|
-        position_counter += 10
-        article.update(position: position_counter)
-      end
-    end
-  end
-end
diff --git a/db/migrate/20230407191457_migrate_env_var_to_channel_feature.rb b/db/migrate/20230407191457_migrate_env_var_to_channel_feature.rb
deleted file mode 100644
index 3bb9800a3..000000000
--- a/db/migrate/20230407191457_migrate_env_var_to_channel_feature.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class MigrateEnvVarToChannelFeature < ActiveRecord::Migration[6.1]
-  def change
-    return unless ActiveModel::Type::Boolean.new.cast(ENV.fetch('USE_INBOX_AVATAR_FOR_BOT', false))
-
-    Channel::WebWidget.find_in_batches do |widget_batch|
-      widget_batch.each do |widget|
-        widget.use_inbox_avatar_for_bot = true
-        widget.save!
-      end
-    end
-  end
-end
diff --git a/db/migrate/20230413085302_add_portal_id_to_inbox.rb b/db/migrate/20230413085302_add_portal_id_to_inbox.rb
deleted file mode 100644
index 05f71078e..000000000
--- a/db/migrate/20230413085302_add_portal_id_to_inbox.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddPortalIdToInbox < ActiveRecord::Migration[6.1]
-  def change
-    add_reference :inboxes, :portal, foreign_key: true
-  end
-end
diff --git a/db/migrate/20230418100944_add_priority_to_conversation.rb b/db/migrate/20230418100944_add_priority_to_conversation.rb
deleted file mode 100644
index 5f1ec286c..000000000
--- a/db/migrate/20230418100944_add_priority_to_conversation.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddPriorityToConversation < ActiveRecord::Migration[6.1]
-  def change
-    add_column :conversations, :priority, :integer
-    add_index :conversations, :priority
-    add_index :conversations, [:status, :priority]
-  end
-end
diff --git a/db/migrate/20230426130150_add_index_for_widget_contact_look_up.rb b/db/migrate/20230426130150_add_index_for_widget_contact_look_up.rb
deleted file mode 100644
index f8f2b9f36..000000000
--- a/db/migrate/20230426130150_add_index_for_widget_contact_look_up.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddIndexForWidgetContactLookUp < ActiveRecord::Migration[6.1]
-  disable_ddl_transaction!
-
-  def change
-    add_index :contacts, 'LOWER(email), account_id', name: 'index_contacts_on_lower_email_account_id', algorithm: :concurrently
-  end
-end
diff --git a/db/migrate/20230426130150_init_schema.rb b/db/migrate/20230426130150_init_schema.rb
new file mode 100644
index 000000000..369d7dea3
--- /dev/null
+++ b/db/migrate/20230426130150_init_schema.rb
@@ -0,0 +1,878 @@
+class InitSchema < ActiveRecord::Migration[6.1]
+  def up
+    # These are extensions that must be enabled in order to support this database
+    enable_extension "pg_stat_statements"
+    enable_extension "pg_trgm"
+    enable_extension "pgcrypto"
+    enable_extension "plpgsql"
+    create_table "access_tokens" do |t|
+      t.string "owner_type"
+      t.bigint "owner_id"
+      t.string "token"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["owner_type", "owner_id"], name: "index_access_tokens_on_owner_type_and_owner_id"
+      t.index ["token"], name: "index_access_tokens_on_token", unique: true
+    end
+    create_table "account_users" do |t|
+      t.bigint "account_id"
+      t.bigint "user_id"
+      t.integer "role", default: 0
+      t.bigint "inviter_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.datetime "active_at", precision: nil
+      t.integer "availability", default: 0, null: false
+      t.boolean "auto_offline", default: true, null: false
+      t.index ["account_id", "user_id"], name: "uniq_user_id_per_account_id", unique: true
+      t.index ["account_id"], name: "index_account_users_on_account_id"
+      t.index ["user_id"], name: "index_account_users_on_user_id"
+    end
+    create_table "accounts", id: :serial do |t|
+      t.string "name", null: false
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.integer "locale", default: 0
+      t.string "domain", limit: 100
+      t.string "support_email", limit: 100
+      t.integer "feature_flags", default: 0, null: false
+      t.integer "auto_resolve_duration"
+      t.jsonb "limits", default: {}
+      t.jsonb "custom_attributes", default: {}
+      t.integer "status", default: 0
+      t.index ["status"], name: "index_accounts_on_status"
+    end
+    create_table "action_mailbox_inbound_emails" do |t|
+      t.integer "status", default: 0, null: false
+      t.string "message_id", null: false
+      t.string "message_checksum", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["message_id", "message_checksum"], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
+    end
+    create_table "active_storage_attachments" do |t|
+      t.string "name", null: false
+      t.string "record_type", null: false
+      t.bigint "record_id", null: false
+      t.bigint "blob_id", null: false
+      t.datetime "created_at", precision: nil, null: false
+      t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+      t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
+    end
+    create_table "active_storage_blobs" do |t|
+      t.string "key", null: false
+      t.string "filename", null: false
+      t.string "content_type"
+      t.text "metadata"
+      t.bigint "byte_size", null: false
+      t.string "checksum"
+      t.datetime "created_at", precision: nil, null: false
+      t.string "service_name", null: false
+      t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
+    end
+    create_table "active_storage_variant_records" do |t|
+      t.bigint "blob_id", null: false
+      t.string "variation_digest", null: false
+      t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
+    end
+    create_table "agent_bot_inboxes" do |t|
+      t.integer "inbox_id"
+      t.integer "agent_bot_id"
+      t.integer "status", default: 0
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.integer "account_id"
+    end
+    create_table "agent_bots" do |t|
+      t.string "name"
+      t.string "description"
+      t.string "outgoing_url"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.bigint "account_id"
+      t.integer "bot_type", default: 0
+      t.jsonb "bot_config", default: {}
+      t.index ["account_id"], name: "index_agent_bots_on_account_id"
+    end
+    create_table "articles" do |t|
+      t.integer "account_id", null: false
+      t.integer "portal_id", null: false
+      t.integer "category_id"
+      t.integer "folder_id"
+      t.string "title"
+      t.text "description"
+      t.text "content"
+      t.integer "status"
+      t.integer "views"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.bigint "author_id"
+      t.bigint "associated_article_id"
+      t.jsonb "meta", default: {}
+      t.string "slug", null: false
+      t.integer "position"
+      t.index ["associated_article_id"], name: "index_articles_on_associated_article_id"
+      t.index ["author_id"], name: "index_articles_on_author_id"
+      t.index ["slug"], name: "index_articles_on_slug", unique: true
+    end
+    create_table "attachments", id: :serial do |t|
+      t.integer "file_type", default: 0
+      t.string "external_url"
+      t.float "coordinates_lat", default: 0.0
+      t.float "coordinates_long", default: 0.0
+      t.integer "message_id", null: false
+      t.integer "account_id", null: false
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.string "fallback_title"
+      t.string "extension"
+      t.index ["account_id"], name: "index_attachments_on_account_id"
+      t.index ["message_id"], name: "index_attachments_on_message_id"
+    end
+    create_table "audits" do |t|
+      t.bigint "auditable_id"
+      t.string "auditable_type"
+      t.bigint "associated_id"
+      t.string "associated_type"
+      t.bigint "user_id"
+      t.string "user_type"
+      t.string "username"
+      t.string "action"
+      t.jsonb "audited_changes"
+      t.integer "version", default: 0
+      t.string "comment"
+      t.string "remote_address"
+      t.string "request_uuid"
+      t.datetime "created_at", precision: nil
+      t.index ["associated_type", "associated_id"], name: "associated_index"
+      t.index ["auditable_type", "auditable_id", "version"], name: "auditable_index"
+      t.index ["created_at"], name: "index_audits_on_created_at"
+      t.index ["request_uuid"], name: "index_audits_on_request_uuid"
+      t.index ["user_id", "user_type"], name: "user_index"
+    end
+    create_table "automation_rules" do |t|
+      t.bigint "account_id", null: false
+      t.string "name", null: false
+      t.text "description"
+      t.string "event_name", null: false
+      t.jsonb "conditions", default: "{}", null: false
+      t.jsonb "actions", default: "{}", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.boolean "active", default: true, null: false
+      t.index ["account_id"], name: "index_automation_rules_on_account_id"
+    end
+    create_table "campaigns" do |t|
+      t.integer "display_id", null: false
+      t.string "title", null: false
+      t.text "description"
+      t.text "message", null: false
+      t.integer "sender_id"
+      t.boolean "enabled", default: true
+      t.bigint "account_id", null: false
+      t.bigint "inbox_id", null: false
+      t.jsonb "trigger_rules", default: {}
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.integer "campaign_type", default: 0, null: false
+      t.integer "campaign_status", default: 0, null: false
+      t.jsonb "audience", default: []
+      t.datetime "scheduled_at", precision: nil
+      t.boolean "trigger_only_during_business_hours", default: false
+      t.index ["account_id"], name: "index_campaigns_on_account_id"
+      t.index ["campaign_status"], name: "index_campaigns_on_campaign_status"
+      t.index ["campaign_type"], name: "index_campaigns_on_campaign_type"
+      t.index ["inbox_id"], name: "index_campaigns_on_inbox_id"
+      t.index ["scheduled_at"], name: "index_campaigns_on_scheduled_at"
+    end
+    create_table "canned_responses", id: :serial do |t|
+      t.integer "account_id", null: false
+      t.string "short_code"
+      t.text "content"
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+    end
+    create_table "categories" do |t|
+      t.integer "account_id", null: false
+      t.integer "portal_id", null: false
+      t.string "name"
+      t.text "description"
+      t.integer "position"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.string "locale", default: "en"
+      t.string "slug", null: false
+      t.bigint "parent_category_id"
+      t.bigint "associated_category_id"
+      t.index ["associated_category_id"], name: "index_categories_on_associated_category_id"
+      t.index ["locale", "account_id"], name: "index_categories_on_locale_and_account_id"
+      t.index ["locale"], name: "index_categories_on_locale"
+      t.index ["parent_category_id"], name: "index_categories_on_parent_category_id"
+      t.index ["slug", "locale", "portal_id"], name: "index_categories_on_slug_and_locale_and_portal_id", unique: true
+    end
+    create_table "channel_api" do |t|
+      t.integer "account_id", null: false
+      t.string "webhook_url"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.string "identifier"
+      t.string "hmac_token"
+      t.boolean "hmac_mandatory", default: false
+      t.jsonb "additional_attributes", default: {}
+      t.index ["hmac_token"], name: "index_channel_api_on_hmac_token", unique: true
+      t.index ["identifier"], name: "index_channel_api_on_identifier", unique: true
+    end
+    create_table "channel_email" do |t|
+      t.integer "account_id", null: false
+      t.string "email", null: false
+      t.string "forward_to_email", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.boolean "imap_enabled", default: false
+      t.string "imap_address", default: ""
+      t.integer "imap_port", default: 0
+      t.string "imap_login", default: ""
+      t.string "imap_password", default: ""
+      t.boolean "imap_enable_ssl", default: true
+      t.datetime "imap_inbox_synced_at", precision: nil
+      t.boolean "smtp_enabled", default: false
+      t.string "smtp_address", default: ""
+      t.integer "smtp_port", default: 0
+      t.string "smtp_login", default: ""
+      t.string "smtp_password", default: ""
+      t.string "smtp_domain", default: ""
+      t.boolean "smtp_enable_starttls_auto", default: true
+      t.string "smtp_authentication", default: "login"
+      t.string "smtp_openssl_verify_mode", default: "none"
+      t.boolean "smtp_enable_ssl_tls", default: false
+      t.jsonb "provider_config", default: {}
+      t.string "provider"
+      t.index ["email"], name: "index_channel_email_on_email", unique: true
+      t.index ["forward_to_email"], name: "index_channel_email_on_forward_to_email", unique: true
+    end
+    create_table "channel_facebook_pages", id: :serial do |t|
+      t.string "page_id", null: false
+      t.string "user_access_token", null: false
+      t.string "page_access_token", null: false
+      t.integer "account_id", null: false
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.string "instagram_id"
+      t.index ["page_id", "account_id"], name: "index_channel_facebook_pages_on_page_id_and_account_id", unique: true
+      t.index ["page_id"], name: "index_channel_facebook_pages_on_page_id"
+    end
+    create_table "channel_line" do |t|
+      t.integer "account_id", null: false
+      t.string "line_channel_id", null: false
+      t.string "line_channel_secret", null: false
+      t.string "line_channel_token", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["line_channel_id"], name: "index_channel_line_on_line_channel_id", unique: true
+    end
+    create_table "channel_sms" do |t|
+      t.integer "account_id", null: false
+      t.string "phone_number", null: false
+      t.string "provider", default: "default"
+      t.jsonb "provider_config", default: {}
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["phone_number"], name: "index_channel_sms_on_phone_number", unique: true
+    end
+    create_table "channel_telegram" do |t|
+      t.string "bot_name"
+      t.integer "account_id", null: false
+      t.string "bot_token", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["bot_token"], name: "index_channel_telegram_on_bot_token", unique: true
+    end
+    create_table "channel_twilio_sms" do |t|
+      t.string "phone_number"
+      t.string "auth_token", null: false
+      t.string "account_sid", null: false
+      t.integer "account_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.integer "medium", default: 0
+      t.string "messaging_service_sid"
+      t.index ["account_sid", "phone_number"], name: "index_channel_twilio_sms_on_account_sid_and_phone_number", unique: true
+      t.index ["messaging_service_sid"], name: "index_channel_twilio_sms_on_messaging_service_sid", unique: true
+      t.index ["phone_number"], name: "index_channel_twilio_sms_on_phone_number", unique: true
+    end
+    create_table "channel_twitter_profiles" do |t|
+      t.string "profile_id", null: false
+      t.string "twitter_access_token", null: false
+      t.string "twitter_access_token_secret", null: false
+      t.integer "account_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.boolean "tweets_enabled", default: true
+      t.index ["account_id", "profile_id"], name: "index_channel_twitter_profiles_on_account_id_and_profile_id", unique: true
+    end
+    create_table "channel_web_widgets", id: :serial do |t|
+      t.string "website_url"
+      t.integer "account_id"
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.string "website_token"
+      t.string "widget_color", default: "#1f93ff"
+      t.string "welcome_title"
+      t.string "welcome_tagline"
+      t.integer "feature_flags", default: 7, null: false
+      t.integer "reply_time", default: 0
+      t.string "hmac_token"
+      t.boolean "pre_chat_form_enabled", default: false
+      t.jsonb "pre_chat_form_options", default: {}
+      t.boolean "hmac_mandatory", default: false
+      t.boolean "continuity_via_email", default: true, null: false
+      t.index ["hmac_token"], name: "index_channel_web_widgets_on_hmac_token", unique: true
+      t.index ["website_token"], name: "index_channel_web_widgets_on_website_token", unique: true
+    end
+    create_table "channel_whatsapp" do |t|
+      t.integer "account_id", null: false
+      t.string "phone_number", null: false
+      t.string "provider", default: "default"
+      t.jsonb "provider_config", default: {}
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.jsonb "message_templates", default: {}
+      t.datetime "message_templates_last_updated", precision: nil
+      t.index ["phone_number"], name: "index_channel_whatsapp_on_phone_number", unique: true
+    end
+    create_table "contact_inboxes" do |t|
+      t.bigint "contact_id"
+      t.bigint "inbox_id"
+      t.string "source_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.boolean "hmac_verified", default: false
+      t.string "pubsub_token"
+      t.index ["contact_id"], name: "index_contact_inboxes_on_contact_id"
+      t.index ["inbox_id", "source_id"], name: "index_contact_inboxes_on_inbox_id_and_source_id", unique: true
+      t.index ["inbox_id"], name: "index_contact_inboxes_on_inbox_id"
+      t.index ["pubsub_token"], name: "index_contact_inboxes_on_pubsub_token", unique: true
+      t.index ["source_id"], name: "index_contact_inboxes_on_source_id"
+    end
+    create_table "contacts", id: :serial do |t|
+      t.string "name"
+      t.string "email"
+      t.string "phone_number"
+      t.integer "account_id", null: false
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.jsonb "additional_attributes", default: {}
+      t.string "identifier"
+      t.jsonb "custom_attributes", default: {}
+      t.datetime "last_activity_at", precision: nil
+      t.index "lower((email)::text), account_id", name: "index_contacts_on_lower_email_account_id"
+      t.index ["account_id"], name: "index_contacts_on_account_id"
+      t.index ["name", "email", "phone_number", "identifier"], using: 'gin', opclass: "gin_trgm_ops", name: "index_contacts_on_name_email_phone_number_identifier"
+      t.index ["email", "account_id"], name: "uniq_email_per_account_contact", unique: true
+      t.index ["identifier", "account_id"], name: "uniq_identifier_per_account_contact", unique: true
+      t.index ["phone_number", "account_id"], name: "index_contacts_on_phone_number_and_account_id"
+    end
+    create_table "conversation_participants" do |t|
+      t.bigint "account_id", null: false
+      t.bigint "user_id", null: false
+      t.bigint "conversation_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_conversation_participants_on_account_id"
+      t.index ["conversation_id"], name: "index_conversation_participants_on_conversation_id"
+      t.index ["user_id", "conversation_id"], name: "index_conversation_participants_on_user_id_and_conversation_id", unique: true
+      t.index ["user_id"], name: "index_conversation_participants_on_user_id"
+    end
+    create_table "conversations", id: :serial do |t|
+      t.integer "account_id", null: false
+      t.integer "inbox_id", null: false
+      t.integer "status", default: 0, null: false
+      t.integer "assignee_id"
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.bigint "contact_id"
+      t.integer "display_id", null: false
+      t.datetime "contact_last_seen_at", precision: nil
+      t.datetime "agent_last_seen_at", precision: nil
+      t.jsonb "additional_attributes", default: {}
+      t.bigint "contact_inbox_id"
+      t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false
+      t.string "identifier"
+      t.datetime "last_activity_at", precision: nil, default: -> { "CURRENT_TIMESTAMP" }, null: false
+      t.bigint "team_id"
+      t.bigint "campaign_id"
+      t.datetime "snoozed_until", precision: nil
+      t.jsonb "custom_attributes", default: {}
+      t.datetime "assignee_last_seen_at", precision: nil
+      t.datetime "first_reply_created_at", precision: nil
+      t.integer "priority"
+      t.index ["account_id", "display_id"], name: "index_conversations_on_account_id_and_display_id", unique: true
+      t.index ["account_id", "id"], name: "index_conversations_on_id_and_account_id"
+      t.index ["account_id", "inbox_id", "status", "assignee_id"], name: "conv_acid_inbid_stat_asgnid_idx"
+      t.index ["account_id"], name: "index_conversations_on_account_id"
+      t.index ["assignee_id", "account_id"], name: "index_conversations_on_assignee_id_and_account_id"
+      t.index ["campaign_id"], name: "index_conversations_on_campaign_id"
+      t.index ["contact_id"], name: "index_conversations_on_contact_id"
+      t.index ["contact_inbox_id"], name: "index_conversations_on_contact_inbox_id"
+      t.index ["first_reply_created_at"], name: "index_conversations_on_first_reply_created_at"
+      t.index ["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"
+      t.index ["team_id"], name: "index_conversations_on_team_id"
+      t.index ["uuid"], name: "index_conversations_on_uuid", unique: true
+    end
+    create_table "csat_survey_responses" do |t|
+      t.bigint "account_id", null: false
+      t.bigint "conversation_id", null: false
+      t.bigint "message_id", null: false
+      t.integer "rating", null: false
+      t.text "feedback_message"
+      t.bigint "contact_id", null: false
+      t.bigint "assigned_agent_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_csat_survey_responses_on_account_id"
+      t.index ["assigned_agent_id"], name: "index_csat_survey_responses_on_assigned_agent_id"
+      t.index ["contact_id"], name: "index_csat_survey_responses_on_contact_id"
+      t.index ["conversation_id"], name: "index_csat_survey_responses_on_conversation_id"
+      t.index ["message_id"], name: "index_csat_survey_responses_on_message_id", unique: true
+    end
+    create_table "custom_attribute_definitions" do |t|
+      t.string "attribute_display_name"
+      t.string "attribute_key"
+      t.integer "attribute_display_type", default: 0
+      t.integer "default_value"
+      t.integer "attribute_model", default: 0
+      t.bigint "account_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.text "attribute_description"
+      t.jsonb "attribute_values", default: []
+      t.index ["account_id"], name: "index_custom_attribute_definitions_on_account_id"
+      t.index ["attribute_key", "attribute_model", "account_id"], unique: true, name: 'attribute_key_model_index'
+    end
+    create_table "custom_filters" do |t|
+      t.string "name", null: false
+      t.integer "filter_type", default: 0, null: false
+      t.jsonb "query", default: "{}", null: false
+      t.bigint "account_id", null: false
+      t.bigint "user_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_custom_filters_on_account_id"
+      t.index ["user_id"], name: "index_custom_filters_on_user_id"
+    end
+    create_table "dashboard_apps" do |t|
+      t.string "title", null: false
+      t.jsonb "content", default: []
+      t.bigint "account_id", null: false
+      t.bigint "user_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_dashboard_apps_on_account_id"
+      t.index ["user_id"], name: "index_dashboard_apps_on_user_id"
+    end
+    create_table "data_imports" do |t|
+      t.bigint "account_id", null: false
+      t.string "data_type", null: false
+      t.integer "status", default: 0, null: false
+      t.text "processing_errors"
+      t.integer "total_records"
+      t.integer "processed_records"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_data_imports_on_account_id"
+    end
+    create_table "email_templates" do |t|
+      t.string "name", null: false
+      t.text "body", null: false
+      t.integer "account_id"
+      t.integer "template_type", default: 1
+      t.integer "locale", default: 0, null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["name", "account_id"], name: "index_email_templates_on_name_and_account_id", unique: true
+    end
+    create_table "folders" do |t|
+      t.integer "account_id", null: false
+      t.integer "category_id", null: false
+      t.string "name"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+    create_table "inbox_members", id: :serial do |t|
+      t.integer "user_id", null: false
+      t.integer "inbox_id", null: false
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.index ["inbox_id", "user_id"], name: "index_inbox_members_on_inbox_id_and_user_id", unique: true
+      t.index ["inbox_id"], name: "index_inbox_members_on_inbox_id"
+    end
+    create_table "inboxes", id: :serial do |t|
+      t.integer "channel_id", null: false
+      t.integer "account_id", null: false
+      t.string "name", null: false
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.string "channel_type"
+      t.boolean "enable_auto_assignment", default: true
+      t.boolean "greeting_enabled", default: false
+      t.string "greeting_message"
+      t.string "email_address"
+      t.boolean "working_hours_enabled", default: false
+      t.string "out_of_office_message"
+      t.string "timezone", default: "UTC"
+      t.boolean "enable_email_collect", default: true
+      t.boolean "csat_survey_enabled", default: false
+      t.boolean "allow_messages_after_resolved", default: true
+      t.jsonb "auto_assignment_config", default: {}
+      t.boolean "lock_to_single_conversation", default: false, null: false
+      t.bigint "portal_id"
+      t.index ["account_id"], name: "index_inboxes_on_account_id"
+      t.index ["channel_id", "channel_type"], name: "index_inboxes_on_channel_id_and_channel_type"
+      t.index ["portal_id"], name: "index_inboxes_on_portal_id"
+    end
+    create_table "installation_configs" do |t|
+      t.string "name", null: false
+      t.jsonb "serialized_value", default: {}, null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.boolean "locked", default: true, null: false
+      t.index ["name", "created_at"], name: "index_installation_configs_on_name_and_created_at", unique: true
+      t.index ["name"], name: "index_installation_configs_on_name", unique: true
+    end
+    create_table "integrations_hooks" do |t|
+      t.integer "status", default: 0
+      t.integer "inbox_id"
+      t.integer "account_id"
+      t.string "app_id"
+      t.integer "hook_type", default: 0
+      t.string "reference_id"
+      t.string "access_token"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.jsonb "settings", default: {}
+    end
+    create_table "labels" do |t|
+      t.string "title"
+      t.text "description"
+      t.string "color", default: "#1f93ff", null: false
+      t.boolean "show_on_sidebar"
+      t.bigint "account_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_labels_on_account_id"
+      t.index ["title", "account_id"], name: "index_labels_on_title_and_account_id", unique: true
+    end
+    create_table "macros" do |t|
+      t.bigint "account_id", null: false
+      t.string "name", null: false
+      t.integer "visibility", default: 0
+      t.bigint "created_by_id"
+      t.bigint "updated_by_id"
+      t.jsonb "actions", default: {}, null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_macros_on_account_id"
+    end
+    create_table "mentions" do |t|
+      t.bigint "user_id", null: false
+      t.bigint "conversation_id", null: false
+      t.bigint "account_id", null: false
+      t.datetime "mentioned_at", precision: nil, null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_mentions_on_account_id"
+      t.index ["conversation_id"], name: "index_mentions_on_conversation_id"
+      t.index ["user_id", "conversation_id"], name: "index_mentions_on_user_id_and_conversation_id", unique: true
+      t.index ["user_id"], name: "index_mentions_on_user_id"
+    end
+    create_table "messages", id: :serial do |t|
+      t.text "content"
+      t.integer "account_id", null: false
+      t.integer "inbox_id", null: false
+      t.integer "conversation_id", null: false
+      t.integer "message_type", null: false
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.boolean "private", default: false
+      t.integer "status", default: 0
+      t.string "source_id"
+      t.integer "content_type", default: 0, null: false
+      t.json "content_attributes", default: {}
+      t.string "sender_type"
+      t.bigint "sender_id"
+      t.jsonb "external_source_ids", default: {}
+      t.jsonb "additional_attributes", default: {}
+      t.index "((additional_attributes -> 'campaign_id'::text))", name: "index_messages_on_additional_attributes_campaign_id", using: :gin
+      t.index ["account_id"], name: "index_messages_on_account_id"
+      t.index ["account_id", "inbox_id"]
+      t.index ["conversation_id"], name: "index_messages_on_conversation_id"
+      t.index "content", using: 'gin', opclass: "gin_trgm_ops"
+      t.index ["inbox_id"], name: "index_messages_on_inbox_id"
+      t.index ["sender_type", "sender_id"], name: "index_messages_on_sender_type_and_sender_id"
+      t.index ["source_id"], name: "index_messages_on_source_id"
+    end
+    create_table "notes" do |t|
+      t.text "content", null: false
+      t.bigint "account_id", null: false
+      t.bigint "contact_id", null: false
+      t.bigint "user_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_notes_on_account_id"
+      t.index ["contact_id"], name: "index_notes_on_contact_id"
+      t.index ["user_id"], name: "index_notes_on_user_id"
+    end
+    create_table "notification_settings" do |t|
+      t.integer "account_id"
+      t.integer "user_id"
+      t.integer "email_flags", default: 0, null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.integer "push_flags", default: 0, null: false
+      t.index ["account_id", "user_id"], name: "by_account_user", unique: true
+    end
+    create_table "notification_subscriptions" do |t|
+      t.bigint "user_id", null: false
+      t.integer "subscription_type", null: false
+      t.jsonb "subscription_attributes", default: {}, null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.string "identifier"
+      t.index ["identifier"], name: "index_notification_subscriptions_on_identifier", unique: true
+      t.index ["user_id"], name: "index_notification_subscriptions_on_user_id"
+    end
+    create_table "notifications" do |t|
+      t.bigint "account_id", null: false
+      t.bigint "user_id", null: false
+      t.integer "notification_type", null: false
+      t.string "primary_actor_type", null: false
+      t.bigint "primary_actor_id", null: false
+      t.string "secondary_actor_type"
+      t.bigint "secondary_actor_id"
+      t.datetime "read_at", precision: nil
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_notifications_on_account_id"
+      t.index ["primary_actor_type", "primary_actor_id"], name: "uniq_primary_actor_per_account_notifications"
+      t.index ["secondary_actor_type", "secondary_actor_id"], name: "uniq_secondary_actor_per_account_notifications"
+      t.index ["user_id"], name: "index_notifications_on_user_id"
+    end
+    create_table "platform_app_permissibles" do |t|
+      t.bigint "platform_app_id", null: false
+      t.string "permissible_type", null: false
+      t.bigint "permissible_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["permissible_type", "permissible_id"], name: "index_platform_app_permissibles_on_permissibles"
+      t.index ["platform_app_id", "permissible_id", "permissible_type"], name: "unique_permissibles_index", unique: true
+      t.index ["platform_app_id"], name: "index_platform_app_permissibles_on_platform_app_id"
+    end
+    create_table "platform_apps" do |t|
+      t.string "name", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+    create_table "portal_members" do |t|
+      t.bigint "portal_id"
+      t.bigint "user_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["portal_id", "user_id"], name: "index_portal_members_on_portal_id_and_user_id", unique: true
+      t.index ["user_id", "portal_id"], name: "index_portal_members_on_user_id_and_portal_id", unique: true
+    end
+    create_table "portals" do |t|
+      t.integer "account_id", null: false
+      t.string "name", null: false
+      t.string "slug", null: false
+      t.string "custom_domain"
+      t.string "color"
+      t.string "homepage_link"
+      t.string "page_title"
+      t.text "header_text"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.jsonb "config", default: {"allowed_locales"=>["en"]}
+      t.boolean "archived", default: false
+      t.index ["custom_domain"], name: "index_portals_on_custom_domain", unique: true
+      t.index ["slug"], name: "index_portals_on_slug", unique: true
+    end
+    create_table "portals_members", id: false do |t|
+      t.bigint "portal_id", null: false
+      t.bigint "user_id", null: false
+      t.index ["portal_id", "user_id"], name: "index_portals_members_on_portal_id_and_user_id", unique: true
+      t.index ["portal_id"], name: "index_portals_members_on_portal_id"
+      t.index ["user_id"], name: "index_portals_members_on_user_id"
+    end
+    create_table "related_categories" do |t|
+      t.bigint "category_id"
+      t.bigint "related_category_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["category_id", "related_category_id"], name: "index_related_categories_on_category_id_and_related_category_id", unique: true
+      t.index ["related_category_id", "category_id"], name: "index_related_categories_on_related_category_id_and_category_id", unique: true
+    end
+    create_table "reporting_events" do |t|
+      t.string "name"
+      t.float "value"
+      t.integer "account_id"
+      t.integer "inbox_id"
+      t.integer "user_id"
+      t.integer "conversation_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.float "value_in_business_hours"
+      t.datetime "event_start_time", precision: nil
+      t.datetime "event_end_time", precision: nil
+      t.index ["account_id"], name: "index_reporting_events_on_account_id"
+      t.index ["conversation_id"], name: "index_reporting_events_on_conversation_id"
+      t.index ["created_at"], name: "index_reporting_events_on_created_at"
+      t.index ["inbox_id"], name: "index_reporting_events_on_inbox_id"
+      t.index ["name"], name: "index_reporting_events_on_name"
+      t.index ["user_id"], name: "index_reporting_events_on_user_id"
+    end
+    create_table "taggings", id: :serial do |t|
+      t.integer "tag_id"
+      t.string "taggable_type"
+      t.integer "taggable_id"
+      t.string "tagger_type"
+      t.integer "tagger_id"
+      t.string "context", limit: 128
+      t.datetime "created_at", precision: nil
+      t.index ["context"], name: "index_taggings_on_context"
+      t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
+      t.index ["tag_id"], name: "index_taggings_on_tag_id"
+      t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
+      t.index ["taggable_id", "taggable_type", "tagger_id", "context"], name: "taggings_idy"
+      t.index ["taggable_id"], name: "index_taggings_on_taggable_id"
+      t.index ["taggable_type"], name: "index_taggings_on_taggable_type"
+      t.index ["tagger_id", "tagger_type"], name: "index_taggings_on_tagger_id_and_tagger_type"
+      t.index ["tagger_id"], name: "index_taggings_on_tagger_id"
+    end
+    create_table "tags", id: :serial do |t|
+      t.string "name"
+      t.integer "taggings_count", default: 0
+      t.index "lower((name)::text) gin_trgm_ops", name: "tags_name_trgm_idx", using: :gin
+      t.index ["name"], name: "index_tags_on_name", unique: true
+    end
+    create_table "team_members" do |t|
+      t.bigint "team_id", null: false
+      t.bigint "user_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["team_id", "user_id"], name: "index_team_members_on_team_id_and_user_id", unique: true
+      t.index ["team_id"], name: "index_team_members_on_team_id"
+      t.index ["user_id"], name: "index_team_members_on_user_id"
+    end
+    create_table "teams" do |t|
+      t.string "name", null: false
+      t.text "description"
+      t.boolean "allow_auto_assign", default: true
+      t.bigint "account_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["account_id"], name: "index_teams_on_account_id"
+      t.index ["name", "account_id"], name: "index_teams_on_name_and_account_id", unique: true
+    end
+    create_table "telegram_bots", id: :serial do |t|
+      t.string "name"
+      t.string "auth_key"
+      t.integer "account_id"
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+    end
+    create_table "users", id: :serial do |t|
+      t.string "provider", default: "email", null: false
+      t.string "uid", default: "", null: false
+      t.string "encrypted_password", default: "", null: false
+      t.string "reset_password_token"
+      t.datetime "reset_password_sent_at", precision: nil
+      t.datetime "remember_created_at", precision: nil
+      t.integer "sign_in_count", default: 0, null: false
+      t.datetime "current_sign_in_at", precision: nil
+      t.datetime "last_sign_in_at", precision: nil
+      t.string "current_sign_in_ip"
+      t.string "last_sign_in_ip"
+      t.string "confirmation_token"
+      t.datetime "confirmed_at", precision: nil
+      t.datetime "confirmation_sent_at", precision: nil
+      t.string "unconfirmed_email"
+      t.string "name", null: false
+      t.string "display_name"
+      t.string "email"
+      t.json "tokens"
+      t.datetime "created_at", precision: nil, null: false
+      t.datetime "updated_at", precision: nil, null: false
+      t.string "pubsub_token"
+      t.integer "availability", default: 0
+      t.jsonb "ui_settings", default: {}
+      t.jsonb "custom_attributes", default: {}
+      t.string "type"
+      t.text "message_signature"
+      t.index ["email"], name: "index_users_on_email"
+      t.index ["pubsub_token"], name: "index_users_on_pubsub_token", unique: true
+      t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+      t.index ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true
+    end
+    create_table "webhooks" do |t|
+      t.integer "account_id"
+      t.integer "inbox_id"
+      t.string "url"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.integer "webhook_type", default: 0
+      t.jsonb "subscriptions", default: ["conversation_status_changed", "conversation_updated", "conversation_created", "contact_created", "contact_updated", "message_created", "message_updated", "webwidget_triggered"]
+      t.index ["account_id", "url"], name: "index_webhooks_on_account_id_and_url", unique: true
+    end
+    create_table "working_hours" do |t|
+      t.bigint "inbox_id"
+      t.bigint "account_id"
+      t.integer "day_of_week", null: false
+      t.boolean "closed_all_day", default: false
+      t.integer "open_hour"
+      t.integer "open_minutes"
+      t.integer "close_hour"
+      t.integer "close_minutes"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.boolean "open_all_day", default: false
+      t.index ["account_id"], name: "index_working_hours_on_account_id"
+      t.index ["inbox_id"], name: "index_working_hours_on_inbox_id"
+    end
+    add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+    add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
+    add_foreign_key "inboxes", "portals"
+    create_trigger("accounts_after_insert_row_tr", :generated => true, :compatibility => 1).
+        on("accounts").
+        after(:insert).
+        for_each(:row) do
+      "execute format('create sequence IF NOT EXISTS conv_dpid_seq_%s', NEW.id);"
+    end
+    create_trigger("conversations_before_insert_row_tr", :generated => true, :compatibility => 1).
+        on("conversations").
+        before(:insert).
+        for_each(:row) do
+      "NEW.display_id := nextval('conv_dpid_seq_' || NEW.account_id);"
+    end
+    create_trigger("camp_dpid_before_insert", :generated => true, :compatibility => 1).
+        on("accounts").
+        name("camp_dpid_before_insert").
+        after(:insert).
+        for_each(:row) do
+      "execute format('create sequence IF NOT EXISTS camp_dpid_seq_%s', NEW.id);"
+    end
+    create_trigger("campaigns_before_insert_row_tr", :generated => true, :compatibility => 1).
+        on("campaigns").
+        before(:insert).
+        for_each(:row) do
+      "NEW.display_id := nextval('camp_dpid_seq_' || NEW.account_id);"
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration, "The initial migration is not revertable"
+  end
+end
diff --git a/db/migrate/20240124084032_add_middle_name_and_last_name_to_contacts.rb b/db/migrate/20240124084032_add_middle_name_and_last_name_to_contacts.rb
new file mode 100644
index 000000000..5d7a8e266
--- /dev/null
+++ b/db/migrate/20240124084032_add_middle_name_and_last_name_to_contacts.rb
@@ -0,0 +1,6 @@
+class AddMiddleNameAndLastNameToContacts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :contacts, :middle_name, :string, default: ''
+    add_column :contacts, :last_name, :string, default: ''
+  end
+end
diff --git a/db/migrate/20240129080827_add_location_and_country_code_to_contacts.rb b/db/migrate/20240129080827_add_location_and_country_code_to_contacts.rb
new file mode 100644
index 000000000..176624460
--- /dev/null
+++ b/db/migrate/20240129080827_add_location_and_country_code_to_contacts.rb
@@ -0,0 +1,6 @@
+class AddLocationAndCountryCodeToContacts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :contacts, :location, :string, default: ''
+    add_column :contacts, :country_code, :string, default: ''
+  end
+end
diff --git a/db/migrate/20240131040316_remove_imap_inbox_syned_at_from_channel_email.rb b/db/migrate/20240131040316_remove_imap_inbox_syned_at_from_channel_email.rb
new file mode 100644
index 000000000..20724f29c
--- /dev/null
+++ b/db/migrate/20240131040316_remove_imap_inbox_syned_at_from_channel_email.rb
@@ -0,0 +1,5 @@
+class RemoveImapInboxSynedAtFromChannelEmail < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :channel_email, :imap_inbox_synced_at, :datetime
+  end
+end
diff --git a/db/migrate/20240207103014_change_applied_sla_sla_status_to_enum.rb b/db/migrate/20240207103014_change_applied_sla_sla_status_to_enum.rb
new file mode 100644
index 000000000..90d33a370
--- /dev/null
+++ b/db/migrate/20240207103014_change_applied_sla_sla_status_to_enum.rb
@@ -0,0 +1,6 @@
+class ChangeAppliedSlaSlaStatusToEnum < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :applied_slas, :sla_status, :string
+    add_column :applied_slas, :sla_status, :integer, default: 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b914eca61..7d2372554 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_01_24_054340) do
+ActiveRecord::Schema[7.0].define(version: 2024_02_07_103014) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -119,9 +119,9 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_24_054340) do
     t.bigint "account_id", null: false
     t.bigint "sla_policy_id", null: false
     t.bigint "conversation_id", null: false
-    t.string "sla_status"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "sla_status", default: 0
     t.index ["account_id"], name: "index_applied_slas_on_account_id"
     t.index ["conversation_id"], name: "index_applied_slas_on_conversation_id"
     t.index ["sla_policy_id"], name: "index_applied_slas_on_sla_policy_id"
@@ -276,7 +276,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_24_054340) do
     t.string "imap_login", default: ""
     t.string "imap_password", default: ""
     t.boolean "imap_enable_ssl", default: true
-    t.datetime "imap_inbox_synced_at", precision: nil
     t.boolean "smtp_enabled", default: false
     t.string "smtp_address", default: ""
     t.integer "smtp_port", default: 0
@@ -419,6 +418,10 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_24_054340) do
     t.jsonb "custom_attributes", default: {}
     t.datetime "last_activity_at", precision: nil
     t.integer "contact_type", default: 0
+    t.string "middle_name", default: ""
+    t.string "last_name", default: ""
+    t.string "location", default: ""
+    t.string "country_code", default: ""
     t.index "lower((email)::text), account_id", name: "index_contacts_on_lower_email_account_id"
     t.index ["account_id", "email", "phone_number", "identifier"], name: "index_contacts_on_nonempty_fields", where: "(((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))"
     t.index ["account_id"], name: "index_contacts_on_account_id"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1fbf28da9..37c21c069 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -78,6 +78,7 @@ services:
     environment:
       - WEBPACKER_DEV_SERVER_HOST=0.0.0.0
       - NODE_ENV=development
+      - NODE_OPTIONS=--openssl-legacy-provider
       - RAILS_ENV=development
     entrypoint: docker/entrypoints/webpack.sh
     command: bin/webpack-dev-server
diff --git a/enterprise/app/helpers/super_admin/features.yml b/enterprise/app/helpers/super_admin/features.yml
index 41e5af426..a3413a325 100644
--- a/enterprise/app/helpers/super_admin/features.yml
+++ b/enterprise/app/helpers/super_admin/features.yml
@@ -1,3 +1,5 @@
+# TODO: Move this values to features.yml itself
+# No need to replicate the same values in two places
 custom_branding:
   name: 'Custom Branding'
   description: 'Apply your own branding to this installation.'
diff --git a/enterprise/app/jobs/enterprise/internal/check_new_versions_job.rb b/enterprise/app/jobs/enterprise/internal/check_new_versions_job.rb
new file mode 100644
index 000000000..b1f5d62ec
--- /dev/null
+++ b/enterprise/app/jobs/enterprise/internal/check_new_versions_job.rb
@@ -0,0 +1,30 @@
+module Enterprise::Internal::CheckNewVersionsJob
+  def perform
+    super
+    update_plan_info
+    reconcile_premium_config_and_features
+  end
+
+  private
+
+  def update_plan_info
+    return if @instance_info.blank?
+
+    update_installation_config(key: 'INSTALLATION_PRICING_PLAN', value: @instance_info['plan'])
+    update_installation_config(key: 'INSTALLATION_PRICING_PLAN_QUANTITY', value: @instance_info['plan_quantity'])
+    update_installation_config(key: 'CHATWOOT_SUPPORT_WEBSITE_TOKEN', value: @instance_info['chatwoot_support_website_token'])
+    update_installation_config(key: 'CHATWOOT_SUPPORT_IDENTIFIER_HASH', value: @instance_info['chatwoot_support_identifier_hash'])
+    update_installation_config(key: 'CHATWOOT_SUPPORT_SCRIPT_URL', value: @instance_info['chatwoot_support_script_url'])
+  end
+
+  def update_installation_config(key:, value:)
+    config = InstallationConfig.find_or_initialize_by(name: key)
+    config.value = value
+    config.locked = true
+    config.save!
+  end
+
+  def reconcile_premium_config_and_features
+    Internal::ReconcilePlanConfigService.new.perform
+  end
+end
diff --git a/enterprise/app/jobs/enterprise/trigger_scheduled_items_job.rb b/enterprise/app/jobs/enterprise/trigger_scheduled_items_job.rb
new file mode 100644
index 000000000..452a89a92
--- /dev/null
+++ b/enterprise/app/jobs/enterprise/trigger_scheduled_items_job.rb
@@ -0,0 +1,11 @@
+module Enterprise::TriggerScheduledItemsJob
+  def perform
+    super
+
+    ## Triggers Enterprise specific jobs
+    ####################################
+
+    # Triggers Account Sla jobs
+    Sla::TriggerSlasForAccountsJob.perform_later
+  end
+end
diff --git a/enterprise/app/jobs/sla/process_account_applied_slas_job.rb b/enterprise/app/jobs/sla/process_account_applied_slas_job.rb
new file mode 100644
index 000000000..153749267
--- /dev/null
+++ b/enterprise/app/jobs/sla/process_account_applied_slas_job.rb
@@ -0,0 +1,9 @@
+class Sla::ProcessAccountAppliedSlasJob < ApplicationJob
+  queue_as :medium
+
+  def perform(account)
+    account.applied_slas.where(sla_status: 'active').each do |applied_sla|
+      Sla::ProcessAppliedSlaJob.perform_later(applied_sla)
+    end
+  end
+end
diff --git a/enterprise/app/jobs/sla/process_applied_sla_job.rb b/enterprise/app/jobs/sla/process_applied_sla_job.rb
new file mode 100644
index 000000000..10fc22c31
--- /dev/null
+++ b/enterprise/app/jobs/sla/process_applied_sla_job.rb
@@ -0,0 +1,7 @@
+class Sla::ProcessAppliedSlaJob < ApplicationJob
+  queue_as :medium
+
+  def perform(applied_sla)
+    Sla::EvaluateAppliedSlaService.new(applied_sla: applied_sla).perform
+  end
+end
diff --git a/enterprise/app/jobs/sla/trigger_slas_for_accounts_job.rb b/enterprise/app/jobs/sla/trigger_slas_for_accounts_job.rb
new file mode 100644
index 000000000..212c44d94
--- /dev/null
+++ b/enterprise/app/jobs/sla/trigger_slas_for_accounts_job.rb
@@ -0,0 +1,10 @@
+class Sla::TriggerSlasForAccountsJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform
+    Account.find_each do |account|
+      Rails.logger.info "Enqueuing ProcessAccountAppliedSlasJob for account #{account.id}"
+      Sla::ProcessAccountAppliedSlasJob.perform_later(account)
+    end
+  end
+end
diff --git a/enterprise/app/models/applied_sla.rb b/enterprise/app/models/applied_sla.rb
index 8329f643b..825c747fc 100644
--- a/enterprise/app/models/applied_sla.rb
+++ b/enterprise/app/models/applied_sla.rb
@@ -3,7 +3,7 @@
 # Table name: applied_slas
 #
 #  id              :bigint           not null, primary key
-#  sla_status      :string
+#  sla_status      :integer          default("active")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  account_id      :bigint           not null
@@ -20,4 +20,6 @@ class AppliedSla < ApplicationRecord
   belongs_to :account
   belongs_to :sla_policy
   belongs_to :conversation
+
+  enum sla_status: { active: 0, hit: 1, missed: 2 }
 end
diff --git a/enterprise/app/models/enterprise/automation_rule.rb b/enterprise/app/models/enterprise/automation_rule.rb
new file mode 100644
index 000000000..1e1e85a6d
--- /dev/null
+++ b/enterprise/app/models/enterprise/automation_rule.rb
@@ -0,0 +1,9 @@
+module Enterprise::AutomationRule
+  def conditions_attributes
+    super + %w[sla_policy_id]
+  end
+
+  def actions_attributes
+    super + %w[add_sla]
+  end
+end
diff --git a/enterprise/app/models/enterprise/concerns/account.rb b/enterprise/app/models/enterprise/concerns/account.rb
index 699e5b813..b4f9d189f 100644
--- a/enterprise/app/models/enterprise/concerns/account.rb
+++ b/enterprise/app/models/enterprise/concerns/account.rb
@@ -3,6 +3,7 @@ module Enterprise::Concerns::Account
 
   included do
     has_many :sla_policies, dependent: :destroy_async
+    has_many :applied_slas, dependent: :destroy_async
 
     def self.add_response_related_associations
       has_many :response_sources, dependent: :destroy_async
diff --git a/enterprise/app/models/enterprise/concerns/user.rb b/enterprise/app/models/enterprise/concerns/user.rb
new file mode 100644
index 000000000..84eddc2ae
--- /dev/null
+++ b/enterprise/app/models/enterprise/concerns/user.rb
@@ -0,0 +1,13 @@
+module Enterprise::Concerns::User
+  extend ActiveSupport::Concern
+
+  included do
+    before_validation :ensure_installation_pricing_plan_quantity, on: :create
+  end
+
+  def ensure_installation_pricing_plan_quantity
+    return unless ChatwootHub.pricing_plan == 'premium'
+
+    errors.add(:base, 'User limit reached. Please purchase more licenses from super admin') if User.count >= ChatwootHub.pricing_plan_quantity
+  end
+end
diff --git a/enterprise/app/services/enterprise/action_service.rb b/enterprise/app/services/enterprise/action_service.rb
new file mode 100644
index 000000000..6e21031aa
--- /dev/null
+++ b/enterprise/app/services/enterprise/action_service.rb
@@ -0,0 +1,15 @@
+module Enterprise::ActionService
+  def add_sla(sla_policy)
+    @conversation.update!(sla_policy_id: sla_policy.id)
+    create_applied_sla(sla_policy)
+  end
+
+  def create_applied_sla(sla_policy)
+    AppliedSla.create!(
+      account_id: @conversation.account_id,
+      sla_policy_id: sla_policy.id,
+      conversation_id: @conversation.id,
+      sla_status: 'active'
+    )
+  end
+end
diff --git a/enterprise/app/services/internal/reconcile_plan_config_service.rb b/enterprise/app/services/internal/reconcile_plan_config_service.rb
new file mode 100644
index 000000000..04414ea68
--- /dev/null
+++ b/enterprise/app/services/internal/reconcile_plan_config_service.rb
@@ -0,0 +1,60 @@
+class Internal::ReconcilePlanConfigService
+  def perform
+    remove_premium_config_reset_warning
+    return if ChatwootHub.pricing_plan != 'community'
+
+    create_premium_config_reset_warning if premium_config_reset_required?
+
+    # We will have this enabled in the future
+    # reconcile_premium_config
+    reconcile_premium_features
+  end
+
+  private
+
+  def config_path
+    @config_path ||= Rails.root.join('enterprise/config')
+  end
+
+  def premium_config
+    @premium_config ||= YAML.safe_load(File.read("#{config_path}/premium_installation_config.yml")).freeze
+  end
+
+  def remove_premium_config_reset_warning
+    Redis::Alfred.delete(Redis::Alfred::CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING)
+  end
+
+  def create_premium_config_reset_warning
+    Redis::Alfred.set(Redis::Alfred::CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING, true)
+  end
+
+  def premium_config_reset_required?
+    premium_config.any? do |config|
+      config = config.with_indifferent_access
+      existing_config = InstallationConfig.find_by(name: config[:name])
+      existing_config&.value != config[:value] if existing_config.present?
+    end
+  end
+
+  def reconcile_premium_config
+    premium_config.each do |config|
+      new_config = config.with_indifferent_access
+      existing_config = InstallationConfig.find_by(name: new_config[:name])
+      next if existing_config&.value == new_config[:value]
+
+      existing_config&.update!(value: new_config[:value])
+    end
+  end
+
+  def premium_features
+    @premium_features ||= YAML.safe_load(File.read("#{config_path}/premium_features.yml")).freeze
+  end
+
+  def reconcile_premium_features
+    Account.find_in_batches do |accounts|
+      accounts.each do |account|
+        account.disable_features!(*premium_features)
+      end
+    end
+  end
+end
diff --git a/enterprise/app/services/sla/evaluate_applied_sla_service.rb b/enterprise/app/services/sla/evaluate_applied_sla_service.rb
new file mode 100644
index 000000000..817a854c7
--- /dev/null
+++ b/enterprise/app/services/sla/evaluate_applied_sla_service.rb
@@ -0,0 +1,78 @@
+class Sla::EvaluateAppliedSlaService
+  pattr_initialize [:applied_sla!]
+
+  def perform
+    check_sla_thresholds
+
+    # We will calculate again in the next iteration
+    return unless applied_sla.conversation.resolved?
+
+    # No SLA missed, so marking as hit as conversation is resolved
+    handle_hit_sla(applied_sla) if applied_sla.active?
+  end
+
+  private
+
+  def check_sla_thresholds
+    [:first_response_time_threshold, :next_response_time_threshold, :resolution_time_threshold].each do |threshold|
+      next if applied_sla.sla_policy.send(threshold).blank?
+
+      send("check_#{threshold}", applied_sla, applied_sla.conversation, applied_sla.sla_policy)
+    end
+  end
+
+  def still_within_threshold?(threshold)
+    Time.zone.now.to_i < threshold
+  end
+
+  def check_first_response_time_threshold(applied_sla, conversation, sla_policy)
+    threshold = conversation.created_at.to_i + sla_policy.first_response_time_threshold.to_i
+    return if first_reply_was_within_threshold?(conversation, threshold)
+    return if still_within_threshold?(threshold)
+
+    handle_missed_sla(applied_sla)
+  end
+
+  def first_reply_was_within_threshold?(conversation, threshold)
+    conversation.first_reply_created_at.present? && conversation.first_reply_created_at.to_i <= threshold
+  end
+
+  def check_next_response_time_threshold(applied_sla, conversation, sla_policy)
+    # still waiting for first reply, so covered under first response time threshold
+    return if conversation.first_reply_created_at.blank?
+    # Waiting on customer response, no need to check next response time threshold
+    return if conversation.waiting_since.blank?
+
+    threshold = conversation.waiting_since.to_i + sla_policy.next_response_time_threshold.to_i
+    return if still_within_threshold?(threshold)
+
+    handle_missed_sla(applied_sla)
+  end
+
+  def check_resolution_time_threshold(applied_sla, conversation, sla_policy)
+    return if conversation.resolved?
+
+    threshold = conversation.created_at.to_i + sla_policy.resolution_time_threshold.to_i
+    return if still_within_threshold?(threshold)
+
+    handle_missed_sla(applied_sla)
+  end
+
+  def handle_missed_sla(applied_sla)
+    return unless applied_sla.active?
+
+    applied_sla.update!(sla_status: 'missed')
+    Rails.logger.warn "SLA missed for conversation #{applied_sla.conversation.id} " \
+                      "in account #{applied_sla.account_id} " \
+                      "for sla_policy #{applied_sla.sla_policy.id}"
+  end
+
+  def handle_hit_sla(applied_sla)
+    return unless applied_sla.active?
+
+    applied_sla.update!(sla_status: 'hit')
+    Rails.logger.info "SLA hit for conversation #{applied_sla.conversation.id} " \
+                      "in account #{applied_sla.account_id} " \
+                      "for sla_policy #{applied_sla.sla_policy.id}"
+  end
+end
diff --git a/enterprise/config/premium_features.yml b/enterprise/config/premium_features.yml
new file mode 100644
index 000000000..9628e1da4
--- /dev/null
+++ b/enterprise/config/premium_features.yml
@@ -0,0 +1,4 @@
+# List of the premium features in EE edition
+- disable_branding
+- audit_logs
+- response_bot
diff --git a/enterprise/config/premium_installation_config.yml b/enterprise/config/premium_installation_config.yml
new file mode 100644
index 000000000..0f102b083
--- /dev/null
+++ b/enterprise/config/premium_installation_config.yml
@@ -0,0 +1,22 @@
+# ------- Branding Related Config ------- #
+- name: INSTALLATION_NAME
+  value: 'Chatwoot'
+- name: LOGO_THUMBNAIL
+  value: '/brand-assets/logo_thumbnail.svg'
+- name: LOGO
+  value: '/brand-assets/logo.svg'
+- name: LOGO_DARK
+  value: '/brand-assets/logo_dark.svg'
+- name: BRAND_URL
+  value: 'https://www.chatwoot.com'
+- name: WIDGET_BRAND_URL
+  value: 'https://www.chatwoot.com'
+- name: BRAND_NAME
+  value: 'Chatwoot'
+- name: TERMS_URL
+  value: 'https://www.chatwoot.com/terms-of-service'
+- name: PRIVACY_URL
+  value: 'https://www.chatwoot.com/privacy-policy'
+- name: DISPLAY_MANIFEST
+  value: true
+# ------- End of Branding Related Config ------- #
diff --git a/lib/custom_exceptions/account.rb b/lib/custom_exceptions/account.rb
index bd77c5a78..efacc9e6e 100644
--- a/lib/custom_exceptions/account.rb
+++ b/lib/custom_exceptions/account.rb
@@ -17,6 +17,12 @@ module CustomExceptions::Account
     end
   end
 
+  class InvalidParams < CustomExceptions::Base
+    def message
+      I18n.t 'errors.signup.invalid_params'
+    end
+  end
+
   class UserErrors < CustomExceptions::Base
     def message
       @data[:errors].full_messages.join(',')
diff --git a/lib/events/base.rb b/lib/events/base.rb
index 8456cb136..9ba1bb175 100644
--- a/lib/events/base.rb
+++ b/lib/events/base.rb
@@ -9,6 +9,6 @@ class Events::Base
   end
 
   def method_name
-    name.to_s.gsub('.', '_')
+    name.to_s.tr('.', '_')
   end
 end
diff --git a/lib/events/types.rb b/lib/events/types.rb
index 6e34fc358..ff7eaf778 100644
--- a/lib/events/types.rb
+++ b/lib/events/types.rb
@@ -49,6 +49,7 @@ module Events::Types
   # notification events
   NOTIFICATION_CREATED = 'notification.created'
   NOTIFICATION_DELETED = 'notification.deleted'
+  NOTIFICATION_UPDATED = 'notification.updated'
 
   # agent events
   AGENT_ADDED = 'agent.added'
diff --git a/lib/integrations/widget/outgoing_message_builder.rb b/lib/integrations/widget/outgoing_message_builder.rb
index 5791ea64e..c209f3fc1 100644
--- a/lib/integrations/widget/outgoing_message_builder.rb
+++ b/lib/integrations/widget/outgoing_message_builder.rb
@@ -16,7 +16,7 @@ class Integrations::Widget::OutgoingMessageBuilder
 
   def perform
     ActiveRecord::Base.transaction do
-      build_conversation
+      conversation
       build_message
     end
   end
@@ -31,19 +31,19 @@ class Integrations::Widget::OutgoingMessageBuilder
     @user ||= Contact.find(options[:user_id])
   end
 
-  def build_conversation
+  def conversation
     @conversation ||= Conversation.find(options[:conversation_id])
   end
 
   def build_message
-    @message = @conversation.messages.new(message_params)
+    @message = conversation.messages.new(message_params)
     @message.save!
   end
 
   def message_params
     {
-      account_id: @conversation.account_id,
-      inbox_id: @conversation.inbox_id,
+      account_id: conversation.account_id,
+      inbox_id: conversation.inbox_id,
       message_type: 1,
       content: options[:content],
       sender: user
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index 535d3774d..f4a1520b1 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -28,6 +28,7 @@ module Redis::RedisKeys
 
   ## Internal Installation related keys
   CHATWOOT_INSTALLATION_ONBOARDING = 'CHATWOOT_INSTALLATION_ONBOARDING'.freeze
+  CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING = 'CHATWOOT_CONFIG_RESET_WARNING'.freeze
   LATEST_CHATWOOT_VERSION = 'LATEST_CHATWOOT_VERSION'.freeze
   # Check if a message create with same source-id is in progress?
   MESSAGE_SOURCE_KEY = 'MESSAGE_SOURCE_KEY::%<id>s'.freeze
diff --git a/package.json b/package.json
index a2e381244..3213922e8 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@chatwoot/prosemirror-schema": "1.0.5",
     "@chatwoot/utils": "^0.0.21",
     "@hcaptcha/vue-hcaptcha": "^0.3.2",
-    "@june-so/analytics-next": "^1.36.5",
+    "@june-so/analytics-next": "^2.0.0",
     "@radix-ui/colors": "^1.0.1",
     "@rails/actioncable": "6.1.3",
     "@rails/ujs": "^7.0.3-1",
@@ -60,7 +60,7 @@
     "highlight.js": "~10.4.1",
     "idb": "^7.1.1",
     "ionicons": "~2.0.1",
-    "js-cookie": "^2.2.1",
+    "js-cookie": "^3.0.5",
     "libphonenumber-js": "^1.10.24",
     "logrocket": "^3.0.1",
     "logrocket-vuex": "^0.0.3",
diff --git a/spec/builders/agent_builder_spec.rb b/spec/builders/agent_builder_spec.rb
new file mode 100644
index 000000000..9d7667306
--- /dev/null
+++ b/spec/builders/agent_builder_spec.rb
@@ -0,0 +1,87 @@
+require 'rails_helper'
+
+RSpec.describe AgentBuilder, type: :model do
+  subject(:agent_builder) { described_class.new(params) }
+
+  let(:account) { create(:account) }
+  let!(:current_user) { create(:user, account: account) }
+  let(:email) { 'test@example.com' }
+  let(:name) { 'Test User' }
+  let(:role) { 'agent' }
+  let(:availability) { 'offline' }
+  let(:auto_offline) { false }
+  let(:params) do
+    {
+      email: email,
+      name: name,
+      inviter: current_user,
+      account: account,
+      role: role,
+      availability: availability,
+      auto_offline: auto_offline
+    }
+  end
+
+  describe '#perform' do
+    context 'when user does not exist' do
+      it 'creates a new user' do
+        expect { agent_builder.perform }.to change(User, :count).by(1)
+      end
+
+      it 'creates a new account user' do
+        expect { agent_builder.perform }.to change(AccountUser, :count).by(1)
+      end
+
+      it 'returns a user' do
+        expect(agent_builder.perform).to be_a(User)
+      end
+    end
+
+    context 'when user exists' do
+      before do
+        create(:user, email: email)
+      end
+
+      it 'does not create a new user' do
+        expect { agent_builder.perform }.not_to change(User, :count)
+      end
+
+      it 'creates a new account user' do
+        expect { agent_builder.perform }.to change(AccountUser, :count).by(1)
+      end
+    end
+
+    context 'when only email is provided' do
+      let(:params) { { email: email, inviter: current_user, account: account } }
+
+      it 'creates a user with default values' do
+        user = agent_builder.perform
+        expect(user.name).to eq('')
+        expect(AccountUser.find_by(user: user).role).to eq('agent')
+      end
+    end
+
+    context 'when a temporary password is generated' do
+      it 'sets a temporary password for the user' do
+        user = agent_builder.perform
+        expect(user.encrypted_password).not_to be_empty
+      end
+    end
+
+    context 'with confirmation required' do
+      let(:unconfirmed_user) { create(:user, email: email) }
+
+      before do
+        unconfirmed_user.confirmed_at = nil
+        unconfirmed_user.save(validate: false)
+        allow(unconfirmed_user).to receive(:confirmed?).and_return(false)
+      end
+
+      it 'sends confirmation instructions' do
+        user = agent_builder.perform
+        expect(user).to receive(:send_confirmation_instructions)
+        agent_builder.send(:send_confirmation_if_required)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/accounts/agents_controller_spec.rb b/spec/controllers/api/v1/accounts/agents_controller_spec.rb
index 2b06301d6..10693443a 100644
--- a/spec/controllers/api/v1/accounts/agents_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/agents_controller_spec.rb
@@ -4,8 +4,8 @@ RSpec.describe 'Agents API', type: :request do
   include ActiveJob::TestHelper
 
   let(:account) { create(:account) }
-  let(:admin) { create(:user, custom_attributes: { test: 'test' }, account: account, role: :administrator) }
-  let(:agent) { create(:user, account: account, role: :agent) }
+  let!(:admin) { create(:user, custom_attributes: { test: 'test' }, account: account, role: :administrator) }
+  let!(:agent) { create(:user, account: account, role: :agent) }
 
   describe 'GET /api/v1/accounts/{account.id}/agents' do
     context 'when it is an unauthenticated user' do
@@ -63,6 +63,8 @@ RSpec.describe 'Agents API', type: :request do
       end
 
       it 'deletes the agent and user object if associated with only one account' do
+        expect(account.users).to include(other_agent)
+
         perform_enqueued_jobs(only: DeleteObjectJob) do
           delete "/api/v1/accounts/#{account.id}/agents/#{other_agent.id}",
                  headers: admin.create_new_auth_token,
@@ -70,8 +72,7 @@ RSpec.describe 'Agents API', type: :request do
         end
 
         expect(response).to have_http_status(:success)
-        expect(account.reload.users.size).to eq(1)
-        expect(User.count).to eq(account.reload.users.size)
+        expect(account.reload.users).not_to include(other_agent)
       end
 
       it 'deletes only the agent object when user is associated with multiple accounts' do
@@ -85,8 +86,8 @@ RSpec.describe 'Agents API', type: :request do
         end
 
         expect(response).to have_http_status(:success)
-        expect(account.users.size).to eq(1)
-        expect(User.count).to eq(account.reload.users.size + 1)
+        expect(account.reload.users).not_to include(other_agent)
+        expect(other_agent.account_users.count).to eq(1) # Should only be associated with other_account now
       end
     end
   end
@@ -174,4 +175,27 @@ RSpec.describe 'Agents API', type: :request do
       end
     end
   end
+
+  describe 'POST /api/v1/accounts/{account.id}/agents/bulk_create' do
+    let(:emails) { ['test1@example.com', 'test2@example.com', 'test3@example.com'] }
+    let(:bulk_create_params) { { emails: emails } }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/agents/bulk_create", params: bulk_create_params
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated as admin' do
+      it 'creates multiple agents successfully' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/agents/bulk_create", params: bulk_create_params, headers: admin.create_new_auth_token
+        end.to change(User, :count).by(3)
+
+        expect(response).to have_http_status(:ok)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
index cadc212d4..3dcb47f71 100644
--- a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
@@ -154,7 +154,7 @@ RSpec.describe 'Notifications API', type: :request do
     end
   end
 
-  describe 'PATCH /api/v1/accounts/{account.id}/notifications/:id/snooze' do
+  describe 'POST /api/v1/accounts/{account.id}/notifications/:id/snooze' do
     let(:admin) { create(:user, account: account, role: :administrator) }
     let!(:notification) { create(:notification, account: account, user: admin) }
 
@@ -181,4 +181,69 @@ RSpec.describe 'Notifications API', type: :request do
       end
     end
   end
+
+  describe 'POST /api/v1/accounts/{account.id}/notifications/:id/unread' do
+    let(:admin) { create(:user, account: account, role: :administrator) }
+    let!(:notification) { create(:notification, account: account, user: admin) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/notifications/#{notification.id}/unread"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+
+      it 'updates the notification read at' do
+        post "/api/v1/accounts/#{account.id}/notifications/#{notification.id}/unread",
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(notification.reload.read_at).to be_nil
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/notifications/destroy_all' do
+    let(:admin) { create(:user, account: account, role: :administrator) }
+    let(:notification1) { create(:notification, account: account, user: admin) }
+    let(:notification2) { create(:notification, account: account, user: admin) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/notifications/destroy_all"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+
+      it 'deletes all the read notifications' do
+        expect(Notification::DeleteNotificationJob).to receive(:perform_later).with(admin, type: :read)
+
+        post "/api/v1/accounts/#{account.id}/notifications/destroy_all",
+             headers: admin.create_new_auth_token,
+             params: { type: 'read' },
+             as: :json
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'deletes all the notifications' do
+        expect(Notification::DeleteNotificationJob).to receive(:perform_later).with(admin, type: :all)
+
+        post "/api/v1/accounts/#{account.id}/notifications/destroy_all",
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index ce5f9623c..060e241a7 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -61,10 +61,9 @@ RSpec.describe 'Accounts API', type: :request do
                params: params,
                as: :json
 
-          expect(AccountBuilder).to have_received(:new).with(params.merge(user_password: params[:password]))
-          expect(account_builder).to have_received(:perform)
+          expect(AccountBuilder).not_to have_received(:new)
           expect(response).to have_http_status(:forbidden)
-          expect(response.body).to eq({ message: I18n.t('errors.signup.failed') }.to_json)
+          expect(response.body).to eq({ message: I18n.t('errors.signup.invalid_params') }.to_json)
         end
       end
     end
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 4feb359c6..80f6833f1 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -242,4 +242,44 @@ RSpec.describe 'Profile API', type: :request do
       end
     end
   end
+
+  describe 'POST /api/v1/profile/resend_confirmation' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post '/api/v1/profile/resend_confirmation'
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:agent) do
+        create(:user, password: 'Test123!', email: 'test-unconfirmed@email.com', account: account, role: :agent,
+                      unconfirmed_email: 'test-unconfirmed@email.com')
+      end
+
+      it 'does not send the confirmation email if the user is already confirmed' do
+        expect do
+          post '/api/v1/profile/resend_confirmation',
+               headers: agent.create_new_auth_token,
+               as: :json
+        end.not_to have_enqueued_mail(Devise::Mailer, :confirmation_instructions)
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'resends the confirmation email if the user is unconfirmed' do
+        agent.confirmed_at = nil
+        agent.save!
+
+        expect do
+          post '/api/v1/profile/resend_confirmation',
+               headers: agent.create_new_auth_token,
+               as: :json
+        end.to have_enqueued_mail(Devise::Mailer, :confirmation_instructions)
+
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/api/v2/accounts_controller_spec.rb b/spec/controllers/api/v2/accounts_controller_spec.rb
new file mode 100644
index 000000000..e0181a282
--- /dev/null
+++ b/spec/controllers/api/v2/accounts_controller_spec.rb
@@ -0,0 +1,104 @@
+require 'rails_helper'
+
+RSpec.describe 'Accounts API', type: :request do
+  describe 'POST /api/v2/accounts' do
+    let(:email) { Faker::Internet.email }
+
+    context 'when posting to accounts with correct parameters' do
+      let(:account_builder) { double }
+      let(:account) { create(:account) }
+      let(:user) { create(:user, email: email, account: account) }
+
+      before do
+        allow(AccountBuilder).to receive(:new).and_return(account_builder)
+      end
+
+      it 'calls account builder' do
+        with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+          allow(account_builder).to receive(:perform).and_return([user, account])
+
+          params = { email: email, user: nil, password: 'Password1!' }
+
+          post api_v2_accounts_url,
+               params: params,
+               as: :json
+
+          expect(AccountBuilder).to have_received(:new).with(params.except(:password).merge(user_password: params[:password]))
+          expect(account_builder).to have_received(:perform)
+          expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
+          expect(response.body).to include('en')
+        end
+      end
+
+      it 'calls ChatwootCaptcha' do
+        with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+          captcha = double
+          allow(account_builder).to receive(:perform).and_return([user, account])
+          allow(ChatwootCaptcha).to receive(:new).and_return(captcha)
+          allow(captcha).to receive(:valid?).and_return(true)
+
+          params = { email: email, user: nil, password: 'Password1!', h_captcha_client_response: '123' }
+
+          post api_v2_accounts_url,
+               params: params,
+               as: :json
+
+          expect(ChatwootCaptcha).to have_received(:new).with('123')
+          expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
+          expect(response.body).to include('en')
+        end
+      end
+
+      it 'renders error response on invalid params' do
+        with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+          allow(account_builder).to receive(:perform).and_return(nil)
+
+          params = { email: nil, user: nil }
+
+          post api_v2_accounts_url,
+               params: params,
+               as: :json
+
+          expect(AccountBuilder).to have_received(:new).with(params.merge(user_password: params[:password]))
+          expect(account_builder).to have_received(:perform)
+          expect(response).to have_http_status(:forbidden)
+          expect(response.body).to eq({ message: I18n.t('errors.signup.failed') }.to_json)
+        end
+      end
+    end
+
+    context 'when ENABLE_ACCOUNT_SIGNUP env variable is set to false' do
+      it 'responds 404 on requests' do
+        params = { email: email }
+        with_modified_env ENABLE_ACCOUNT_SIGNUP: 'false' do
+          post api_v2_accounts_url,
+               params: params,
+               as: :json
+
+          expect(response).to have_http_status(:not_found)
+        end
+      end
+    end
+
+    context 'when ENABLE_ACCOUNT_SIGNUP env variable is set to api_only' do
+      let(:account_builder) { double }
+      let(:account) { create(:account) }
+      let(:user) { create(:user, email: email, account: account) }
+
+      it 'does not respond 404 on requests' do
+        allow(AccountBuilder).to receive(:new).and_return(account_builder)
+        allow(account_builder).to receive(:perform).and_return([user, account])
+
+        params = { email: email, user: nil, password: 'Password1!' }
+        with_modified_env ENABLE_ACCOUNT_SIGNUP: 'api_only' do
+          post api_v2_accounts_url,
+               params: params,
+               as: :json
+
+          expect(AccountBuilder).to have_received(:new).with(params.except(:password).merge(user_password: params[:password]))
+          expect(response).to have_http_status(:success)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/controllers/super_admin/accounts_controller_spec.rb b/spec/controllers/super_admin/accounts_controller_spec.rb
index ee295472d..6b7e6eeed 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -43,10 +43,14 @@ RSpec.describe 'Super Admin accounts API', type: :request do
       it 'shows the list of accounts' do
         expect(account.cache_keys.keys).to contain_exactly(:inbox, :label, :team)
         sign_in(super_admin, scope: :super_admin)
+
+        now_timestamp = Time.now.utc.to_i
         post "/super_admin/accounts/#{account.id}/reset_cache"
         expect(response).to have_http_status(:redirect)
         expect(flash[:notice]).to eq('Cache keys cleared')
-        expect(account.reload.cache_keys.values.map(&:to_i)).to eq([0, 0, 0])
+
+        range = now_timestamp..(now_timestamp + 10)
+        expect(account.reload.cache_keys.values.all? { |v| range.cover?(v.to_i) }).to be(true)
       end
     end
   end
diff --git a/spec/controllers/super_admin/app_config_controller_spec.rb b/spec/controllers/super_admin/app_config_controller_spec.rb
index 338c3e611..f517009eb 100644
--- a/spec/controllers/super_admin/app_config_controller_spec.rb
+++ b/spec/controllers/super_admin/app_config_controller_spec.rb
@@ -16,9 +16,9 @@ RSpec.describe 'Super Admin Application Config API', type: :request do
 
       it 'shows the app_config page' do
         sign_in(super_admin, scope: :super_admin)
-        get '/super_admin/app_config'
+        get '/super_admin/app_config?config=facebook'
         expect(response).to have_http_status(:success)
-        expect(response.body).to include(config.name)
+        expect(response.body).to include(config.value)
       end
     end
   end
@@ -34,7 +34,7 @@ RSpec.describe 'Super Admin Application Config API', type: :request do
     context 'when it is an aunthenticated super admin' do
       it 'shows the app_config page' do
         sign_in(super_admin, scope: :super_admin)
-        post '/super_admin/app_config', params: { app_config: { FB_APP_ID: 'FB_APP_ID' } }
+        post '/super_admin/app_config?config=facebook', params: { app_config: { FB_APP_ID: 'FB_APP_ID' } }
 
         expect(response).to have_http_status(:found)
         expect(response).to redirect_to(super_admin_settings_path)
diff --git a/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb
new file mode 100644
index 000000000..97e76a6cd
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb
@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+RSpec.describe 'Agents API', type: :request do
+  include ActiveJob::TestHelper
+
+  let(:account) { create(:account) }
+  let!(:admin) { create(:user, custom_attributes: { test: 'test' }, account: account, role: :administrator) }
+
+  describe 'POST /api/v1/accounts/{account.id}/agents' do
+    context 'when the account has reached its agent limit' do
+      params = { name: 'NewUser', email: Faker::Internet.email, role: :agent }
+
+      before do
+        account.update(limits: { agents: 4 })
+        create_list(:user, 4, account: account, role: :agent)
+      end
+
+      it 'prevents adding a new agent and returns a payment required status' do
+        post "/api/v1/accounts/#{account.id}/agents", params: params, headers: admin.create_new_auth_token, as: :json
+
+        expect(response).to have_http_status(:payment_required)
+        expect(response.body).to include('Account limit exceeded. Please purchase more licenses')
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/agents/bulk_create' do
+    let(:emails) { ['test1@example.com', 'test2@example.com', 'test3@example.com'] }
+    let(:bulk_create_params) { { emails: emails } }
+
+    context 'when exceeding agent limit' do
+      it 'prevents creating agents and returns a payment required status' do
+        # Set the limit to be less than the number of emails
+        account.update(limits: { agents: 2 })
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/agents/bulk_create", params: bulk_create_params, headers: admin.create_new_auth_token
+        end.not_to change(User, :count)
+
+        expect(response).to have_http_status(:payment_required)
+        expect(response.body).to include('Account limit exceeded. Please purchase more licenses')
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/enterprise/internal/check_new_versions_job_spec.rb b/spec/enterprise/jobs/enterprise/internal/check_new_versions_job_spec.rb
new file mode 100644
index 000000000..48664c904
--- /dev/null
+++ b/spec/enterprise/jobs/enterprise/internal/check_new_versions_job_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+RSpec.describe Internal::CheckNewVersionsJob do
+  subject(:job) { described_class.perform_now }
+
+  let(:reconsile_premium_config_service) { instance_double(Internal::ReconcilePlanConfigService) }
+
+  before do
+    allow(Internal::ReconcilePlanConfigService).to receive(:new).and_return(reconsile_premium_config_service)
+    allow(reconsile_premium_config_service).to receive(:perform)
+    allow(Rails.env).to receive(:production?).and_return(true)
+  end
+
+  it 'updates the plan info' do
+    data = { 'version' => '1.2.3', 'plan' => 'enterprise', 'plan_quantity' => 1, 'chatwoot_support_website_token' => '123',
+             'chatwoot_support_identifier_hash' => '123', 'chatwoot_support_script_url' => '123' }
+    allow(ChatwootHub).to receive(:sync_with_hub).and_return(data)
+    job
+    expect(InstallationConfig.find_by(name: 'INSTALLATION_PRICING_PLAN').value).to eq 'enterprise'
+    expect(InstallationConfig.find_by(name: 'INSTALLATION_PRICING_PLAN_QUANTITY').value).to eq 1
+    expect(InstallationConfig.find_by(name: 'CHATWOOT_SUPPORT_WEBSITE_TOKEN').value).to eq '123'
+    expect(InstallationConfig.find_by(name: 'CHATWOOT_SUPPORT_IDENTIFIER_HASH').value).to eq '123'
+    expect(InstallationConfig.find_by(name: 'CHATWOOT_SUPPORT_SCRIPT_URL').value).to eq '123'
+  end
+
+  it 'calls Internal::ReconcilePlanConfigService' do
+    data = { 'version' => '1.2.3' }
+    allow(ChatwootHub).to receive(:sync_with_hub).and_return(data)
+    job
+    expect(reconsile_premium_config_service).to have_received(:perform)
+  end
+end
diff --git a/spec/enterprise/jobs/enterprise/trigger_scheduled_items_job_spec.rb b/spec/enterprise/jobs/enterprise/trigger_scheduled_items_job_spec.rb
new file mode 100644
index 000000000..d6c84104a
--- /dev/null
+++ b/spec/enterprise/jobs/enterprise/trigger_scheduled_items_job_spec.rb
@@ -0,0 +1,10 @@
+require 'rails_helper'
+
+RSpec.describe TriggerScheduledItemsJob do
+  subject(:job) { described_class.perform_later }
+
+  it 'triggers Sla::TriggerSlasForAccountsJob' do
+    expect(Sla::TriggerSlasForAccountsJob).to receive(:perform_later).once
+    described_class.perform_now
+  end
+end
diff --git a/spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb b/spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb
new file mode 100644
index 000000000..beae967db
--- /dev/null
+++ b/spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+RSpec.describe Sla::ProcessAccountAppliedSlasJob do
+  context 'when perform is called' do
+    let!(:account) { create(:account) }
+    let!(:sla_policy) { create(:sla_policy, first_response_time_threshold: 1.hour) }
+    let!(:applied_sla) { create(:applied_sla, account: account, sla_policy: sla_policy, sla_status: 'active') }
+    let!(:hit_applied_sla) { create(:applied_sla, account: account, sla_policy: sla_policy, sla_status: 'hit') }
+    let!(:miss_applied_sla) { create(:applied_sla, account: account, sla_policy: sla_policy, sla_status: 'missed') }
+
+    it 'enqueues the job' do
+      expect { described_class.perform_later }.to have_enqueued_job(described_class)
+        .on_queue('medium')
+    end
+
+    it 'calls the ProcessAppliedSlaJob' do
+      expect(Sla::ProcessAppliedSlaJob).to receive(:perform_later).with(applied_sla).and_call_original
+      described_class.perform_now(account)
+    end
+
+    it 'does not call the ProcessAppliedSlaJob for not active applied slas' do
+      expect(Sla::ProcessAppliedSlaJob).not_to receive(:perform_later).with(hit_applied_sla)
+      expect(Sla::ProcessAppliedSlaJob).not_to receive(:perform_later).with(miss_applied_sla)
+      described_class.perform_now(account)
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/sla/process_applied_sla_job_spec.rb b/spec/enterprise/jobs/sla/process_applied_sla_job_spec.rb
new file mode 100644
index 000000000..fd56e0df3
--- /dev/null
+++ b/spec/enterprise/jobs/sla/process_applied_sla_job_spec.rb
@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe Sla::ProcessAppliedSlaJob do
+  context 'when perform is called' do
+    let(:account) { create(:account) }
+
+    it 'enqueues the job' do
+      expect { described_class.perform_later }.to have_enqueued_job(described_class)
+        .on_queue('medium')
+    end
+
+    it 'calls the EvaluateAppliedSlaService' do
+      applied_sla = create(:applied_sla)
+      expect(Sla::EvaluateAppliedSlaService).to receive(:new).with(applied_sla: applied_sla).and_call_original
+      described_class.perform_now(applied_sla)
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/sla/trigger_slas_for_accounts_job_spec.rb b/spec/enterprise/jobs/sla/trigger_slas_for_accounts_job_spec.rb
new file mode 100644
index 000000000..95650748a
--- /dev/null
+++ b/spec/enterprise/jobs/sla/trigger_slas_for_accounts_job_spec.rb
@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+RSpec.describe Sla::TriggerSlasForAccountsJob do
+  context 'when perform is called' do
+    let(:account) { create(:account) }
+
+    it 'enqueues the job' do
+      expect { described_class.perform_later }.to have_enqueued_job(described_class)
+        .on_queue('scheduled_jobs')
+    end
+
+    it 'calls the ProcessAccountAppliedSlasJob' do
+      expect(Sla::ProcessAccountAppliedSlasJob).to receive(:perform_later).with(account).and_call_original
+      described_class.perform_now
+    end
+  end
+end
diff --git a/enterprise/spec/integrations/openai/processor_service_spec.rb b/spec/enterprise/lib/integrations/openai/processor_service_spec.rb
similarity index 74%
rename from enterprise/spec/integrations/openai/processor_service_spec.rb
rename to spec/enterprise/lib/integrations/openai/processor_service_spec.rb
index 966062d37..2a98514cf 100644
--- a/enterprise/spec/integrations/openai/processor_service_spec.rb
+++ b/spec/enterprise/lib/integrations/openai/processor_service_spec.rb
@@ -44,6 +44,8 @@ RSpec.describe Integrations::Openai::ProcessorService do
 
         create(:label, account: account)
         create(:label, account: account)
+
+        hook.settings['label_suggestion'] = 'true'
       end
 
       it 'returns the label suggestions' do
@@ -81,5 +83,26 @@ RSpec.describe Integrations::Openai::ProcessorService do
         expect(subject.perform).to be_nil
       end
     end
+
+    context 'when hook is not enabled' do
+      let(:event) { { 'name' => 'label_suggestion', 'data' => { 'conversation_display_id' => conversation.display_id } } }
+
+      before do
+        create(:message, account: account, conversation: conversation, message_type: :incoming, content: 'hello agent')
+        create(:message, account: account, conversation: conversation, message_type: :outgoing, content: 'hello customer')
+        create(:message, account: account, conversation: conversation, message_type: :incoming, content: 'hello agent 2')
+        create(:message, account: account, conversation: conversation, message_type: :incoming, content: 'hello agent 3')
+        create(:message, account: account, conversation: conversation, message_type: :incoming, content: 'hello agent 4')
+
+        create(:label, account: account)
+        create(:label, account: account)
+
+        hook.settings['label_suggestion'] = nil
+      end
+
+      it 'returns nil' do
+        expect(subject.perform).to be_nil
+      end
+    end
   end
 end
diff --git a/spec/enterprise/models/automation_rule_spec.rb b/spec/enterprise/models/automation_rule_spec.rb
index 69e7949b7..e2e929d2c 100644
--- a/spec/enterprise/models/automation_rule_spec.rb
+++ b/spec/enterprise/models/automation_rule_spec.rb
@@ -25,5 +25,12 @@ RSpec.describe AutomationRule do
         expect(Audited::Audit.where(auditable_type: 'AutomationRule', action: 'destroy').count).to eq 1
       end
     end
+
+    context 'when automation rule is in enterprise namespace' do
+      it 'has associated sla methods available' do
+        expect(automation_rule.conditions_attributes).to include('sla_policy_id')
+        expect(automation_rule.actions_attributes).to include('add_sla')
+      end
+    end
   end
 end
diff --git a/spec/enterprise/models/user_spec.rb b/spec/enterprise/models/user_spec.rb
index ba1890a78..21e398709 100644
--- a/spec/enterprise/models/user_spec.rb
+++ b/spec/enterprise/models/user_spec.rb
@@ -3,9 +3,60 @@
 require 'rails_helper'
 
 RSpec.describe User do
-  let(:user) { create(:user) }
+  let!(:user) { create(:user) }
+
+  describe 'before validation for pricing plans' do
+    let!(:existing_user) { create(:user) }
+    let(:new_user) { build(:user) }
+
+    context 'when pricing plan is not premium' do
+      before do
+        allow(ChatwootHub).to receive(:pricing_plan).and_return('community')
+        allow(ChatwootHub).to receive(:pricing_plan_quantity).and_return(0)
+      end
+
+      it 'does not add an error to the user' do
+        new_user.valid?
+        expect(new_user.errors[:base]).to be_empty
+      end
+    end
+
+    context 'when pricing plan is premium' do
+      before do
+        allow(ChatwootHub).to receive(:pricing_plan).and_return('premium')
+      end
+
+      context 'when the user limit is reached' do
+        it 'adds an error when trying to create a user' do
+          allow(ChatwootHub).to receive(:pricing_plan_quantity).and_return(1)
+          new_user.valid?
+          expect(new_user.errors[:base]).to include('User limit reached. Please purchase more licenses from super admin')
+        end
+
+        it 'will not add error when trying to update a existing user' do
+          allow(ChatwootHub).to receive(:pricing_plan_quantity).and_return(1)
+          existing_user.update(name: 'new name')
+          # since there is user and existing user, we are already over limits
+          existing_user.valid?
+          expect(existing_user.errors[:base]).to be_empty
+        end
+      end
+
+      context 'when the user limit is not reached' do
+        it 'does not add an error to the user' do
+          allow(ChatwootHub).to receive(:pricing_plan_quantity).and_return(3)
+          new_user.valid?
+          expect(user.errors[:base]).to be_empty
+        end
+      end
+    end
+  end
 
   describe 'audit log' do
+    before do
+      create(:user)
+    end
+
     context 'when user is created' do
       it 'has no associated audit log created' do
         expect(Audited::Audit.where(auditable_type: 'User', action: 'create').count).to eq 0
diff --git a/spec/enterprise/services/enterprise/action_service_spec.rb b/spec/enterprise/services/enterprise/action_service_spec.rb
new file mode 100644
index 000000000..6efffca6d
--- /dev/null
+++ b/spec/enterprise/services/enterprise/action_service_spec.rb
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+describe ActionService do
+  let(:account) { create(:account) }
+
+  describe '#add_sla' do
+    let(:sla_policy) { create(:sla_policy, account: account) }
+    let(:conversation) { create(:conversation, account: account) }
+    let(:action_service) { described_class.new(conversation) }
+
+    it 'adds the sla policy to the conversation and create applied_sla entry' do
+      action_service.add_sla(sla_policy)
+      expect(conversation.reload.sla_policy_id).to eq(sla_policy.id)
+
+      # check if appliedsla table entry is created with matching attributes
+      applied_sla = AppliedSla.last
+      expect(applied_sla.account_id).to eq(account.id)
+      expect(applied_sla.sla_policy_id).to eq(sla_policy.id)
+      expect(applied_sla.conversation_id).to eq(conversation.id)
+      expect(applied_sla.sla_status).to eq('active')
+    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
new file mode 100644
index 000000000..ee8b25557
--- /dev/null
+++ b/spec/enterprise/services/internal/reconcile_plan_config_service_spec.rb
@@ -0,0 +1,81 @@
+require 'rails_helper'
+
+RSpec.describe Internal::ReconcilePlanConfigService do
+  describe '#perform' do
+    let(:service) { described_class.new }
+
+    context 'when pricing plan is community' do
+      before do
+        allow(ChatwootHub).to receive(:pricing_plan).and_return('community')
+      end
+
+      it 'disables the premium features for accounts' do
+        account = create(:account)
+        account.enable_features!('disable_branding', 'audit_logs', 'response_bot')
+        response_bot_account = create(:account)
+        response_bot_account.enable_features!('response_bot')
+        disable_branding_account = create(:account)
+        disable_branding_account.enable_features!('disable_branding')
+        service.perform
+        expect(account.reload.enabled_features.keys).not_to include('response_bot', 'disable_branding', 'audit_logs')
+        expect(response_bot_account.reload.enabled_features.keys).not_to include('response_bot')
+        expect(disable_branding_account.reload.enabled_features.keys).not_to include('disable_branding')
+      end
+
+      it 'creates a premium config reset warning if config was modified' do
+        create(:installation_config, name: 'INSTALLATION_NAME', value: 'custom-name')
+        service.perform
+        expect(Redis::Alfred.get(Redis::Alfred::CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING)).to eq('true')
+      end
+
+      it 'will not create a premium config reset warning if config is not modified' do
+        create(:installation_config, name: 'INSTALLATION_NAME', value: 'Chatwoot')
+        service.perform
+        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
+    end
+
+    context 'when pricing plan is not community' do
+      before do
+        allow(ChatwootHub).to receive(:pricing_plan).and_return('enterprise')
+      end
+
+      it 'unset premium config warning on upgrade' do
+        Redis::Alfred.set(Redis::Alfred::CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING, true)
+        service.perform
+        expect(Redis::Alfred.get(Redis::Alfred::CHATWOOT_INSTALLATION_CONFIG_RESET_WARNING)).to be_nil
+      end
+
+      it 'does not disable the premium features for accounts' do
+        account = create(:account)
+        account.enable_features!('disable_branding', 'audit_logs', 'response_bot')
+        response_bot_account = create(:account)
+        response_bot_account.enable_features!('response_bot')
+        disable_branding_account = create(:account)
+        disable_branding_account.enable_features!('disable_branding')
+        service.perform
+        expect(account.reload.enabled_features.keys).to include('response_bot', 'disable_branding', 'audit_logs')
+        expect(response_bot_account.reload.enabled_features.keys).to include('response_bot')
+        expect(disable_branding_account.reload.enabled_features.keys).to include('disable_branding')
+      end
+
+      it 'does not update the LOGO config' 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('custom-name')
+        expect(InstallationConfig.find_by(name: 'LOGO').value).to eq('/custom-path/logo.svg')
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
new file mode 100644
index 000000000..0f82715c0
--- /dev/null
+++ b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
@@ -0,0 +1,141 @@
+require 'rails_helper'
+
+RSpec.describe Sla::EvaluateAppliedSlaService do
+  let!(:conversation) { create(:conversation, created_at: 6.hours.ago) }
+  let!(:sla_policy) do
+    create(:sla_policy, account: conversation.account,
+                        first_response_time_threshold: nil,
+                        next_response_time_threshold: nil,
+                        resolution_time_threshold: nil)
+  end
+  let!(:applied_sla) { create(:applied_sla, conversation: conversation, sla_policy: sla_policy, sla_status: 'active') }
+
+  describe '#perform - SLA misses' do
+    context 'when first response SLA is missed' do
+      before { 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)
+        described_class.new(applied_sla: applied_sla).perform
+        expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
+                                                          "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
+        expect(applied_sla.reload.sla_status).to eq('missed')
+      end
+    end
+
+    context 'when next response SLA is missed' do
+      before do
+        sla_policy.update(next_response_time_threshold: 1.hour)
+        conversation.update(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
+      end
+
+      it 'updates the SLA status to missed and logs a warning' do
+        allow(Rails.logger).to receive(:warn)
+        described_class.new(applied_sla: applied_sla).perform
+        expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
+                                                          "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
+        expect(applied_sla.reload.sla_status).to eq('missed')
+      end
+    end
+
+    context 'when resolution time SLA is missed' do
+      before { 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)
+        described_class.new(applied_sla: applied_sla).perform
+        expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
+                                                          "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
+        expect(applied_sla.reload.sla_status).to eq('missed')
+      end
+    end
+
+    # We will mark resolved miss only if while processing the SLA
+    # if the conversation is resolved and the resolution time is missed by small margins then we will not mark it as missed
+    context 'when resolved conversation with resolution time SLA is missed' do
+      before do
+        conversation.resolved!
+        sla_policy.update(resolution_time_threshold: 1.hour)
+      end
+
+      it 'does not update the SLA status to missed' do
+        described_class.new(applied_sla: applied_sla).perform
+        expect(applied_sla.reload.sla_status).to eq('hit')
+      end
+    end
+
+    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)
+        conversation.update(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
+      end
+
+      it 'updates the SLA status to missed and logs a warning' do
+        allow(Rails.logger).to receive(:warn)
+        described_class.new(applied_sla: applied_sla).perform
+        expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
+                                                          "#{applied_sla.account_id} for sla_policy #{sla_policy.id}").exactly(1).time
+        expect(applied_sla.reload.sla_status).to eq('missed')
+      end
+    end
+  end
+
+  describe '#perform - SLA hits' do
+    context 'when first response SLA is hit' do
+      before do
+        sla_policy.update(first_response_time_threshold: 6.hours)
+        conversation.update(first_reply_created_at: 30.minutes.ago)
+      end
+
+      it 'sla remains active until conversation is resolved' do
+        described_class.new(applied_sla: applied_sla).perform
+        expect(applied_sla.reload.sla_status).to eq('active')
+      end
+
+      it 'updates the SLA status to hit and logs an info when conversations is resolved' do
+        conversation.resolved!
+        allow(Rails.logger).to receive(:info)
+        described_class.new(applied_sla: applied_sla).perform
+        expect(Rails.logger).to have_received(:info).with("SLA hit for conversation #{conversation.id} in account " \
+                                                          "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
+        expect(applied_sla.reload.sla_status).to eq('hit')
+      end
+    end
+
+    context 'when next response SLA is hit' do
+      before do
+        sla_policy.update(next_response_time_threshold: 6.hours)
+        conversation.update(first_reply_created_at: 30.minutes.ago, waiting_since: nil)
+      end
+
+      it 'sla remains active until conversation is resolved' do
+        described_class.new(applied_sla: applied_sla).perform
+        expect(applied_sla.reload.sla_status).to eq('active')
+      end
+
+      it 'updates the SLA status to hit and logs an info when conversations is resolved' do
+        conversation.resolved!
+        allow(Rails.logger).to receive(:info)
+        described_class.new(applied_sla: applied_sla).perform
+        expect(Rails.logger).to have_received(:info).with("SLA hit for conversation #{conversation.id} in account " \
+                                                          "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
+        expect(applied_sla.reload.sla_status).to eq('hit')
+      end
+    end
+
+    context 'when resolution time SLA is hit' do
+      before do
+        sla_policy.update(resolution_time_threshold: 8.hours)
+        conversation.resolved!
+      end
+
+      it 'updates the SLA status to hit and logs an info' do
+        allow(Rails.logger).to receive(:info)
+        described_class.new(applied_sla: applied_sla).perform
+        expect(Rails.logger).to have_received(:info).with("SLA hit for conversation #{conversation.id} in account " \
+                                                          "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
+        expect(applied_sla.reload.sla_status).to eq('hit')
+      end
+    end
+  end
+end
diff --git a/spec/factories/applied_slas.rb b/spec/factories/applied_slas.rb
index 8ab48c558..f99fa4134 100644
--- a/spec/factories/applied_slas.rb
+++ b/spec/factories/applied_slas.rb
@@ -1,8 +1,11 @@
 FactoryBot.define do
   factory :applied_sla do
-    account
     sla_policy
     conversation
     sla_status { 'active' }
+
+    after(:build) do |applied_sla|
+      applied_sla.account ||= applied_sla.conversation&.account || create(:account)
+    end
   end
 end
diff --git a/spec/factories/channel/channel_email.rb b/spec/factories/channel/channel_email.rb
index 6e01dffdd..3ec96aaa4 100644
--- a/spec/factories/channel/channel_email.rb
+++ b/spec/factories/channel/channel_email.rb
@@ -8,5 +8,22 @@ FactoryBot.define do
     after(:create) do |channel_email|
       create(:inbox, channel: channel_email, account: channel_email.account)
     end
+
+    trait :microsoft_email do
+      imap_enabled { true }
+      imap_address { 'outlook.office365.com' }
+      imap_port { 993 }
+      imap_login { 'email@example.com' }
+      imap_password { '' }
+      imap_enable_ssl { true }
+      provider_config do
+        {
+          expires_on: Time.zone.now + 3600,
+          access_token: SecureRandom.hex,
+          refresh_token: SecureRandom.hex
+        }
+      end
+      provider { 'microsoft' }
+    end
   end
 end
diff --git a/spec/finders/notification_finder_spec.rb b/spec/finders/notification_finder_spec.rb
index 294cef7ff..48a9f2785 100644
--- a/spec/finders/notification_finder_spec.rb
+++ b/spec/finders/notification_finder_spec.rb
@@ -63,5 +63,42 @@ describe NotificationFinder do
         expect(result).to be 1
       end
     end
+
+    context 'when type read param is passed' do
+      let(:params) { { type: 'read' } }
+
+      it 'returns only read notifications' do
+        result = notification_finder.perform
+        expect(result.length).to be 2
+      end
+
+      it 'returns count' do
+        result = notification_finder.count
+        expect(result).to be 2
+      end
+    end
+
+    context 'when type read and snoozed param is passed' do
+      let(:params) { { type: 'read', status: 'snoozed' } }
+
+      it 'returns only read notifications' do
+        result = notification_finder.perform
+        expect(result.length).to be 0
+      end
+
+      it 'returns count' do
+        result = notification_finder.count
+        expect(result).to be 0
+      end
+    end
+
+    context 'when sort order is passed' do
+      let(:params) { { sort_order: :asc } }
+
+      it 'returns notifications in ascending order' do
+        result = notification_finder.perform
+        expect(result.first.last_activity_at).to be < result.last.last_activity_at
+      end
+    end
   end
 end
diff --git a/spec/fixtures/files/mail_with_no_date.eml b/spec/fixtures/files/mail_with_no_date.eml
index 745d5782d..f9f806d49 100644
--- a/spec/fixtures/files/mail_with_no_date.eml
+++ b/spec/fixtures/files/mail_with_no_date.eml
@@ -2,5 +2,6 @@ Date:
 From: testemail@gmail.com
 To: imap@outlook.com
 Subject: test text only mail
+Message-Id: <0CB459E0-0336-41DA-BC88-E6E28C697DDB@chatwoot.com>
 
 text only mail
diff --git a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
index e6545bfe3..cf0b30842 100644
--- a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
+++ b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
@@ -23,5 +23,23 @@ RSpec.describe Channels::Whatsapp::TemplatesSyncSchedulerJob do
         have_been_enqueued.with(non_synced).on_queue('low')
       )
     end
+
+    it 'schedules templates_sync_job for oldest synced channels first' do
+      stub_const('Limits::BULK_EXTERNAL_HTTP_CALLS_LIMIT', 2)
+      stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
+      non_synced = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: nil)
+      synced_recently = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: 4.hours.ago)
+      synced_old = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: 6.hours.ago)
+      described_class.perform_now
+      expect(Channels::Whatsapp::TemplatesSyncJob).not_to(
+        have_been_enqueued.with(synced_recently).on_queue('low')
+      )
+      expect(Channels::Whatsapp::TemplatesSyncJob).to(
+        have_been_enqueued.with(synced_old).on_queue('low')
+      )
+      expect(Channels::Whatsapp::TemplatesSyncJob).to(
+        have_been_enqueued.with(non_synced).on_queue('low')
+      )
+    end
   end
 end
diff --git a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
index 30a77c5ec..12828bf68 100644
--- a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
@@ -6,17 +6,13 @@ RSpec.describe Inboxes::FetchImapEmailsJob do
   let(:account) { create(:account) }
   let(:imap_email_channel) do
     create(:channel_email, imap_enabled: true, imap_address: 'imap.gmail.com', imap_port: 993, imap_login: 'imap@gmail.com',
-                           imap_password: 'password', imap_inbox_synced_at: Time.now.utc, account: account)
-  end
-  let(:microsoft_imap_email_channel) do
-    create(:channel_email, provider: 'microsoft', imap_enabled: true, imap_address: 'outlook.office365.com',
-                           imap_port: 993, imap_login: 'imap@outlook.com', imap_password: 'password', account: account,
-                           provider_config: { access_token: 'access_token' })
+                           imap_password: 'password', account: account)
   end
+
+  let(:microsoft_imap_email_channel) { create(:channel_email, :microsoft_email) }
   let(:ms_email_inbox) { create(:inbox, channel: microsoft_imap_email_channel, account: account) }
   let!(:conversation) { create(:conversation, inbox: imap_email_channel.inbox, account: account) }
   let(:inbound_mail) { create_inbound_email_from_mail(from: 'testemail@gmail.com', to: 'imap@outlook.com', subject: 'Hello!') }
-  let(:inbound_mail_with_no_date) { create_inbound_email_from_fixture('mail_with_no_date.eml') }
   let(:inbound_mail_with_attachments) { create_inbound_email_from_fixture('multiple_attachments.eml') }
 
   it 'enqueues the job' do
@@ -56,25 +52,19 @@ RSpec.describe Inboxes::FetchImapEmailsJob do
     end
 
     it 'process the email with no date' do
-      email = Mail.new do
-        to 'test@outlook.com'
-        from 'test@gmail.com'
-        subject :test.to_s
-        body 'hello'
-      end
-
-      imap_fetch_mail = Net::IMAP::FetchData.new
-      imap_fetch_mail.attr = { seqno: 1, RFC822: email }.with_indifferent_access
+      fixture_path = Rails.root.join('spec/fixtures/files/mail_with_no_date.eml')
+      eml_content = File.read(fixture_path)
+      inbound_mail_with_no_date = create_inbound_email_from_fixture('mail_with_no_date.eml')
+      email_header = Net::IMAP::FetchData.new(1, 'BODY[HEADER]' => eml_content)
+      imap_fetch_mail = Net::IMAP::FetchData.new(1, 'RFC822' => eml_content)
 
       imap = double
-
       allow(Net::IMAP).to receive(:new).and_return(imap)
       allow(imap).to receive(:authenticate)
       allow(imap).to receive(:select)
       allow(imap).to receive(:search).and_return([1])
-      allow(imap).to receive(:fetch).and_return([imap_fetch_mail])
-
-      allow(Mail).to receive(:read_from_string).and_return(inbound_mail_with_no_date.mail)
+      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])
 
       imap_mailbox = double
 
diff --git a/spec/jobs/internal/check_new_versions_job_spec.rb b/spec/jobs/internal/check_new_versions_job_spec.rb
index 3d36c4ba7..82424e202 100644
--- a/spec/jobs/internal/check_new_versions_job_spec.rb
+++ b/spec/jobs/internal/check_new_versions_job_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Internal::CheckNewVersionsJob do
   subject(:job) { described_class.perform_now }
 
   it 'updates the latest chatwoot version in redis' do
-    data = { 'version' => '1.2.3' }.to_json
+    data = { 'version' => '1.2.3' }
     allow(Rails.env).to receive(:production?).and_return(true)
     allow(ChatwootHub).to receive(:sync_with_hub).and_return(data)
     job
diff --git a/spec/jobs/mutex_application_job_spec.rb b/spec/jobs/mutex_application_job_spec.rb
index 919195c32..b62db00f0 100644
--- a/spec/jobs/mutex_application_job_spec.rb
+++ b/spec/jobs/mutex_application_job_spec.rb
@@ -4,16 +4,6 @@ RSpec.describe MutexApplicationJob do
   let(:lock_manager) { instance_double(Redis::LockManager) }
   let(:lock_key) { 'test_key' }
 
-  let(:test_mutex_job_class) do
-    stub_const('TestMutexJob', Class.new(MutexApplicationJob) do
-      def perform
-        with_lock('test_key') do
-          # Do nothing
-        end
-      end
-    end)
-  end
-
   before do
     allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
     allow(lock_manager).to receive(:lock).and_return(true)
@@ -22,24 +12,43 @@ RSpec.describe MutexApplicationJob do
 
   describe '#with_lock' do
     it 'acquires the lock and yields the block if lock is not acquired' do
-      expect(lock_manager).to receive(:lock).with(lock_key).and_return(true)
+      expect(lock_manager).to receive(:lock).with(lock_key, Redis::LockManager::LOCK_TIMEOUT).and_return(true)
       expect(lock_manager).to receive(:unlock).with(lock_key).and_return(true)
 
       expect { |b| described_class.new.send(:with_lock, lock_key, &b) }.to yield_control
     end
 
+    it 'acquires the lock with custom timeout' do
+      expect(lock_manager).to receive(:lock).with(lock_key, 5.seconds).and_return(true)
+      expect(lock_manager).to receive(:unlock).with(lock_key).and_return(true)
+
+      expect { |b| described_class.new.send(:with_lock, lock_key, 5.seconds, &b) }.to yield_control
+    end
+
     it 'raises LockAcquisitionError if it cannot acquire the lock' do
-      allow(lock_manager).to receive(:lock).with(lock_key).and_return(false)
+      allow(lock_manager).to receive(:lock).with(lock_key, Redis::LockManager::LOCK_TIMEOUT).and_return(false)
 
       expect do
         described_class.new.send(:with_lock, lock_key) do
           # Do nothing
         end
       end.to raise_error(MutexApplicationJob::LockAcquisitionError)
+      expect(lock_manager).not_to receive(:unlock)
+    end
+
+    it 'raises StandardError if it execution raises it' do
+      allow(lock_manager).to receive(:lock).with(lock_key, Redis::LockManager::LOCK_TIMEOUT).and_return(false)
+      allow(lock_manager).to receive(:unlock).with(lock_key).and_return(true)
+
+      expect do
+        described_class.new.send(:with_lock, lock_key) do
+          raise StandardError
+        end
+      end.to raise_error(StandardError)
     end
 
     it 'ensures that the lock is released even if there is an error during block execution' do
-      expect(lock_manager).to receive(:lock).with(lock_key).and_return(true)
+      expect(lock_manager).to receive(:lock).with(lock_key, Redis::LockManager::LOCK_TIMEOUT).and_return(true)
       expect(lock_manager).to receive(:unlock).with(lock_key).and_return(true)
 
       expect do
diff --git a/spec/jobs/notification/delete_notification_job_spec.rb b/spec/jobs/notification/delete_notification_job_spec.rb
new file mode 100644
index 000000000..194a24732
--- /dev/null
+++ b/spec/jobs/notification/delete_notification_job_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+RSpec.describe Notification::DeleteNotificationJob do
+  let(:user) { create(:user) }
+  let(:conversation) { create(:conversation) }
+
+  context 'when enqueuing the job' do
+    it 'enqueues the job to delete all notifications' do
+      expect do
+        described_class.perform_later(user.id, type: :all)
+      end.to have_enqueued_job(described_class).on_queue('low')
+    end
+
+    it 'enqueues the job to delete read notifications' do
+      expect do
+        described_class.perform_later(user.id, type: :read)
+      end.to have_enqueued_job(described_class).on_queue('low')
+    end
+  end
+
+  context 'when performing the job' do
+    before do
+      create(:notification, user: user, read_at: nil)
+      create(:notification, user: user, read_at: Time.current)
+    end
+
+    it 'deletes all notifications' do
+      described_class.perform_now(user, type: :all)
+      expect(user.notifications.count).to eq(0)
+    end
+
+    it 'deletes only read notifications' do
+      described_class.perform_now(user, type: :read)
+      expect(user.notifications.count).to eq(1)
+      expect(user.notifications.where(read_at: nil).count).to eq(1)
+    end
+  end
+end
diff --git a/spec/jobs/trigger_scheduled_items_job_spec.rb b/spec/jobs/trigger_scheduled_items_job_spec.rb
index c3f34dfeb..ec1f72015 100644
--- a/spec/jobs/trigger_scheduled_items_job_spec.rb
+++ b/spec/jobs/trigger_scheduled_items_job_spec.rb
@@ -10,6 +10,31 @@ RSpec.describe TriggerScheduledItemsJob do
       .on_queue('scheduled_jobs')
   end
 
+  it 'triggers Conversations::ReopenSnoozedConversationsJob' do
+    expect(Conversations::ReopenSnoozedConversationsJob).to receive(:perform_later).once
+    described_class.perform_now
+  end
+
+  it 'triggers Notification::ReopenSnoozedNotificationsJob' do
+    expect(Notification::ReopenSnoozedNotificationsJob).to receive(:perform_later).once
+    described_class.perform_now
+  end
+
+  it 'triggers Account::ConversationsResolutionSchedulerJob' do
+    expect(Account::ConversationsResolutionSchedulerJob).to receive(:perform_later).once
+    described_class.perform_now
+  end
+
+  it 'triggers Channels::Whatsapp::TemplatesSyncSchedulerJob' do
+    expect(Channels::Whatsapp::TemplatesSyncSchedulerJob).to receive(:perform_later).once
+    described_class.perform_now
+  end
+
+  it 'triggers Notification::RemoveOldNotificationJob' do
+    expect(Notification::RemoveOldNotificationJob).to receive(:perform_later).once
+    described_class.perform_now
+  end
+
   context 'when unexecuted Scheduled campaign jobs' do
     let!(:twilio_sms) { create(:channel_twilio_sms) }
     let!(:twilio_inbox) { create(:inbox, channel: twilio_sms) }
@@ -20,30 +45,5 @@ RSpec.describe TriggerScheduledItemsJob do
       expect(Campaigns::TriggerOneoffCampaignJob).to receive(:perform_later).with(campaign).once
       described_class.perform_now
     end
-
-    it 'triggers Conversations::ReopenSnoozedConversationsJob' do
-      expect(Conversations::ReopenSnoozedConversationsJob).to receive(:perform_later).once
-      described_class.perform_now
-    end
-
-    it 'triggers Notification::ReopenSnoozedNotificationsJob' do
-      expect(Notification::ReopenSnoozedNotificationsJob).to receive(:perform_later).once
-      described_class.perform_now
-    end
-
-    it 'triggers Account::ConversationsResolutionSchedulerJob' do
-      expect(Account::ConversationsResolutionSchedulerJob).to receive(:perform_later).once
-      described_class.perform_now
-    end
-
-    it 'triggers Channels::Whatsapp::TemplatesSyncSchedulerJob' do
-      expect(Channels::Whatsapp::TemplatesSyncSchedulerJob).to receive(:perform_later).once
-      described_class.perform_now
-    end
-
-    it 'triggers Notification::RemoveOldNotificationJob' do
-      expect(Notification::RemoveOldNotificationJob).to receive(:perform_later).once
-      described_class.perform_now
-    end
   end
 end
diff --git a/spec/jobs/webhooks/instagram_events_job_spec.rb b/spec/jobs/webhooks/instagram_events_job_spec.rb
index e77d654cc..84bff722b 100644
--- a/spec/jobs/webhooks/instagram_events_job_spec.rb
+++ b/spec/jobs/webhooks/instagram_events_job_spec.rb
@@ -43,7 +43,7 @@ describe Webhooks::InstagramEventsJob do
         instagram_inbox.reload
 
         expect(instagram_inbox.contacts.count).to be 1
-        expect(instagram_inbox.contacts.last.additional_attributes['social_profiles']['instagram']).to eq 'some_user_name'
+        expect(instagram_inbox.contacts.last.additional_attributes['social_instagram_user_name']).to eq 'some_user_name'
         expect(instagram_inbox.conversations.count).to be 1
         expect(instagram_inbox.messages.count).to be 1
         expect(instagram_inbox.messages.last.content_attributes['is_unsupported']).to be_nil
@@ -59,7 +59,7 @@ describe Webhooks::InstagramEventsJob do
         instagram_inbox.reload
 
         expect(instagram_inbox.contacts.count).to be 1
-        expect(instagram_inbox.contacts.last.additional_attributes['social_profiles']['instagram']).to eq 'some_user_name'
+        expect(instagram_inbox.contacts.last.additional_attributes['social_instagram_user_name']).to eq 'some_user_name'
         expect(instagram_inbox.conversations.count).to be 1
         expect(instagram_inbox.messages.count).to be 1
 
@@ -170,7 +170,7 @@ describe Webhooks::InstagramEventsJob do
         instagram_inbox.reload
 
         expect(instagram_inbox.contacts.count).to be 1
-        expect(instagram_inbox.contacts.last.additional_attributes['social_profiles']['instagram']).to eq 'some_user_name'
+        expect(instagram_inbox.contacts.last.additional_attributes['social_instagram_user_name']).to eq 'some_user_name'
         expect(instagram_inbox.conversations.count).to be 1
         expect(instagram_inbox.messages.count).to be 1
         expect(instagram_inbox.messages.last.content_attributes['is_unsupported']).to be true
diff --git a/spec/jobs/webhooks/whatsapp_events_job_spec.rb b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
index 8a7e783ad..1b7ec172f 100644
--- a/spec/jobs/webhooks/whatsapp_events_job_spec.rb
+++ b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
@@ -146,6 +146,61 @@ RSpec.describe Webhooks::WhatsappEventsJob do
       end.not_to change(Message, :count)
     end
 
+    it 'ignore reaction type message, would not create contact if the reaction is the first event' do
+      other_channel = create(:channel_whatsapp, phone_number: '+1987654', provider: 'whatsapp_cloud', sync_templates: false,
+                                                validate_provider_config: false)
+      wb_params = {
+        phone_number: channel.phone_number,
+        object: 'whatsapp_business_account',
+        entry: [{
+          changes: [{
+            value: {
+              contacts: [{ profile: { name: 'Test Test' }, wa_id: '1111981136571' }],
+              messages: [{
+                from: '1111981136571', reaction: { emoji: '👍' }, timestamp: '1664799904', type: 'reaction'
+              }],
+              metadata: {
+                phone_number_id: other_channel.provider_config['phone_number_id'],
+                display_phone_number: other_channel.phone_number.delete('+')
+              }
+            }
+          }]
+        }]
+      }.with_indifferent_access
+      expect do
+        Whatsapp::IncomingMessageWhatsappCloudService.new(inbox: other_channel.inbox, params: wb_params).perform
+      end.not_to change(Contact, :count)
+    end
+
+    it 'ignore request_welcome type message, would not create contact or conversation' do
+      other_channel = create(:channel_whatsapp, phone_number: '+1987654', provider: 'whatsapp_cloud', sync_templates: false,
+                                                validate_provider_config: false)
+      wb_params = {
+        phone_number: channel.phone_number,
+        object: 'whatsapp_business_account',
+        entry: [{
+          changes: [{
+            value: {
+              messages: [{
+                from: '1111981136571', timestamp: '1664799904', type: 'request_welcome'
+              }],
+              metadata: {
+                phone_number_id: other_channel.provider_config['phone_number_id'],
+                display_phone_number: other_channel.phone_number.delete('+')
+              }
+            }
+          }]
+        }]
+      }.with_indifferent_access
+      expect do
+        Whatsapp::IncomingMessageWhatsappCloudService.new(inbox: other_channel.inbox, params: wb_params).perform
+      end.not_to change(Contact, :count)
+
+      expect do
+        Whatsapp::IncomingMessageWhatsappCloudService.new(inbox: other_channel.inbox, params: wb_params).perform
+      end.not_to change(Conversation, :count)
+    end
+
     it 'will not enque Whatsapp::IncomingMessageWhatsappCloudService when invalid phone number id' do
       other_channel = create(:channel_whatsapp, phone_number: '+1987654', provider: 'whatsapp_cloud', sync_templates: false,
                                                 validate_provider_config: false)
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index 6275c8dc3..5802ce00a 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -152,6 +152,27 @@ describe ActionCableListener do
     end
   end
 
+  describe '#notification_updated' do
+    let(:event_name) { :'notification.updated' }
+    let!(:notification) { create(:notification, account: account, user: agent) }
+    let!(:event) { Events::Base.new(event_name, Time.zone.now, notification: notification) }
+
+    it 'sends notification to account admins, inbox agents' do
+      expect(ActionCableBroadcastJob).to receive(:perform_later).with(
+        [agent.pubsub_token],
+        'notification.updated',
+        {
+          account_id: notification.account_id,
+          notification: notification.push_event_data,
+          unread_count: 1,
+          count: 1
+        }
+      )
+
+      listener.notification_updated(event)
+    end
+  end
+
   describe '#conversation_updated' do
     let(:event_name) { :'conversation.updated' }
     let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: agent, is_private: false) }
diff --git a/spec/listeners/notification_listener_spec.rb b/spec/listeners/notification_listener_spec.rb
index 4eb82d6f0..1505b0f57 100644
--- a/spec/listeners/notification_listener_spec.rb
+++ b/spec/listeners/notification_listener_spec.rb
@@ -119,4 +119,40 @@ describe NotificationListener do
       end
     end
   end
+
+  describe 'conversation_bot_handoff' do
+    let(:event_name) { :'conversation.bot_handoff' }
+
+    context 'when conversation is bot handoff' do
+      it 'creates notifications for inbox members who have notifications turned on' do
+        notification_setting = first_agent.notification_settings.first
+        notification_setting.selected_email_flags = [:email_conversation_creation]
+        notification_setting.selected_push_flags = []
+        notification_setting.save!
+
+        create(:inbox_member, user: first_agent, inbox: inbox)
+        conversation.reload
+
+        event = Events::Base.new(event_name, Time.zone.now, conversation: conversation)
+
+        listener.conversation_bot_handoff(event)
+        expect(notification_setting.user.notifications.count).to eq(1)
+      end
+
+      it 'does not create notification for inbox members who have notifications turned off' do
+        notification_setting = agent_with_out_notification.notification_settings.first
+        notification_setting.unselect_all_email_flags
+        notification_setting.unselect_all_push_flags
+        notification_setting.save!
+
+        create(:inbox_member, user: agent_with_out_notification, inbox: inbox)
+        conversation.reload
+
+        event = Events::Base.new(event_name, Time.zone.now, conversation: conversation)
+
+        listener.conversation_bot_handoff(event)
+        expect(notification_setting.user.notifications.count).to eq(0)
+      end
+    end
+  end
 end
diff --git a/spec/mailers/confirmation_instructions_spec.rb b/spec/mailers/confirmation_instructions_spec.rb
index 7c6fd8e6c..484001957 100644
--- a/spec/mailers/confirmation_instructions_spec.rb
+++ b/spec/mailers/confirmation_instructions_spec.rb
@@ -2,8 +2,8 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Confirmation Instructions' do
-  describe :notify do
+RSpec.describe 'Devise::Mailer' do
+  describe 'notify' do
     let(:account) { create(:account) }
     let!(:confirmable_user) { create(:user, inviter: inviter_val, account: account) }
     let(:inviter_val) { nil }
@@ -26,7 +26,7 @@ RSpec.describe 'Confirmation Instructions' do
     end
 
     it 'does not refer to the inviter and their account' do
-      expect(mail.body).to_not match('has invited you to try out Chatwoot!')
+      expect(mail.body).not_to match('has invited you to try out Chatwoot!')
       expect(mail.body).to match('We have a suite of powerful tools ready for you to explore.')
     end
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 86a7e6a5d..8f9ba7d2c 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -3,7 +3,6 @@
 require 'rails_helper'
 
 RSpec.describe Account do
-  it { is_expected.to validate_presence_of(:name) }
   it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_greater_than_or_equal_to(1) }
   it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_less_than_or_equal_to(999) }
 
diff --git a/spec/models/concerns/cache_keys_spec.rb b/spec/models/concerns/cache_keys_spec.rb
index 51d3c8b7a..33f2dc6b7 100644
--- a/spec/models/concerns/cache_keys_spec.rb
+++ b/spec/models/concerns/cache_keys_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe CacheKeys do
   before do
     allow(Redis::Alfred).to receive(:delete)
     allow(Redis::Alfred).to receive(:set)
+    allow(Redis::Alfred).to receive(:setex)
     allow(Rails.configuration.dispatcher).to receive(:dispatch)
   end
 
@@ -27,28 +28,11 @@ RSpec.describe CacheKeys do
     end
   end
 
-  describe '#invalidate_cache_key_for' do
-    it 'deletes the cache key' do
-      test_model.invalidate_cache_key_for('label')
-      expect(Redis::Alfred).to have_received(:delete).with('idb-cache-key-account-1-label')
-    end
-
-    it 'dispatches a cache update event' do
-      test_model.invalidate_cache_key_for('label')
-      expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
-        CacheKeys::ACCOUNT_CACHE_INVALIDATED,
-        kind_of(ActiveSupport::TimeWithZone),
-        cache_keys: test_model.cache_keys,
-        account: test_model
-      )
-    end
-  end
-
   describe '#update_cache_key' do
     it 'updates the cache key' do
       allow(Time).to receive(:now).and_return(Time.parse('2023-05-29 00:00:00 UTC'))
       test_model.update_cache_key('label')
-      expect(Redis::Alfred).to have_received(:set).with('idb-cache-key-account-1-label', Time.now.utc.to_i)
+      expect(Redis::Alfred).to have_received(:setex).with('idb-cache-key-account-1-label', kind_of(Integer), CacheKeys::CACHE_KEYS_EXPIRY)
     end
 
     it 'dispatches a cache update event' do
@@ -66,8 +50,20 @@ RSpec.describe CacheKeys do
     it 'invalidates all cache keys for cacheable models' do
       test_model.reset_cache_keys
       test_model.class.cacheable_models.each do |model|
-        expect(Redis::Alfred).to have_received(:delete).with("idb-cache-key-account-1-#{model.name.underscore}")
+        expect(Redis::Alfred).to have_received(:setex).with("idb-cache-key-account-1-#{model.name.underscore}", kind_of(Integer),
+                                                            CacheKeys::CACHE_KEYS_EXPIRY)
       end
     end
+
+    it 'dispatches a cache update event' do
+      test_model.reset_cache_keys
+
+      expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+        CacheKeys::ACCOUNT_CACHE_INVALIDATED,
+        kind_of(ActiveSupport::TimeWithZone),
+        cache_keys: test_model.cache_keys,
+        account: test_model
+      )
+    end
   end
 end
diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb
index 64095a830..7029c89fe 100644
--- a/spec/models/contact_spec.rb
+++ b/spec/models/contact_spec.rb
@@ -5,11 +5,11 @@ require 'rails_helper'
 require Rails.root.join 'spec/models/concerns/avatarable_shared.rb'
 
 RSpec.describe Contact do
-  context 'validations' do
+  context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
   end
 
-  context 'associations' do
+  context 'with associations' do
     it { is_expected.to belong_to(:account) }
     it { is_expected.to have_many(:conversations).dependent(:destroy_async) }
   end
@@ -18,7 +18,7 @@ RSpec.describe Contact do
     it_behaves_like 'avatarable'
   end
 
-  context 'prepare contact attributes before validation' do
+  context 'when prepare contact attributes before validation' do
     it 'sets email to lowercase' do
       contact = create(:contact, email: 'Test@test.com')
       expect(contact.email).to eq('test@test.com')
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 82dac1979..efeda965d 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -115,7 +115,7 @@ RSpec.describe Conversation do
     let!(:conversation) do
       create(:conversation, status: 'open', account: account, assignee: old_assignee)
     end
-    let(:assignment_mailer) { double(deliver: true) }
+    let(:assignment_mailer) { instance_double(AssignmentMailer, deliver: true) }
     let(:label) { create(:label, account: account) }
 
     before do
@@ -142,7 +142,7 @@ RSpec.describe Conversation do
     it 'runs after_update callbacks' do
       conversation.update(
         status: :resolved,
-        contact_last_seen_at: Time.now,
+        contact_last_seen_at: Time.zone.now,
         assignee: new_assignee
       )
       status_change = conversation.status_change
@@ -193,7 +193,7 @@ RSpec.describe Conversation do
     it 'creates conversation activities' do
       conversation.update(
         status: :resolved,
-        contact_last_seen_at: Time.now,
+        contact_last_seen_at: Time.zone.now,
         assignee: new_assignee,
         label_list: [label.title]
       )
@@ -611,7 +611,7 @@ RSpec.describe Conversation do
             account: conversation.account,
             inbox: facebook_inbox,
             conversation: conversation,
-            created_at: Time.now - 48.hours
+            created_at: 48.hours.ago
           )
 
           expect(conversation.can_reply?).to be true
@@ -626,7 +626,7 @@ RSpec.describe Conversation do
             account: conversation.account,
             inbox: facebook_inbox,
             conversation: conversation,
-            created_at: Time.now - 48.hours
+            created_at: 48.hours.ago
           )
 
           expect(conversation.can_reply?).to be false
@@ -646,7 +646,7 @@ RSpec.describe Conversation do
             account: conversation.account,
             inbox: api_channel.inbox,
             conversation: conversation,
-            created_at: Time.now - 13.hours
+            created_at: 13.hours.ago
           )
 
           expect(api_channel.additional_attributes['agent_reply_time_window']).to be_nil
@@ -662,7 +662,7 @@ RSpec.describe Conversation do
             account: conversation.account,
             inbox: api_channel_with_limit.inbox,
             conversation: conversation,
-            created_at: Time.now - 13.hours
+            created_at: 13.hours.ago
           )
 
           expect(api_channel_with_limit.additional_attributes['agent_reply_time_window']).to eq '12'
diff --git a/spec/models/inbox_spec.rb b/spec/models/inbox_spec.rb
index 8bcb6bcd5..2a56d1fbc 100644
--- a/spec/models/inbox_spec.rb
+++ b/spec/models/inbox_spec.rb
@@ -250,5 +250,15 @@ RSpec.describe Inbox do
           cache_keys: inbox.account.cache_keys
         )
     end
+
+    it 'updates the cache key after update' do
+      expect(inbox.account).to receive(:update_cache_key).with('inbox')
+      inbox.update(name: 'New Name')
+    end
+
+    it 'updates the cache key after touch' do
+      expect(inbox.account).to receive(:update_cache_key).with('inbox')
+      inbox.touch # rubocop:disable Rails/SkipsModelValidations
+    end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index f38b3db0b..c740c67fb 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -7,13 +7,11 @@ require Rails.root.join 'spec/models/concerns/avatarable_shared.rb'
 RSpec.describe User do
   let!(:user) { create(:user) }
 
-  context 'validations' do
+  context 'with validations' do
     it { is_expected.to validate_presence_of(:email) }
-    it { is_expected.to validate_presence_of(:name) }
-    it { is_expected.to validate_length_of(:name).is_at_least(1) }
   end
 
-  context 'associations' do
+  context 'with associations' do
     it { is_expected.to have_many(:accounts).through(:account_users) }
     it { is_expected.to have_many(:account_users) }
     it { is_expected.to have_many(:assigned_conversations).class_name('Conversation').dependent(:nullify) }
@@ -35,7 +33,7 @@ RSpec.describe User do
     it { expect(user.pubsub_token).not_to be_nil }
     it { expect(user.saved_changes.keys).not_to eq('pubsub_token') }
 
-    context 'rotates the pubsub_token' do
+    context 'with rotate the pubsub_token' do
       it 'changes the pubsub_token when password changes' do
         pubsub_token = user.pubsub_token
         user.password = Faker::Internet.password(special_characters: true)
@@ -70,7 +68,7 @@ RSpec.describe User do
     end
   end
 
-  context 'sso_auth_token' do
+  context 'with sso_auth_token' do
     it 'can generate multiple sso tokens which can be validated' do
       sso_auth_token1 = user.generate_sso_auth_token
       sso_auth_token2 = user.generate_sso_auth_token
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index 59a9bfea8..2fcea8b72 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -90,6 +90,24 @@ describe Facebook::SendOnFacebookService do
                                                     }, { page_id: facebook_channel.page_id })
       end
 
+      it 'if message is sent with multiple attachments' do
+        message = build(:message, content: nil, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
+        avatar = message.attachments.new(account_id: message.account_id, file_type: :image)
+        avatar.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+        sample = message.attachments.new(account_id: message.account_id, file_type: :image)
+        sample.file.attach(io: Rails.root.join('spec/assets/sample.png').open, filename: 'sample.png', content_type: 'image/png')
+        message.save!
+
+        service = described_class.new(message: message)
+
+        # Stub the send_to_facebook_page method on the service instance
+        allow(service).to receive(:send_message_to_facebook)
+        service.perform
+
+        # Now you can set expectations on the stubbed method for each attachment
+        expect(service).to have_received(:send_message_to_facebook).exactly(:twice)
+      end
+
       it 'if message sent from chatwoot is failed' do
         message = create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
         allow(bot).to receive(:deliver).and_return({ error: { message: 'Invalid OAuth access token.', type: 'OAuthException', code: 190,
diff --git a/spec/services/instagram/send_on_instagram_service_spec.rb b/spec/services/instagram/send_on_instagram_service_spec.rb
index f95d452eb..8900171f3 100644
--- a/spec/services/instagram/send_on_instagram_service_spec.rb
+++ b/spec/services/instagram/send_on_instagram_service_spec.rb
@@ -50,7 +50,25 @@ describe Instagram::SendOnInstagramService do
 
           response = described_class.new(message: message).perform
 
-          expect(response).to eq({  message_id: 'anyrandommessageid1234567890' })
+          expect(response).to eq({ message_id: 'anyrandommessageid1234567890' })
+        end
+
+        it 'if message is sent from chatwoot and is outgoing with multiple attachments' do
+          message = build(:message, content: nil, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
+          avatar = message.attachments.new(account_id: message.account_id, file_type: :image)
+          avatar.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+          sample = message.attachments.new(account_id: message.account_id, file_type: :image)
+          sample.file.attach(io: Rails.root.join('spec/assets/sample.png').open, filename: 'sample.png', content_type: 'image/png')
+          message.save!
+
+          service = described_class.new(message: message)
+
+          # Stub the send_to_facebook_page method on the service instance
+          allow(service).to receive(:send_to_facebook_page)
+          service.perform
+
+          # Now you can set expectations on the stubbed method for each attachment
+          expect(service).to have_received(:send_to_facebook_page).exactly(:twice)
         end
 
         it 'if message with attachment is sent from chatwoot and is outgoing' do
diff --git a/spec/services/line/incoming_message_service_spec.rb b/spec/services/line/incoming_message_service_spec.rb
index 0547cfbd0..037aa18fa 100644
--- a/spec/services/line/incoming_message_service_spec.rb
+++ b/spec/services/line/incoming_message_service_spec.rb
@@ -157,6 +157,7 @@ describe Line::IncomingMessageService do
         described_class.new(inbox: line_channel.inbox, params: params).perform
         expect(line_channel.inbox.conversations).not_to eq(0)
         expect(Contact.all.first.name).to eq('LINE Test')
+        expect(Contact.all.first.additional_attributes['social_line_user_id']).to eq('U4af4980629')
         expect(line_channel.inbox.messages.first.content).to eq('Hello, world')
       end
     end
@@ -204,6 +205,7 @@ describe Line::IncomingMessageService do
         described_class.new(inbox: line_channel.inbox, params: image_params).perform
         expect(line_channel.inbox.conversations).not_to eq(0)
         expect(Contact.all.first.name).to eq('LINE Test')
+        expect(Contact.all.first.additional_attributes['social_line_user_id']).to eq('U4af4980629')
         expect(line_channel.inbox.messages.first.content).to be_nil
         expect(line_channel.inbox.messages.first.attachments.first.file_type).to eq('image')
         expect(line_channel.inbox.messages.first.attachments.first.file.blob.filename.to_s).to eq('media-354718.png')
@@ -233,6 +235,7 @@ describe Line::IncomingMessageService do
         described_class.new(inbox: line_channel.inbox, params: video_params).perform
         expect(line_channel.inbox.conversations).not_to eq(0)
         expect(Contact.all.first.name).to eq('LINE Test')
+        expect(Contact.all.first.additional_attributes['social_line_user_id']).to eq('U4af4980629')
         expect(line_channel.inbox.messages.first.content).to be_nil
         expect(line_channel.inbox.messages.first.attachments.first.file_type).to eq('video')
         expect(line_channel.inbox.messages.first.attachments.first.file.blob.filename.to_s).to eq('media-354718.mp4')
diff --git a/spec/services/microsoft/refresh_oauth_token_service_spec.rb b/spec/services/microsoft/refresh_oauth_token_service_spec.rb
index 5218d388b..346db70d8 100644
--- a/spec/services/microsoft/refresh_oauth_token_service_spec.rb
+++ b/spec/services/microsoft/refresh_oauth_token_service_spec.rb
@@ -1,51 +1,87 @@
 require 'rails_helper'
 
 RSpec.describe Microsoft::RefreshOauthTokenService do
-  let(:access_token) { SecureRandom.hex }
-  let(:refresh_token) { SecureRandom.hex }
-  let(:expires_on) { Time.zone.now + 3600 }
-
-  let!(:microsoft_email_channel) do
-    create(:channel_email, provider_config: { access_token: access_token, refresh_token: refresh_token, expires_on: expires_on })
+  let!(:microsoft_channel) { create(:channel_email, :microsoft_email) }
+  let!(:microsoft_channel_with_expired_token) do
+    create(
+      :channel_email, :microsoft_email, provider_config: {
+        expires_on: Time.zone.now - 3600,
+        access_token: SecureRandom.hex,
+        refresh_token: SecureRandom.hex
+      }
+    )
   end
-  let(:new_tokens) { { access_token: access_token, refresh_token: refresh_token, expires_at: expires_on.to_i, token_type: 'bearer' } }
 
-  describe '#access_token' do
-    context 'when token is not expired' do
-      it 'returns the existing access token' do
-        expect(described_class.new(channel: microsoft_email_channel).access_token).to eq(access_token)
-        expect(microsoft_email_channel.reload.provider_config['refresh_token']).to eq(refresh_token)
-      end
+  let(:new_tokens) do
+    {
+      access_token: SecureRandom.hex,
+      refresh_token: SecureRandom.hex,
+      expires_at: (Time.zone.now + 3600).to_i,
+      token_type: 'bearer'
+    }
+  end
+
+  context 'when token is not expired' do
+    it 'returns the existing access token' do
+      service = described_class.new(channel: microsoft_channel)
+
+      expect(service.access_token).to eq(microsoft_channel.provider_config['access_token'])
+      expect(microsoft_channel.reload.provider_config['refresh_token']).to eq(microsoft_channel.provider_config['refresh_token'])
+    end
+  end
+
+  describe 'on expired token or invalid expiry' do
+    before do
+      stub_request(:post, 'https://login.microsoftonline.com/common/oauth2/v2.0/token').with(
+        body: { 'grant_type' => 'refresh_token', 'refresh_token' => microsoft_channel_with_expired_token.provider_config['refresh_token'] }
+      ).to_return(status: 200, body: new_tokens.to_json, headers: { 'Content-Type' => 'application/json' })
     end
 
-    context 'when token is expired' do
-      let(:expires_on) { 1.minute.from_now }
-
-      before do
-        stub_request(:post, 'https://login.microsoftonline.com/common/oauth2/v2.0/token').with(
-          body: { 'grant_type' => 'refresh_token', 'refresh_token' => refresh_token }
-        ).to_return(status: 200, body: new_tokens.to_json, headers: { 'Content-Type' => 'application/json' })
-      end
-
+    context 'when token is invalid' do
       it 'fetches new access token and refresh tokens' do
-        microsoft_email_channel.provider_config['expires_on'] = Time.zone.now - 3600
-        microsoft_email_channel.save!
+        with_modified_env AZURE_APP_ID: SecureRandom.uuid, AZURE_APP_SECRET: SecureRandom.hex do
+          provider_config = microsoft_channel_with_expired_token.provider_config
+          service = described_class.new(channel: microsoft_channel_with_expired_token)
+          expect(service.access_token).not_to eq(provider_config['access_token'])
 
-        expect(described_class.new(channel: microsoft_email_channel).access_token).not_to eq(access_token)
-        expect(microsoft_email_channel.reload.provider_config['access_token']).to eq(new_tokens[:access_token])
-        expect(microsoft_email_channel.reload.provider_config['refresh_token']).to eq(new_tokens[:refresh_token])
-        expect(microsoft_email_channel.reload.provider_config['expires_on']).to eq(Time.at(new_tokens[:expires_at]).utc.to_s)
+          new_provider_config = microsoft_channel_with_expired_token.reload.provider_config
+          expect(new_provider_config['access_token']).to eq(new_tokens[:access_token])
+          expect(new_provider_config['refresh_token']).to eq(new_tokens[:refresh_token])
+          expect(new_provider_config['expires_on']).to eq(Time.at(new_tokens[:expires_at]).utc.to_s)
+        end
       end
     end
 
-    context 'when refresh token is not present in provider config and access token is expired' do
-      it 'throws an error' do
-        microsoft_email_channel.update(provider_config: {
-                                         access_token: access_token,
-                                         expires_on: expires_on - 3600
-                                       })
+    context 'when expiry time is missing' do
+      it 'fetches new access token and refresh tokens' do
+        with_modified_env AZURE_APP_ID: SecureRandom.uuid, AZURE_APP_SECRET: SecureRandom.hex do
+          microsoft_channel_with_expired_token.provider_config['expires_on'] = nil
+          microsoft_channel_with_expired_token.save!
+          provider_config = microsoft_channel_with_expired_token.provider_config
+          service = described_class.new(channel: microsoft_channel_with_expired_token)
+          expect(service.access_token).not_to eq(provider_config['access_token'])
+
+          new_provider_config = microsoft_channel_with_expired_token.reload.provider_config
+          expect(new_provider_config['access_token']).to eq(new_tokens[:access_token])
+          expect(new_provider_config['refresh_token']).to eq(new_tokens[:refresh_token])
+          expect(new_provider_config['expires_on']).to eq(Time.at(new_tokens[:expires_at]).utc.to_s)
+        end
+      end
+    end
+  end
+
+  context 'when refresh token is not present in provider config and access token is expired' do
+    it 'throws an error' do
+      with_modified_env AZURE_APP_ID: SecureRandom.uuid, AZURE_APP_SECRET: SecureRandom.hex do
+        microsoft_channel.update(
+          provider_config: {
+            access_token: SecureRandom.hex,
+            expires_on: Time.zone.now - 3600
+          }
+        )
+
         expect do
-          described_class.new(channel: microsoft_email_channel).access_token
+          described_class.new(channel: microsoft_channel).access_token
         end.to raise_error(RuntimeError, 'A refresh_token is not available')
       end
     end
diff --git a/spec/services/telegram/incoming_message_service_spec.rb b/spec/services/telegram/incoming_message_service_spec.rb
index c169f33fc..795202894 100644
--- a/spec/services/telegram/incoming_message_service_spec.rb
+++ b/spec/services/telegram/incoming_message_service_spec.rb
@@ -65,6 +65,8 @@ describe Telegram::IncomingMessageService do
         described_class.new(inbox: telegram_channel.inbox, params: params).perform
         expect(telegram_channel.inbox.conversations.count).not_to eq(0)
         expect(Contact.all.first.name).to eq('Sojan Jose')
+        expect(Contact.all.first.additional_attributes['social_telegram_user_id']).to eq(23)
+        expect(Contact.all.first.additional_attributes['social_telegram_user_name']).to eq('sojan')
         expect(telegram_channel.inbox.messages.first.content).to eq('test')
       end
     end
@@ -105,6 +107,8 @@ describe Telegram::IncomingMessageService do
         described_class.new(inbox: telegram_channel.inbox, params: params).perform
         expect(telegram_channel.inbox.conversations.count).not_to eq(0)
         expect(Contact.all.first.name).to eq('Sojan Jose')
+        expect(Contact.all.first.additional_attributes['social_telegram_user_id']).to eq(23)
+        expect(Contact.all.first.additional_attributes['social_telegram_user_name']).to eq('sojan')
         expect(telegram_channel.inbox.messages.first.attachments.first.file_type).to eq('audio')
       end
     end
@@ -277,6 +281,7 @@ describe Telegram::IncomingMessageService do
         described_class.new(inbox: telegram_channel.inbox, params: params).perform
         expect(telegram_channel.inbox.conversations.count).not_to eq(0)
         expect(Contact.all.first.name).to eq('Sojan Jose')
+        expect(Contact.all.first.additional_attributes['social_telegram_user_id']).to eq(5_171_248)
         expect(telegram_channel.inbox.messages.first.content).to eq('Option 1')
       end
     end
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index 114faf953..0bcbf2a3e 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -81,7 +81,7 @@ describe Whatsapp::IncomingMessageService do
     end
 
     context 'when unsupported message types' do
-      it 'ignores type ephemeral' do
+      it 'ignores type ephemeral and does not create ghost conversation' do
         params = {
           'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => '2423423243' }],
           'messages' => [{ 'from' => '2423423243', 'id' => 'SDFADSf23sfasdafasdfa', 'text' => { 'body' => 'Test' },
@@ -89,12 +89,12 @@ describe Whatsapp::IncomingMessageService do
         }.with_indifferent_access
 
         described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
-        expect(whatsapp_channel.inbox.conversations.count).not_to eq(0)
-        expect(Contact.all.first.name).to eq('Sojan Jose')
+        expect(whatsapp_channel.inbox.conversations.count).to eq(0)
+        expect(Contact.count).to eq(0)
         expect(whatsapp_channel.inbox.messages.count).to eq(0)
       end
 
-      it 'ignores type unsupported' do
+      it 'ignores type unsupported and does not create ghost conversation' do
         params = {
           'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => '2423423243' }],
           'messages' => [{
@@ -105,8 +105,8 @@ describe Whatsapp::IncomingMessageService do
         }.with_indifferent_access
 
         described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
-        expect(whatsapp_channel.inbox.conversations.count).not_to eq(0)
-        expect(Contact.all.first.name).to eq('Sojan Jose')
+        expect(whatsapp_channel.inbox.conversations.count).to eq(0)
+        expect(Contact.count).to eq(0)
         expect(whatsapp_channel.inbox.messages.count).to eq(0)
       end
     end
diff --git a/spec/workers/email_reply_worker_spec.rb b/spec/workers/email_reply_worker_spec.rb
index dc2d83e2b..579378918 100644
--- a/spec/workers/email_reply_worker_spec.rb
+++ b/spec/workers/email_reply_worker_spec.rb
@@ -11,34 +11,48 @@ RSpec.describe EmailReplyWorker, type: :worker do
   let(:mailer_action) { double }
 
   describe '#perform' do
-    before do
-      allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
-      allow(mailer).to receive(:email_reply).and_return(mailer_action)
-      allow(mailer_action).to receive(:deliver_later).and_return(true)
+    context 'when emails are successfully sent' do
+      before do
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:email_reply).and_return(mailer_action)
+        allow(mailer_action).to receive(:deliver_now).and_return(true)
+      end
+
+      it 'calls mailer action with message' do
+        described_class.new.perform(message.id)
+        expect(mailer).to have_received(:email_reply).with(message)
+        expect(mailer_action).to have_received(:deliver_now)
+      end
+
+      it 'does not call mailer action with a private message' do
+        described_class.new.perform(private_message.id)
+        expect(mailer).not_to have_received(:email_reply)
+        expect(mailer_action).not_to have_received(:deliver_now)
+      end
+
+      it 'calls mailer action with a CSAT message' do
+        described_class.new.perform(template_message.id)
+        expect(mailer).to have_received(:email_reply).with(template_message)
+        expect(mailer_action).to have_received(:deliver_now)
+      end
+
+      it 'does not call mailer action with an incoming message' do
+        described_class.new.perform(incoming_message.id)
+        expect(mailer).not_to have_received(:email_reply)
+        expect(mailer_action).not_to have_received(:deliver_now)
+      end
     end
 
-    it 'calls mailer action with message' do
-      described_class.new.perform(message.id)
-      expect(mailer).to have_received(:email_reply).with(message)
-      expect(mailer_action).to have_received(:deliver_later)
-    end
+    context 'when emails are not sent' do
+      before do
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:email_reply).and_return(mailer_action)
+        allow(mailer_action).to receive(:deliver_now).and_raise(ArgumentError)
+      end
 
-    it 'does not call mailer action with a private message' do
-      described_class.new.perform(private_message.id)
-      expect(mailer).not_to have_received(:email_reply)
-      expect(mailer_action).not_to have_received(:deliver_later)
-    end
-
-    it 'calls mailer action with a CSAT message' do
-      described_class.new.perform(template_message.id)
-      expect(mailer).to have_received(:email_reply).with(template_message)
-      expect(mailer_action).to have_received(:deliver_later)
-    end
-
-    it 'does not call mailer action with an incoming message' do
-      described_class.new.perform(incoming_message.id)
-      expect(mailer).not_to have_received(:email_reply)
-      expect(mailer_action).not_to have_received(:deliver_later)
+      it 'mark message as failed' do
+        expect { described_class.new.perform(message.id) }.to change { message.reload.status }.from('sent').to('failed')
+      end
     end
   end
 end
diff --git a/swagger/definitions/request/public/message/update_payload.yml b/swagger/definitions/request/public/message/update_payload.yml
index b581d7171..10926faa1 100644
--- a/swagger/definitions/request/public/message/update_payload.yml
+++ b/swagger/definitions/request/public/message/update_payload.yml
@@ -2,19 +2,5 @@
 type: object
 properties:
   submitted_values:
-    oneOf:
-      - type: object
-        description: Replies to the Bot Message Types
-        properties:
-          csat_survey_response:
-            type: object
-            description: CSAT Survey Response if original message is CSAT Survey
-            properties:
-              rating:
-                type: integer
-                description: CSAT Rating
-                example: 5
-              feedback_message:
-                type: string
-                description: CSAT Comment
-                example: 'Great'
+    type: object
+    description: Replies to the Bot Message Types
\ No newline at end of file
diff --git a/swagger/parameters/index.yml b/swagger/parameters/index.yml
index 5dcc1f418..d9cb6872c 100644
--- a/swagger/parameters/index.yml
+++ b/swagger/parameters/index.yml
@@ -51,3 +51,6 @@ public_inbox_identifier:
 
 public_contact_identifier:
   $ref: ./public/contact_identifier.yml
+
+portal_id:
+  $ref: ./portal_id.yml
\ No newline at end of file
diff --git a/swagger/paths/application/contacts/filter.yml b/swagger/paths/application/contacts/filter.yml
index 639784ea5..2a1d53cf7 100644
--- a/swagger/paths/application/contacts/filter.yml
+++ b/swagger/paths/application/contacts/filter.yml
@@ -36,7 +36,7 @@ parameters:
               query_operator:
                 type: string
                 description: query operator name
-              enum: [ AND, OR ]
+                enum: [ AND, OR ]
           example:
             - attribute_key: 'name'
               filter_operator: 'equal_to'
diff --git a/swagger/swagger.json b/swagger/swagger.json
index e42a43efe..9bee2c952 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2154,12 +2154,12 @@
                       },
                       "query_operator": {
                         "type": "string",
-                        "description": "query operator name"
-                      },
-                      "enum": [
-                        "AND",
-                        "OR"
-                      ]
+                        "description": "query operator name",
+                        "enum": [
+                          "AND",
+                          "OR"
+                        ]
+                      }
                     }
                   },
                   "example": [
@@ -6746,30 +6746,8 @@
       "type": "object",
       "properties": {
         "submitted_values": {
-          "oneOf": [
-            {
-              "type": "object",
-              "description": "Replies to the Bot Message Types",
-              "properties": {
-                "csat_survey_response": {
-                  "type": "object",
-                  "description": "CSAT Survey Response if original message is CSAT Survey",
-                  "properties": {
-                    "rating": {
-                      "type": "integer",
-                      "description": "CSAT Rating",
-                      "example": 5
-                    },
-                    "feedback_message": {
-                      "type": "string",
-                      "description": "CSAT Comment",
-                      "example": "Great"
-                    }
-                  }
-                }
-              }
-            }
-          ]
+          "type": "object",
+          "description": "Replies to the Bot Message Types"
         }
       }
     },
@@ -7280,6 +7258,13 @@
       "type": "string",
       "required": true,
       "description": "The source id of contact obtained on contact create"
+    },
+    "portal_id": {
+      "in": "path",
+      "name": "portal_id",
+      "type": "integer",
+      "required": true,
+      "description": "The numeric ID of the portal"
     }
   },
   "x-tagGroups": [
diff --git a/yarn.lock b/yarn.lock
index f07f2ba62..1ab16149d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3854,21 +3854,22 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@june-so/analytics-next@^1.36.5":
-  version "1.36.5"
-  resolved "https://registry.yarnpkg.com/@june-so/analytics-next/-/analytics-next-1.36.5.tgz#030ba5a7f8fa232597185cdb706e40b7036ca7f8"
-  integrity sha512-r2sp4VDngeX/ItQrlgmdKpmghg3OmPvhnTOKJ1huaHbFM2uPELpfnMRRngUVzbgbMoMeTf8QtgQVMjnUsl7G1A==
+"@june-so/analytics-next@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@june-so/analytics-next/-/analytics-next-2.0.0.tgz#979035ce812e768370d409c90b541ef238a3daa8"
+  integrity sha512-7uFP94JLD7mP4qLyOwn5HBs+CC8VlevOkiGd1CIYqPSjSRmbCOI+MVcJNlTAcpyNvMi9iUnWZ3jGVO5177Di4A==
   dependencies:
     "@lukeed/uuid" "^2.0.0"
+    "@segment/analytics-core" "1.2.2"
     "@segment/analytics.js-video-plugins" "^0.2.1"
-    "@segment/facade" "3.4.7"
-    "@segment/tsub" "^0.1.9"
-    dset "^3.0.0"
-    encoding "^0.1.13"
-    js-cookie "^2.2.1"
-    node-fetch "^2.6.1"
+    "@segment/facade" "^3.4.9"
+    "@segment/tsub" "1.0.1"
+    dset "^3.1.2"
+    js-cookie "3.0.1"
+    node-fetch "^2.6.7"
     spark-md5 "^3.0.1"
-    tslib "^2.1.0"
+    tslib "^2.4.1"
+    typescript "^4.9.5"
     unfetch "^4.1.0"
 
 "@lit-labs/ssr-dom-shim@^1.0.0", "@lit-labs/ssr-dom-shim@^1.1.0":
@@ -4068,6 +4069,15 @@
   resolved "https://registry.yarnpkg.com/@scmmishra/pico-search/-/pico-search-0.5.1.tgz#fe10a5615259623bff0095ad9af26e15d84379cb"
   integrity sha512-OKyoGy9f0Y47khEpgP3eLw2aKujJe/ndAE0IbovpsVh210GCmECtl8DLYKL+3abcorX3+e6K8S3eFs2HdH8Ksw==
 
+"@segment/analytics-core@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@segment/analytics-core/-/analytics-core-1.2.2.tgz#46b1465181e089bd75890d37c68c58de36fa6c44"
+  integrity sha512-zVWSDcyh7Rp32xL5v2fuEk2yZxxy+JA93vF1L3EF9XAYLSra/uEHJEswOWieXSdDHVRHes7APORp136usFE/tw==
+  dependencies:
+    "@lukeed/uuid" "^2.0.0"
+    dset "^3.1.2"
+    tslib "^2.4.1"
+
 "@segment/analytics.js-video-plugins@^0.2.1":
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/@segment/analytics.js-video-plugins/-/analytics.js-video-plugins-0.2.1.tgz#3596fa3887dcd9df5978dc566edf4a0aea2a9b1e"
@@ -4075,14 +4085,13 @@
   dependencies:
     unfetch "^3.1.1"
 
-"@segment/facade@3.4.7":
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/@segment/facade/-/facade-3.4.7.tgz#27e469189d45d5a2806d16571722e6b00d81429a"
-  integrity sha512-Tj4aJsdmR9cl7xm7BT0NF9kYOnbIJ/3DdC1yOiLnjQRbHcnOq7WWkMDug/JCSEPF2loxGhG/oTeZybR3hpG3MA==
+"@segment/facade@^3.4.9":
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/@segment/facade/-/facade-3.4.10.tgz#118fab29cf2250d3128f9b2a16d6ec76f86e3710"
+  integrity sha512-xVQBbB/lNvk/u8+ey0kC/+g8pT3l0gCT8O2y9Z+StMMn3KAFAQ9w8xfgef67tJybktOKKU7pQGRPolRM1i1pdA==
   dependencies:
     "@segment/isodate-traverse" "^1.1.1"
     inherits "^2.0.4"
-    klona "^2.0.5"
     new-date "^1.0.3"
     obj-case "0.2.1"
 
@@ -4098,10 +4107,10 @@
   resolved "https://registry.yarnpkg.com/@segment/isodate/-/isodate-1.0.3.tgz#f44e8202d5edd277ce822785239474b2c9411d4a"
   integrity sha512-BtanDuvJqnACFkeeYje7pWULVv8RgZaqKHWwGFnL/g/TH/CcZjkIVTfGDp/MAxmilYHUkrX70SqwnYSTNEaN7A==
 
-"@segment/tsub@^0.1.9":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@segment/tsub/-/tsub-0.1.12.tgz#1c301a8b81e5dbda54eb0435ae808fbe65553f23"
-  integrity sha512-35JB0+HuMZrn7mus/s4yOHAcuid+MzaOYxV8YAogTR4Z7AsHwn/Zn/y9XdoHp2kKdn54s6jO4IaO826v0j7qmw==
+"@segment/tsub@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@segment/tsub/-/tsub-1.0.1.tgz#4d7fad9eb84b354eec559020da7408fac3046b33"
+  integrity sha512-rUpvlj/rRfOolk5rjwyrsbl0qzGLsaYgFNEiOSrwrWDryDPq1ZGdo+3Eb+E8+EC0yZOAO4F1DjJfLtaSifpx7w==
   dependencies:
     "@stdlib/math-base-special-ldexp" "^0.0.5"
     dlv "^1.1.3"
@@ -10205,11 +10214,16 @@ dotenv@^8.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
-dset@^3.0.0, dset@^3.1.1:
+dset@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.2.tgz#89c436ca6450398396dc6538ea00abc0c54cd45a"
   integrity sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==
 
+dset@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.3.tgz#c194147f159841148e8e34ca41f638556d9542d2"
+  integrity sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==
+
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
@@ -10311,13 +10325,6 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -12392,7 +12399,7 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@0.6.3, iconv-lite@^0.6.2:
+iconv-lite@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -13787,10 +13794,15 @@ js-beautify@^1.6.12:
     mkdirp "^1.0.4"
     nopt "^5.0.0"
 
-js-cookie@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
-  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
+js-cookie@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
+  integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
+
+js-cookie@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc"
+  integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==
 
 js-string-escape@^1.0.1:
   version "1.0.1"
@@ -14046,11 +14058,6 @@ klona@^2.0.4:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
   integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
 
-klona@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
-  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
-
 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"
@@ -19807,7 +19814,7 @@ tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
-tslib@^2.5.0, tslib@^2.6.0:
+tslib@^2.4.1, tslib@^2.5.0, tslib@^2.6.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -19937,6 +19944,11 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@^4.9.5:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
 typeson-registry@^1.0.0-alpha.20:
   version "1.0.0-alpha.39"
   resolved "https://registry.yarnpkg.com/typeson-registry/-/typeson-registry-1.0.0-alpha.39.tgz#9e0f5aabd5eebfcffd65a796487541196f4b1211"