From 846b9fb9ce0f47bc1c3b9e9a9a28f19ba8407d4c Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel.g.jablonski@gmail.com>
Date: Thu, 13 Feb 2025 08:57:29 -0300
Subject: [PATCH 01/46] chore(fazer-ai): repo setup (#1)

* chore: update nvmrc

* chore: bump rubocop and related gems
---
 .nvmrc       |  2 +-
 Gemfile.lock | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.nvmrc b/.nvmrc
index 6f7af3750..b88575e38 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.5.1
\ No newline at end of file
+23.7.0
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 9f1ee5eec..ebaa749dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -423,6 +423,7 @@ GEM
       faraday-multipart
       json (>= 1.8)
       rexml
+    language_server-protocol (3.17.0.4)
     launchy (2.5.2)
       addressable (~> 2.8)
     letter_opener (1.8.1)
@@ -545,9 +546,10 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.4)
     ostruct (0.6.1)
-    parallel (1.23.0)
-    parser (3.2.2.1)
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
+      racc
     pg (1.5.3)
     pg_search (2.3.6)
       activerecord (>= 5.2)
@@ -663,14 +665,15 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.50.2)
+    rubocop (1.57.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.28.1)
@@ -816,7 +819,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
     uri (1.0.3)
     uri_template (0.7.0)

From f6bdc40c243a8fbe0f3fcbfa29ed64f7d323827c Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayoproliveira@gmail.com>
Date: Fri, 14 Feb 2025 11:43:15 -0300
Subject: [PATCH 02/46] feat: add name to webhook (#4)

* feat(migration): add name column to webhook table

* feat(webhooks): add name parameter to webhook params

* feat(webhooks): add example webhook name constant and input field to form

* fix(webhooks): add webhook name label and placeholder to multiple locales in the form

* feat(webhooks): display webhook name in the UI and include it in the API response

* Revert 'fix(webhooks): add webhook name label and placeholder to multiple locales in the form'

This reverts commit e547778a1c038c934e22ceb25935f541cb09e2cd.

* test(webhooks): add tests for creating and updating webhooks with name attribute

* chore(webhooks): add name property to webhook definitions in Swagger documentation

* chore(webhooks): remove unnecessary input touch event for webhook name field

* chore(webhooks): apply review changes requested

* chore(webhooks): revert auto lint changes in commit 18ec4cafeb72fd385b70f65f1873d7cfb65216a6
---
 .../api/v1/accounts/webhooks_controller.rb        |  2 +-
 .../dashboard/i18n/locale/en/integrations.json    |  4 ++++
 .../integrations/Webhooks/WebhookForm.vue         | 14 ++++++++++++++
 .../settings/integrations/Webhooks/WebhookRow.vue | 14 ++++++++++++--
 app/models/webhook.rb                             |  1 +
 .../v1/accounts/webhooks/_webhook.json.jbuilder   |  1 +
 db/migrate/20250213190934_add_name_to_webhooks.rb |  5 +++++
 db/schema.rb                                      |  1 +
 .../api/v1/accounts/webhook_controller_spec.rb    | 15 +++++++++++++--
 spec/factories/webhooks.rb                        |  1 +
 .../request/webhooks/create_update_payload.yml    |  3 +++
 swagger/definitions/resource/webhook.yml          |  3 +++
 swagger/swagger.json                              |  8 ++++++++
 13 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20250213190934_add_name_to_webhooks.rb

diff --git a/app/controllers/api/v1/accounts/webhooks_controller.rb b/app/controllers/api/v1/accounts/webhooks_controller.rb
index 7ea257ed2..9f8e94821 100644
--- a/app/controllers/api/v1/accounts/webhooks_controller.rb
+++ b/app/controllers/api/v1/accounts/webhooks_controller.rb
@@ -23,7 +23,7 @@ class Api::V1::Accounts::WebhooksController < Api::V1::Accounts::BaseController
   private
 
   def webhook_params
-    params.require(:webhook).permit(:inbox_id, :url, subscriptions: [])
+    params.require(:webhook).permit(:inbox_id, :name, :url, subscriptions: [])
   end
 
   def fetch_webhook
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 5105513d5..95cd0c9f5 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -44,6 +44,10 @@
             "CONTACT_UPDATED": "Contact updated"
           }
         },
+        "NAME": {
+          "LABEL": "Webhook Name",
+          "PLACEHOLDER": "Enter the name of the webhook"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
index f3c724bb2..6368bff19 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
@@ -53,6 +53,7 @@ export default {
   data() {
     return {
       url: this.value.url || '',
+      name: this.value.name || '',
       subscriptions: this.value.subscriptions || [],
       supportedWebhookEvents: SUPPORTED_WEBHOOK_EVENTS,
     };
@@ -66,11 +67,15 @@ export default {
         }
       );
     },
+    webhookNameInputPlaceholder() {
+      return this.$t('INTEGRATION_SETTINGS.WEBHOOK.FORM.NAME.PLACEHOLDER');
+    },
   },
   methods: {
     onSubmit() {
       this.$emit('submit', {
         url: this.url,
+        name: this.name,
         subscriptions: this.subscriptions,
       });
     },
@@ -95,6 +100,15 @@ export default {
           {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.END_POINT.ERROR') }}
         </span>
       </label>
+      <label>
+        {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.NAME.LABEL') }}
+        <input
+          v-model="name"
+          type="text"
+          name="name"
+          :placeholder="webhookNameInputPlaceholder"
+        />
+      </label>
       <label :class="{ error: v$.url.$error }" class="mb-2">
         {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.SUBSCRIPTIONS.LABEL') }}
       </label>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
index 1ff6244ba..1a39694b3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
@@ -37,8 +37,18 @@ const subscribedEvents = computed(() => {
 <template>
   <tr>
     <td class="py-4 ltr:pr-4 rtl:pl-4">
-      <div class="font-medium break-words text-slate-700 dark:text-slate-100">
-        {{ webhook.url }}
+      <div
+        class="flex gap-2 font-medium break-words text-slate-700 dark:text-slate-100"
+      >
+        <template v-if="webhook.name">
+          {{ webhook.name }}
+          <span class="text-slate-500 dark:text-slate-400">
+            {{ webhook.url }}
+          </span>
+        </template>
+        <template v-else>
+          {{ webhook.url }}
+        </template>
       </div>
       <div class="block mt-1 text-sm text-slate-500 dark:text-slate-400">
         <span class="font-medium">
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index 540dbd9b7..f0e367e60 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -3,6 +3,7 @@
 # Table name: webhooks
 #
 #  id            :bigint           not null, primary key
+#  name          :string
 #  subscriptions :jsonb
 #  url           :string
 #  webhook_type  :integer          default("account_type")
diff --git a/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder b/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
index fac8fdcf2..5406cf183 100644
--- a/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
+++ b/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
@@ -1,4 +1,5 @@
 json.id webhook.id
+json.name webhook.name
 json.url webhook.url
 json.account_id webhook.account_id
 json.subscriptions webhook.subscriptions
diff --git a/db/migrate/20250213190934_add_name_to_webhooks.rb b/db/migrate/20250213190934_add_name_to_webhooks.rb
new file mode 100644
index 000000000..e49b6f109
--- /dev/null
+++ b/db/migrate/20250213190934_add_name_to_webhooks.rb
@@ -0,0 +1,5 @@
+class AddNameToWebhooks < ActiveRecord::Migration[7.0]
+  def change
+    add_column :webhooks, :name, :string, null: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e4706342e..84962a097 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1055,6 +1055,7 @@ ActiveRecord::Schema[7.0].define(version: 2025_04_02_233933) do
     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.string "name"
     t.index ["account_id", "url"], name: "index_webhooks_on_account_id_and_url", unique: true
   end
 
diff --git a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
index 3a68d8921..86f4d4e7e 100644
--- a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'Webhooks API', type: :request do
   let(:account) { create(:account) }
   let(:inbox) { create(:inbox, account: account) }
-  let(:webhook) { create(:webhook, account: account, inbox: inbox, url: 'https://hello.com') }
+  let(:webhook) { create(:webhook, account: account, inbox: inbox, url: 'https://hello.com', name: 'My Webhook') }
   let(:administrator) { create(:user, account: account, role: :administrator) }
   let(:agent) { create(:user, account: account, role: :agent) }
 
@@ -49,6 +49,16 @@ RSpec.describe 'Webhooks API', type: :request do
         expect(response.parsed_body['payload']['webhook']['url']).to eql 'https://hello.com'
       end
 
+      it 'creates webhook with name' do
+        post "/api/v1/accounts/#{account.id}/webhooks",
+             params: { account_id: account.id, inbox_id: inbox.id, url: 'https://hello.com', name: 'My Webhook' },
+             headers: administrator.create_new_auth_token,
+             as: :json
+        expect(response).to have_http_status(:success)
+
+        expect(response.parsed_body['payload']['webhook']['name']).to eql 'My Webhook'
+      end
+
       it 'throws error when invalid url provided' do
         post "/api/v1/accounts/#{account.id}/webhooks",
              params: { account_id: account.id, inbox_id: inbox.id, url: 'javascript:alert(1)' },
@@ -103,11 +113,12 @@ RSpec.describe 'Webhooks API', type: :request do
     context 'when it is an authenticated admin user' do
       it 'updates webhook' do
         put "/api/v1/accounts/#{account.id}/webhooks/#{webhook.id}",
-            params: { url: 'https://hello.com' },
+            params: { url: 'https://hello.com', name: 'Another Webhook' },
             headers: administrator.create_new_auth_token,
             as: :json
         expect(response).to have_http_status(:success)
         expect(response.parsed_body['payload']['webhook']['url']).to eql 'https://hello.com'
+        expect(response.parsed_body['payload']['webhook']['name']).to eql 'Another Webhook'
       end
     end
   end
diff --git a/spec/factories/webhooks.rb b/spec/factories/webhooks.rb
index 42acc2be6..a4a875c84 100644
--- a/spec/factories/webhooks.rb
+++ b/spec/factories/webhooks.rb
@@ -3,6 +3,7 @@ FactoryBot.define do
     account_id { 1 }
     inbox_id { 1 }
     url { 'https://api.chatwoot.com' }
+    name { 'My Webhook' }
     subscriptions do
       %w[
         conversation_status_changed
diff --git a/swagger/definitions/request/webhooks/create_update_payload.yml b/swagger/definitions/request/webhooks/create_update_payload.yml
index 417843fe6..8ff1680b1 100644
--- a/swagger/definitions/request/webhooks/create_update_payload.yml
+++ b/swagger/definitions/request/webhooks/create_update_payload.yml
@@ -3,6 +3,9 @@ properties:
   url:
     type: string
     description: The url where the events should be sent
+  name:
+    type: string
+    description: The name of the webhook
   subscriptions:
     type: array
     items:
diff --git a/swagger/definitions/resource/webhook.yml b/swagger/definitions/resource/webhook.yml
index a9881b8e4..da5cb112a 100644
--- a/swagger/definitions/resource/webhook.yml
+++ b/swagger/definitions/resource/webhook.yml
@@ -6,6 +6,9 @@ properties:
   url:
     type: string
     description: The url to which the events will be send
+  name:
+    type: string
+    description: The name of the webhook
   subscriptions:
     type: array
     items:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 19ef5c904..d2b699e44 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -6132,6 +6132,10 @@
           "type": "string",
           "description": "The url to which the events will be send"
         },
+        "name": {
+          "type": "string",
+          "description": "The name of the webhook"
+        },
         "subscriptions": {
           "type": "array",
           "items": {
@@ -6730,6 +6734,10 @@
           "type": "string",
           "description": "The url where the events should be sent"
         },
+        "name": {
+          "type": "string",
+          "description": "The name of the webhook"
+        },
         "subscriptions": {
           "type": "array",
           "items": {

From 1d6b15b23d12fce3a433acd52da9f5c34d1d1552 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel.g.jablonski@gmail.com>
Date: Fri, 14 Feb 2025 11:44:48 -0300
Subject: [PATCH 03/46] chore: enable chatwoot v4 feature by default (#3)

---
 config/features.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/features.yml b/config/features.yml
index 59b9aa2ad..8923bc064 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -146,7 +146,7 @@
   premium: true
 - name: chatwoot_v4
   display_name: Chatwoot V4
-  enabled: false
+  enabled: true
 - name: report_v4
   display_name: Report V4
   enabled: false

From 52a55827c3a7ee059273a8c59e0679f1fea5c5a8 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel.g.jablonski@gmail.com>
Date: Fri, 14 Feb 2025 11:45:12 -0300
Subject: [PATCH 04/46] chore: lint files (#2)

* chore: lint files

* chore: suppress warning

* chore: disable suggest extensions

* chore: do not stage changes in pre-commit

* chore: remove git add from FE lint and `-a` flag from rubocop on husky
---
 .husky/pre-commit                                      |  4 ++--
 .rubocop.yml                                           |  4 ++++
 Gemfile                                                |  2 +-
 app/actions/contact_identify_action.rb                 |  2 +-
 app/builders/messages/instagram/message_builder.rb     |  2 +-
 .../api/v1/accounts/automation_rules_controller.rb     |  1 -
 .../api/v1/widget/conversations_controller.rb          |  2 +-
 app/controllers/api_controller.rb                      |  2 +-
 .../super_admin/account_users_controller.rb            |  2 +-
 app/helpers/reporting_event_helper.rb                  |  4 ++--
 app/helpers/timezone_helper.rb                         |  2 +-
 app/jobs/webhooks/whatsapp_events_job.rb               |  2 +-
 app/listeners/agent_bot_listener.rb                    |  4 ++--
 app/listeners/automation_rule_listener.rb              |  2 +-
 app/mailers/conversation_reply_mailer.rb               |  4 ++--
 app/models/attachment.rb                               |  4 ++--
 app/models/concerns/content_attribute_validator.rb     |  2 +-
 app/models/concerns/featurable.rb                      |  8 ++++----
 app/models/conversation.rb                             |  3 ++-
 app/models/message.rb                                  |  6 +++---
 app/models/user.rb                                     |  4 ++--
 .../auto_assignment/inbox_round_robin_service.rb       |  2 +-
 app/services/line/incoming_message_service.rb          |  2 +-
 .../message_templates/hook_execution_service.rb        |  4 ++--
 db/migrate/20230515051424_update_article_image_keys.rb |  4 ++--
 .../services/internal/reconcile_plan_config_service.rb |  4 ++--
 enterprise/lib/captain/agent.rb                        |  2 +-
 lib/chatwoot_app.rb                                    |  2 +-
 lib/chatwoot_captcha.rb                                |  2 +-
 lib/config_loader.rb                                   |  4 ++--
 lib/integrations/bot_processor_service.rb              | 10 +++++-----
 package.json                                           |  3 +--
 32 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index adda426ad..9c350db88 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -5,7 +5,7 @@
 npx --no-install lint-staged
 
 # lint only staged ruby files
-git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion -a
+git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion
 
 # stage rubocop changes to files
-git diff --name-only --cached | xargs git add
+# git diff --name-only --cached | xargs git add
diff --git a/.rubocop.yml b/.rubocop.yml
index 1cdfbc713..679531c66 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -154,6 +154,7 @@ CustomCopLocation:
 
 AllCops:
   NewCops: enable
+  SuggestExtensions: false
   Exclude:
     - 'bin/**/*'
     - 'db/schema.rb'
@@ -166,3 +167,6 @@ AllCops:
     - 'tmp/**/*'
     - 'storage/**/*'
     - 'db/migrate/20230426130150_init_schema.rb'
+
+Layout/LeadingCommentSpace:
+  Enabled: false
diff --git a/Gemfile b/Gemfile
index 1e8605379..92c2d8e72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,7 @@ 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'
+gem 'net-smtp', '~> 0.3.4'
 # Prevent CSV injection
 gem 'csv-safe'
 
diff --git a/app/actions/contact_identify_action.rb b/app/actions/contact_identify_action.rb
index a88d3535b..8e7e1bf2d 100644
--- a/app/actions/contact_identify_action.rb
+++ b/app/actions/contact_identify_action.rb
@@ -69,7 +69,7 @@ class ContactIdentifyAction
   end
 
   def merge_contacts?(existing_contact, key)
-    return if existing_contact.blank?
+    return false if existing_contact.blank?
 
     return true if params[:identifier].blank?
 
diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index 7f1b9cab2..a36d6f018 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -166,7 +166,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
   end
 
   def all_unsupported_files?
-    return if attachments.empty?
+    return false if attachments.empty?
 
     attachments_type = attachments.pluck(:type).uniq.first
     unsupported_file_type?(attachments_type)
diff --git a/app/controllers/api/v1/accounts/automation_rules_controller.rb b/app/controllers/api/v1/accounts/automation_rules_controller.rb
index 3d894808d..05d3cb1ab 100644
--- a/app/controllers/api/v1/accounts/automation_rules_controller.rb
+++ b/app/controllers/api/v1/accounts/automation_rules_controller.rb
@@ -24,7 +24,6 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
     ActiveRecord::Base.transaction do
       automation_rule_update
       process_attachments
-
     rescue StandardError => e
       Rails.logger.error e
       render json: { error: @automation_rule.errors.messages }.to_json, status: :unprocessable_entity
diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index fe5facc1a..64b32db3c 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -82,7 +82,7 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
   end
 
   def render_not_found_if_empty
-    return head :not_found if conversation.nil?
+    head :not_found if conversation.nil?
   end
 
   def permitted_params
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index eb6f776f1..769bb1b18 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -12,7 +12,7 @@ class ApiController < ApplicationController
 
   def redis_status
     r = Redis.new(Redis::Config.app)
-    return 'ok' if r.ping
+    'ok' if r.ping
   rescue Redis::CannotConnectError
     'failing'
   end
diff --git a/app/controllers/super_admin/account_users_controller.rb b/app/controllers/super_admin/account_users_controller.rb
index b210dea19..057128c98 100644
--- a/app/controllers/super_admin/account_users_controller.rb
+++ b/app/controllers/super_admin/account_users_controller.rb
@@ -6,7 +6,7 @@ class SuperAdmin::AccountUsersController < SuperAdmin::ApplicationController
     resource = resource_class.new(resource_params)
     authorize_resource(resource)
 
-    notice =  resource.save ? translate_with_resource('create.success') : resource.errors.full_messages.first
+    notice = resource.save ? translate_with_resource('create.success') : resource.errors.full_messages.first
     redirect_back(fallback_location: [namespace, resource.account], notice: notice)
   end
 
diff --git a/app/helpers/reporting_event_helper.rb b/app/helpers/reporting_event_helper.rb
index e08b5691c..94c7f8cde 100644
--- a/app/helpers/reporting_event_helper.rb
+++ b/app/helpers/reporting_event_helper.rb
@@ -52,8 +52,8 @@ module ReportingEventHelper
   end
 
   def format_time(hour, minute)
-    hour = hour < 10 ? "0#{hour}" : hour
-    minute = minute < 10 ? "0#{minute}" : minute
+    hour = "0#{hour}" if hour < 10
+    minute = "0#{minute}" if minute < 10
     "#{hour}:#{minute}"
   end
 end
diff --git a/app/helpers/timezone_helper.rb b/app/helpers/timezone_helper.rb
index b016cc9d9..7b88ceae6 100644
--- a/app/helpers/timezone_helper.rb
+++ b/app/helpers/timezone_helper.rb
@@ -14,6 +14,6 @@ module TimezoneHelper
       zone.now.utc_offset == offset_in_seconds
     end
 
-    return matching_zone.name if matching_zone
+    matching_zone&.name
   end
 end
diff --git a/app/jobs/webhooks/whatsapp_events_job.rb b/app/jobs/webhooks/whatsapp_events_job.rb
index cd2dad167..b130161de 100644
--- a/app/jobs/webhooks/whatsapp_events_job.rb
+++ b/app/jobs/webhooks/whatsapp_events_job.rb
@@ -47,6 +47,6 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
     phone_number_id = wb_params[:entry].first[:changes].first.dig(:value, :metadata, :phone_number_id)
     channel = Channel::Whatsapp.find_by(phone_number: phone_number)
     # validate to ensure the phone number id matches the whatsapp channel
-    return channel if channel && channel.provider_config['phone_number_id'] == phone_number_id
+    channel if channel && channel.provider_config['phone_number_id'] == phone_number_id
   end
 end
diff --git a/app/listeners/agent_bot_listener.rb b/app/listeners/agent_bot_listener.rb
index 12e8c6570..5b8ac6cc5 100644
--- a/app/listeners/agent_bot_listener.rb
+++ b/app/listeners/agent_bot_listener.rb
@@ -53,8 +53,8 @@ class AgentBotListener < BaseListener
   private
 
   def connected_agent_bot_exist?(inbox)
-    return if inbox.agent_bot_inbox.blank?
-    return unless inbox.agent_bot_inbox.active?
+    return false if inbox.agent_bot_inbox.blank?
+    return false unless inbox.agent_bot_inbox.active?
 
     true
   end
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index 5dabda47e..e0a4ef523 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -70,7 +70,7 @@ class AutomationRuleListener < BaseListener
   end
 
   def rule_present?(event_name, account)
-    return if account.blank?
+    return false if account.blank?
 
     current_account_rules(event_name, account).any?
   end
diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index f9d1faf3d..7c00d92d0 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -72,8 +72,8 @@ class ConversationReplyMailer < ApplicationMailer
 
   def conversation_already_viewed?
     # whether contact already saw the message on widget
-    return unless @conversation.contact_last_seen_at
-    return unless last_outgoing_message&.created_at
+    return false unless @conversation.contact_last_seen_at
+    return false unless last_outgoing_message&.created_at
 
     @conversation.contact_last_seen_at > last_outgoing_message&.created_at
   end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 0bfd9a978..c603edb4d 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -123,9 +123,9 @@ class Attachment < ApplicationRecord
   end
 
   def should_validate_file?
-    return unless file.attached?
+    return false unless file.attached?
     # we are only limiting attachment types in case of website widget
-    return unless message.inbox.channel_type == 'Channel::WebWidget'
+    return false unless message.inbox.channel_type == 'Channel::WebWidget'
 
     true
   end
diff --git a/app/models/concerns/content_attribute_validator.rb b/app/models/concerns/content_attribute_validator.rb
index bad93c913..8a15ad4a1 100644
--- a/app/models/concerns/content_attribute_validator.rb
+++ b/app/models/concerns/content_attribute_validator.rb
@@ -37,7 +37,7 @@ class ContentAttributeValidator < ActiveModel::Validator
   end
 
   def validate_item_actions!(record)
-    if record.items.select { |item| item[:actions].blank? }.present?
+    if record.items.select { |item| item[:actions].blank? }.present? # rubocop:disable Style/RedundantFilterChain
       record.errors.add(:content_attributes, 'contains items missing actions') && return
     end
 
diff --git a/app/models/concerns/featurable.rb b/app/models/concerns/featurable.rb
index daa0b4bf6..ff4aa961b 100644
--- a/app/models/concerns/featurable.rb
+++ b/app/models/concerns/featurable.rb
@@ -25,8 +25,8 @@ module Featurable
     end
   end
 
-  def enable_features!(*names)
-    enable_features(*names)
+  def enable_features!(*)
+    enable_features(*)
     save
   end
 
@@ -36,8 +36,8 @@ module Featurable
     end
   end
 
-  def disable_features!(*names)
-    disable_features(*names)
+  def disable_features!(*)
+    disable_features(*)
     save
   end
 
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 2a7a49223..e09e6efaf 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -290,8 +290,9 @@ class Conversation < ApplicationRecord
 
   def conversation_status_changed_to_open?
     return false unless open?
+
     # saved_change_to_status? method only works in case of update
-    return true if previous_changes.key?(:id) || saved_change_to_status?
+    true if previous_changes.key?(:id) || saved_change_to_status?
   end
 
   def create_label_change(user_name)
diff --git a/app/models/message.rb b/app/models/message.rb
index 20dad7403..c6c737fe6 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -359,9 +359,9 @@ class Message < ApplicationRecord
   end
 
   def can_notify_via_mail?
-    return unless email_notifiable_message?
-    return unless email_notifiable_channel?
-    return if conversation.contact.email.blank?
+    return false unless email_notifiable_message?
+    return false unless email_notifiable_channel?
+    return false if conversation.contact.email.blank?
 
     true
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5594b0ca6..d1907362a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -109,8 +109,8 @@ class User < ApplicationRecord
     self.email = email.try(:downcase)
   end
 
-  def send_devise_notification(notification, *args)
-    devise_mailer.with(account: Current.account).send(notification, self, *args).deliver_later
+  def send_devise_notification(notification, *)
+    devise_mailer.with(account: Current.account).send(notification, self, *).deliver_later
   end
 
   def set_password_and_uid
diff --git a/app/services/auto_assignment/inbox_round_robin_service.rb b/app/services/auto_assignment/inbox_round_robin_service.rb
index 7f5a5fb6c..e121ada43 100644
--- a/app/services/auto_assignment/inbox_round_robin_service.rb
+++ b/app/services/auto_assignment/inbox_round_robin_service.rb
@@ -49,7 +49,7 @@ class AutoAssignment::InboxRoundRobinService
   end
 
   def validate_queue?
-    return true if inbox.inbox_members.map(&:user_id).sort == queue.map(&:to_i).sort
+    true if inbox.inbox_members.map(&:user_id).sort == queue.map(&:to_i).sort
   end
 
   def queue
diff --git a/app/services/line/incoming_message_service.rb b/app/services/line/incoming_message_service.rb
index 4761292d0..a9344d660 100644
--- a/app/services/line/incoming_message_service.rb
+++ b/app/services/line/incoming_message_service.rb
@@ -30,7 +30,7 @@ class Line::IncomingMessageService
   end
 
   def message_created?(event)
-    return unless event_type_message?(event)
+    return false unless event_type_message?(event)
 
     @message = @conversation.messages.build(
       content: message_content(event),
diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index bc161d885..53e2e3a7e 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -66,10 +66,10 @@ class MessageTemplates::HookExecutionService
   end
 
   def should_send_csat_survey?
-    return unless csat_enabled_conversation?
+    return false unless csat_enabled_conversation?
 
     # only send CSAT once in a conversation
-    return if conversation.messages.where(content_type: :input_csat).present?
+    return false if conversation.messages.where(content_type: :input_csat).present?
 
     true
   end
diff --git a/db/migrate/20230515051424_update_article_image_keys.rb b/db/migrate/20230515051424_update_article_image_keys.rb
index db208470f..b80e6c86e 100644
--- a/db/migrate/20230515051424_update_article_image_keys.rb
+++ b/db/migrate/20230515051424_update_article_image_keys.rb
@@ -12,8 +12,8 @@ class ArticleKeyConverter
 
   def convert_key(id)
     verifier_name = 'ActiveStorage'
-    key_generator =  ActiveSupport::KeyGenerator.new(Rails.application.secrets.secret_key_base, iterations: 1000,
-                                                                                                hash_digest_class: OpenSSL::Digest::SHA1)
+    key_generator = ActiveSupport::KeyGenerator.new(Rails.application.secrets.secret_key_base, iterations: 1000,
+                                                                                               hash_digest_class: OpenSSL::Digest::SHA1)
     key_generator = ActiveSupport::CachingKeyGenerator.new(key_generator)
     secret = key_generator.generate_key(verifier_name.to_s)
     verifier = ActiveSupport::MessageVerifier.new(secret)
diff --git a/enterprise/app/services/internal/reconcile_plan_config_service.rb b/enterprise/app/services/internal/reconcile_plan_config_service.rb
index 3dcb4ba12..7934a5be6 100644
--- a/enterprise/app/services/internal/reconcile_plan_config_service.rb
+++ b/enterprise/app/services/internal/reconcile_plan_config_service.rb
@@ -16,7 +16,7 @@ class Internal::ReconcilePlanConfigService
   end
 
   def premium_config
-    @premium_config ||= YAML.safe_load(File.read("#{config_path}/premium_installation_config.yml")).freeze
+    @premium_config ||= YAML.safe_load_file("#{config_path}/premium_installation_config.yml").freeze
   end
 
   def remove_premium_config_reset_warning
@@ -46,7 +46,7 @@ class Internal::ReconcilePlanConfigService
   end
 
   def premium_features
-    @premium_features ||= YAML.safe_load(File.read("#{config_path}/premium_features.yml")).freeze
+    @premium_features ||= YAML.safe_load_file("#{config_path}/premium_features.yml").freeze
   end
 
   def reconcile_premium_features
diff --git a/enterprise/lib/captain/agent.rb b/enterprise/lib/captain/agent.rb
index f0b511115..b548cede1 100644
--- a/enterprise/lib/captain/agent.rb
+++ b/enterprise/lib/captain/agent.rb
@@ -63,7 +63,7 @@ class Captain::Agent
     "Tool execution failed: #{e.message}"
   end
 
-  def construct_prompt(config)
+  def construct_prompt(config) # rubocop:disable Metrics/MethodLength
     return config[:prompt] if config[:prompt]
 
     <<~PROMPT
diff --git a/lib/chatwoot_app.rb b/lib/chatwoot_app.rb
index 37c90c19d..d4b614615 100644
--- a/lib/chatwoot_app.rb
+++ b/lib/chatwoot_app.rb
@@ -12,7 +12,7 @@ module ChatwootApp
   end
 
   def self.enterprise?
-    return if ENV.fetch('DISABLE_ENTERPRISE', false)
+    return false if ENV.fetch('DISABLE_ENTERPRISE', false)
 
     @enterprise ||= root.join('enterprise').exist?
   end
diff --git a/lib/chatwoot_captcha.rb b/lib/chatwoot_captcha.rb
index 37e852868..d2da7aabd 100644
--- a/lib/chatwoot_captcha.rb
+++ b/lib/chatwoot_captcha.rb
@@ -18,7 +18,7 @@ class ChatwootCaptcha
                                secret: @server_key
                              })
 
-    return unless response.success?
+    return false unless response.success?
 
     response.parsed_response['success']
   end
diff --git a/lib/config_loader.rb b/lib/config_loader.rb
index aa393067e..f637c4588 100644
--- a/lib/config_loader.rb
+++ b/lib/config_loader.rb
@@ -28,13 +28,13 @@ class ConfigLoader
 
   def general_configs
     @config_path ||= Rails.root.join('config')
-    @general_configs ||= YAML.safe_load(File.read("#{@config_path}/installation_config.yml")).freeze
+    @general_configs ||= YAML.safe_load_file("#{@config_path}/installation_config.yml").freeze
   end
 
   private
 
   def account_features
-    @account_features ||= YAML.safe_load(File.read("#{@config_path}/features.yml")).freeze
+    @account_features ||= YAML.safe_load_file("#{@config_path}/features.yml").freeze
   end
 
   def reconcile_general_config
diff --git a/lib/integrations/bot_processor_service.rb b/lib/integrations/bot_processor_service.rb
index 600ee4305..401c519ce 100644
--- a/lib/integrations/bot_processor_service.rb
+++ b/lib/integrations/bot_processor_service.rb
@@ -14,9 +14,9 @@ class Integrations::BotProcessorService
   private
 
   def should_run_processor?(message)
-    return if message.private?
-    return unless processable_message?(message)
-    return unless conversation.pending?
+    return false if message.private?
+    return false unless processable_message?(message)
+    return false unless conversation.pending?
 
     true
   end
@@ -43,8 +43,8 @@ class Integrations::BotProcessorService
 
   def processable_message?(message)
     # TODO: change from reportable and create a dedicated method for this?
-    return unless message.reportable?
-    return if message.outgoing? && !processable_outgoing_message?(message)
+    return false unless message.reportable?
+    return false if message.outgoing? && !processable_outgoing_message?(message)
 
     true
   end
diff --git a/package.json b/package.json
index 4c30829f7..0111fe49b 100644
--- a/package.json
+++ b/package.json
@@ -160,8 +160,7 @@
   },
   "lint-staged": {
     "app/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
+      "eslint --fix"
     ],
     "*.scss": [
       "scss-lint"

From 083bc27b1aea5841ac8969e83a398882ed9dbf96 Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayoproliveira@gmail.com>
Date: Fri, 28 Feb 2025 18:27:14 -0300
Subject: [PATCH 05/46] feat: webhook inbox (#5)

* chore: exclude inbox_id from webhook update parameters

* feat: display inbox label in webhook settings

* feat: add inbox selection to webhook form

* feat: prevent updating inbox_id in webhook update

* feat: integrate MultiselectDropdown for inbox selection in webhook form

* feat: add inbox matching logic to webhook event delivery

* feat: remove unused inbox input placeholder from webhook form

* fix: MultiselectDropdown component submiting form

* feat: refine webhook parameters for create and update actions

* feat: disable URL input field when editing webhook

* chore: remove unnecessary parentheses

* chore: update webhook controller spec to ignore inbox_id and url updates

* fix: clean up JSON formatting

* fix: standardize inbox_id to inboxId in WebhookForm component

* refactor: replace LabelItem with InboxName component in WebhookRow

* chore: enhance MultiselectDropdown with button variant prop and update styling in WebhookForm

* chore: simplify MultiselectDropdown wrapper in WebhookForm component

* chore: update selectedInbox initialization to null and reorder form fields

* refactor: simplify InboxName

* chore: add dark variant styling for buttons in SCSS

* test: add inbox filtering for webhook event triggers in WebhookListener

* test: refactor webhook controller spec to use a variable for URL and improve update expectations

* feat(webhook): all inboxes option

* chore: remove dark variant styling for buttons in SCSS

* fix: bad interaction multiselectdropdown inside label

* chore: invert if

* chore: rename to assignedInbox and drop inboxId

* refactor(WebhookForm): restore div separating fields from buttons

* test: improve description

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
---
 .../api/v1/accounts/webhooks_controller.rb    | 10 +++-
 .../i18n/locale/en/integrations.json          |  7 +++
 .../integrations/Webhooks/EditWebHook.vue     |  1 +
 .../integrations/Webhooks/WebhookForm.vue     | 56 ++++++++++++++++++-
 .../integrations/Webhooks/WebhookRow.vue      |  2 +
 .../components/ui/MultiselectDropdown.vue     | 10 ++++
 app/listeners/webhook_listener.rb             |  1 +
 .../accounts/webhooks/_webhook.json.jbuilder  |  1 +
 .../v1/accounts/webhook_controller_spec.rb    | 18 +++++-
 spec/listeners/webhook_listener_spec.rb       | 24 ++++++++
 10 files changed, 122 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/v1/accounts/webhooks_controller.rb b/app/controllers/api/v1/accounts/webhooks_controller.rb
index 9f8e94821..a32f1aa3c 100644
--- a/app/controllers/api/v1/accounts/webhooks_controller.rb
+++ b/app/controllers/api/v1/accounts/webhooks_controller.rb
@@ -7,12 +7,12 @@ class Api::V1::Accounts::WebhooksController < Api::V1::Accounts::BaseController
   end
 
   def create
-    @webhook = Current.account.webhooks.new(webhook_params)
+    @webhook = Current.account.webhooks.new(webhook_create_params)
     @webhook.save!
   end
 
   def update
-    @webhook.update!(webhook_params)
+    @webhook.update!(webhook_update_params)
   end
 
   def destroy
@@ -22,10 +22,14 @@ class Api::V1::Accounts::WebhooksController < Api::V1::Accounts::BaseController
 
   private
 
-  def webhook_params
+  def webhook_create_params
     params.require(:webhook).permit(:inbox_id, :name, :url, subscriptions: [])
   end
 
+  def webhook_update_params
+    params.require(:webhook).permit(:name, subscriptions: [])
+  end
+
   def fetch_webhook
     @webhook = Current.account.webhooks.find(params[:id])
   end
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 95cd0c9f5..5145a9c71 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -48,6 +48,13 @@
           "LABEL": "Webhook Name",
           "PLACEHOLDER": "Enter the name of the webhook"
         },
+        "INBOX": {
+          "LABEL": "Inbox",
+          "TITLE": "Select the inbox",
+          "PLACEHOLDER": "All Inboxes",
+          "NO_RESULTS": "No inboxes found",
+          "INPUT_PLACEHOLDER": "Search inbox"
+        },
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: {webhookExampleURL}",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/EditWebHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/EditWebHook.vue
index c9b315443..97c2f86a9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/EditWebHook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/EditWebHook.vue
@@ -53,6 +53,7 @@ export default {
       :value="value"
       :is-submitting="uiFlags.updatingItem"
       :submit-label="$t('INTEGRATION_SETTINGS.WEBHOOK.FORM.EDIT_SUBMIT')"
+      is-editing
       @submit="onSubmit"
       @cancel="onClose"
     />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
index 6368bff19..f077df97f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
@@ -4,6 +4,8 @@ import { required, url, minLength } from '@vuelidate/validators';
 import wootConstants from 'dashboard/constants/globals';
 import { getI18nKey } from 'dashboard/routes/dashboard/settings/helper/settingsHelper';
 import NextButton from 'dashboard/components-next/button/Button.vue';
+import MultiselectDropdown from 'shared/components/ui/MultiselectDropdown.vue';
+import { useMapGetter } from 'dashboard/composables/store';
 
 const { EXAMPLE_WEBHOOK_URL } = wootConstants;
 
@@ -21,6 +23,7 @@ const SUPPORTED_WEBHOOK_EVENTS = [
 export default {
   components: {
     NextButton,
+    MultiselectDropdown,
   },
   props: {
     value: {
@@ -35,10 +38,17 @@ export default {
       type: String,
       required: true,
     },
+    isEditing: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['submit', 'cancel'],
   setup() {
-    return { v$: useVuelidate() };
+    return {
+      v$: useVuelidate(),
+      inboxes: useMapGetter('inboxes/getInboxes'),
+    };
   },
   validations: {
     url: {
@@ -53,12 +63,27 @@ export default {
   data() {
     return {
       url: this.value.url || '',
+      assignedInbox: this.value.inbox || null,
       name: this.value.name || '',
       subscriptions: this.value.subscriptions || [],
       supportedWebhookEvents: SUPPORTED_WEBHOOK_EVENTS,
     };
   },
   computed: {
+    inboxesList() {
+      if (this.assignedInbox?.id) {
+        return [
+          {
+            id: 0,
+            name: this.$t(
+              'INTEGRATION_SETTINGS.WEBHOOK.FORM.INBOX.PLACEHOLDER'
+            ),
+          },
+          ...this.inboxes,
+        ];
+      }
+      return this.inboxes;
+    },
     webhookURLInputPlaceholder() {
       return this.$t(
         'INTEGRATION_SETTINGS.WEBHOOK.FORM.END_POINT.PLACEHOLDER',
@@ -75,10 +100,14 @@ export default {
     onSubmit() {
       this.$emit('submit', {
         url: this.url,
+        inbox_id: this.assignedInbox?.id || null,
         name: this.name,
         subscriptions: this.subscriptions,
       });
     },
+    onClickAssignInbox(inbox) {
+      this.assignedInbox = inbox;
+    },
     getI18nKey,
   },
 };
@@ -93,6 +122,7 @@ export default {
           v-model="url"
           type="text"
           name="url"
+          :disabled="isEditing"
           :placeholder="webhookURLInputPlaceholder"
           @input="v$.url.$touch"
         />
@@ -100,6 +130,29 @@ export default {
           {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.END_POINT.ERROR') }}
         </span>
       </label>
+      <label>
+        {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.INBOX.LABEL') }}
+        <div class="multiselect-wrap--small">
+          <MultiselectDropdown
+            :options="inboxesList"
+            :selected-item="assignedInbox"
+            :multiselector-title="
+              $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.INBOX.TITLE')
+            "
+            :multiselector-placeholder="
+              $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.INBOX.PLACEHOLDER')
+            "
+            :no-search-result="
+              $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.INBOX.NO_RESULTS')
+            "
+            :input-placeholder="
+              $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.INBOX.INPUT_PLACEHOLDER')
+            "
+            :disabled="isEditing"
+            @select="onClickAssignInbox"
+          />
+        </div>
+      </label>
       <label>
         {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.NAME.LABEL') }}
         <input
@@ -139,7 +192,6 @@ export default {
         </div>
       </div>
     </div>
-
     <div class="flex flex-row justify-end w-full gap-2 px-0 py-2">
       <NextButton
         faded
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
index 1a39694b3..9ca20ac9e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
@@ -3,6 +3,7 @@ import { computed } from 'vue';
 import { getI18nKey } from 'dashboard/routes/dashboard/settings/helper/settingsHelper';
 import ShowMore from 'dashboard/components/widgets/ShowMore.vue';
 import { useI18n } from 'vue-i18n';
+import InboxName from 'components/widgets/InboxName.vue';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 
@@ -37,6 +38,7 @@ const subscribedEvents = computed(() => {
 <template>
   <tr>
     <td class="py-4 ltr:pr-4 rtl:pl-4">
+      <InboxName v-if="webhook.inbox" class="!mx-0" :inbox="webhook.inbox" />
       <div
         class="flex gap-2 font-medium break-words text-slate-700 dark:text-slate-100"
       >
diff --git a/app/javascript/shared/components/ui/MultiselectDropdown.vue b/app/javascript/shared/components/ui/MultiselectDropdown.vue
index 3c066e691..3e4af6cf9 100644
--- a/app/javascript/shared/components/ui/MultiselectDropdown.vue
+++ b/app/javascript/shared/components/ui/MultiselectDropdown.vue
@@ -36,6 +36,10 @@ const props = defineProps({
     type: String,
     default: 'Search',
   },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(['select']);
@@ -66,6 +70,8 @@ const hasValue = computed(() => {
           showSearchDropdown ? 'i-lucide-chevron-up' : 'i-lucide-chevron-down'
         "
         class="w-full !px-2"
+        type="button"
+        :disabled="disabled"
         @click="
           () => toggleDropdown() // ensure that the event is not passed to the button
         "
@@ -93,6 +99,10 @@ const hasValue = computed(() => {
       <div
         :class="{ 'dropdown-pane--open': showSearchDropdown }"
         class="dropdown-pane"
+        @click="
+          // NOTE: Without this, the dropdown does not behave as expected when used inside a <label> tag.
+          event => event.preventDefault()
+        "
       >
         <div class="flex items-center justify-between mb-1">
           <h4
diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb
index 3fdd823b8..69f403ac2 100644
--- a/app/listeners/webhook_listener.rb
+++ b/app/listeners/webhook_listener.rb
@@ -88,6 +88,7 @@ class WebhookListener < BaseListener
   def deliver_account_webhooks(payload, account)
     account.webhooks.account_type.each do |webhook|
       next unless webhook.subscriptions.include?(payload[:event])
+      next if payload[:inbox].present? && webhook.inbox_id.present? && webhook.inbox_id != payload[:inbox][:id]
 
       WebhookJob.perform_later(webhook.url, payload)
     end
diff --git a/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder b/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
index 5406cf183..0884e74c3 100644
--- a/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
+++ b/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
@@ -7,5 +7,6 @@ if webhook.inbox
   json.inbox do
     json.id webhook.inbox.id
     json.name webhook.inbox.name
+    json.channel_type webhook.inbox.channel_type
   end
 end
diff --git a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
index 86f4d4e7e..95b849487 100644
--- a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
@@ -1,9 +1,10 @@
 require 'rails_helper'
 
 RSpec.describe 'Webhooks API', type: :request do
+  let(:url) { 'https://hello.com' }
   let(:account) { create(:account) }
   let(:inbox) { create(:inbox, account: account) }
-  let(:webhook) { create(:webhook, account: account, inbox: inbox, url: 'https://hello.com', name: 'My Webhook') }
+  let(:webhook) { create(:webhook, account: account, inbox: inbox, url: url, name: 'My Webhook') }
   let(:administrator) { create(:user, account: account, role: :administrator) }
   let(:agent) { create(:user, account: account, role: :agent) }
 
@@ -113,13 +114,24 @@ RSpec.describe 'Webhooks API', type: :request do
     context 'when it is an authenticated admin user' do
       it 'updates webhook' do
         put "/api/v1/accounts/#{account.id}/webhooks/#{webhook.id}",
-            params: { url: 'https://hello.com', name: 'Another Webhook' },
+            params: { name: 'Another Webhook' },
             headers: administrator.create_new_auth_token,
             as: :json
         expect(response).to have_http_status(:success)
-        expect(response.parsed_body['payload']['webhook']['url']).to eql 'https://hello.com'
         expect(response.parsed_body['payload']['webhook']['name']).to eql 'Another Webhook'
       end
+
+      it 'ignores trying to update inbox_id and url' do
+        new_inbox = create(:inbox, account: account)
+
+        put "/api/v1/accounts/#{account.id}/webhooks/#{webhook.id}",
+            params: { url: 'https://other.url.com', inbox_id: new_inbox.id },
+            headers: administrator.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:success)
+        expect(response.parsed_body['payload']['webhook']['url']).to eql url
+        expect(response.parsed_body['payload']['webhook']['inbox']['id']).to eql inbox.id
+      end
     end
   end
 
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index 736db07d0..e33f6684d 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -15,6 +15,30 @@ describe WebhookListener do
   let!(:conversation_created_event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation) }
   let!(:contact_event) { Events::Base.new(event_name, Time.zone.now, contact: contact) }
 
+  describe 'filter events by inbox' do
+    let(:event_name) { :'message.created' }
+
+    context 'when webhook has an inbox and it matches the event inbox' do
+      it 'triggers the webhook event' do
+        webhook = create(:webhook, account: account, inbox: inbox)
+        expect(WebhookJob).to receive(:perform_later)
+          .with(webhook.url, message.webhook_data.merge(event: 'message_created')).once
+
+        listener.message_created(message_created_event)
+      end
+    end
+
+    context 'when webhook has an inbox and it does not match the event inbox' do
+      it 'does not trigger webhook' do
+        another_inbox = create(:inbox, account: account)
+        create(:webhook, account: account, inbox: another_inbox)
+        expect(WebhookJob).to receive(:perform_later).exactly(0).times
+
+        listener.message_created(message_created_event)
+      end
+    end
+  end
+
   describe '#message_created' do
     let(:event_name) { :'message.created' }
 

From b04b67f148561038e29d75aa4b14895386ef3748 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Wed, 5 Mar 2025 22:00:04 -0300
Subject: [PATCH 06/46] style: fix linting offense

---
 .../api/v1/accounts/captain/bulk_actions_controller.rb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
index 3130a68cc..5d6875cbb 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
@@ -19,7 +19,7 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
   end
 
   def type_matches?
-    return if MODEL_TYPE.include?(params[:type])
+    return false if MODEL_TYPE.include?(params[:type])
 
     render json: { success: false }, status: :unprocessable_entity
   end

From b1b58df0bf06b8f8b9bd54564ee330fec216c966 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Wed, 5 Mar 2025 22:00:16 -0300
Subject: [PATCH 07/46] refactor: improved syntax for `preventDefault()` call

---
 app/javascript/shared/components/ui/MultiselectDropdown.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/javascript/shared/components/ui/MultiselectDropdown.vue b/app/javascript/shared/components/ui/MultiselectDropdown.vue
index 3e4af6cf9..8ac4e94c1 100644
--- a/app/javascript/shared/components/ui/MultiselectDropdown.vue
+++ b/app/javascript/shared/components/ui/MultiselectDropdown.vue
@@ -96,13 +96,11 @@ const hasValue = computed(() => {
           :username="selectedItem.name"
         />
       </Button>
+      <!-- NOTE: Without @click.prevent, the dropdown does not behave as expected when used inside a <label> tag. -->
       <div
         :class="{ 'dropdown-pane--open': showSearchDropdown }"
         class="dropdown-pane"
-        @click="
-          // NOTE: Without this, the dropdown does not behave as expected when used inside a <label> tag.
-          event => event.preventDefault()
-        "
+        @click.prevent
       >
         <div class="flex items-center justify-between mb-1">
           <h4

From 2c36aefeccb8c91a6bd995fd55ec518177b183f6 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Wed, 5 Mar 2025 22:41:00 -0300
Subject: [PATCH 08/46] chore: handle scss `unknown at rule` warnings

---
 .vscode/settings.json |  3 ++-
 .vscode/tailwind.json | 55 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 .vscode/tailwind.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
index b3cfaee50..b663561bb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,5 +2,6 @@
     "cSpell.words": [
         "chatwoot",
         "dompurify"
-    ]
+    ],
+    "css.customData": [".vscode/tailwind.json"]
 }
diff --git a/.vscode/tailwind.json b/.vscode/tailwind.json
new file mode 100644
index 000000000..e47372fec
--- /dev/null
+++ b/.vscode/tailwind.json
@@ -0,0 +1,55 @@
+{
+    "version": 1.1,
+    "atDirectives": [
+        {
+            "name": "@tailwind",
+            "description": "Use the `@tailwind` directive to insert Tailwind's `base`, `components`, `utilities` and `screens` styles into your CSS.",
+            "references": [
+                {
+                    "name": "Tailwind Documentation",
+                    "url": "https://tailwindcss.com/docs/functions-and-directives#tailwind"
+                }
+            ]
+        },
+        {
+            "name": "@apply",
+            "description": "Use the `@apply` directive to inline any existing utility classes into your own custom CSS. This is useful when you find a common utility pattern in your HTML that you’d like to extract to a new component.",
+            "references": [
+                {
+                    "name": "Tailwind Documentation",
+                    "url": "https://tailwindcss.com/docs/functions-and-directives#apply"
+                }
+            ]
+        },
+        {
+            "name": "@responsive",
+            "description": "You can generate responsive variants of your own classes by wrapping their definitions in the `@responsive` directive:\n```css\n@responsive {\n  .alert {\n    background-color: #E53E3E;\n  }\n}\n```\n",
+            "references": [
+                {
+                    "name": "Tailwind Documentation",
+                    "url": "https://tailwindcss.com/docs/functions-and-directives#responsive"
+                }
+            ]
+        },
+        {
+            "name": "@screen",
+            "description": "The `@screen` directive allows you to create media queries that reference your breakpoints by **name** instead of duplicating their values in your own CSS:\n```css\n@screen sm {\n  /* ... */\n}\n```\n…gets transformed into this:\n```css\n@media (min-width: 640px) {\n  /* ... */\n}\n```\n",
+            "references": [
+                {
+                    "name": "Tailwind Documentation",
+                    "url": "https://tailwindcss.com/docs/functions-and-directives#screen"
+                }
+            ]
+        },
+        {
+            "name": "@variants",
+            "description": "Generate `hover`, `focus`, `active` and other **variants** of your own utilities by wrapping their definitions in the `@variants` directive:\n```css\n@variants hover, focus {\n   .btn-brand {\n    background-color: #3182CE;\n  }\n}\n```\n",
+            "references": [
+                {
+                    "name": "Tailwind Documentation",
+                    "url": "https://tailwindcss.com/docs/functions-and-directives#variants"
+                }
+            ]
+        }
+    ]
+}

From acd1e56a280f0f086cd151edad2d0e5ee703e249 Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayoproliveira@gmail.com>
Date: Fri, 28 Mar 2025 09:43:43 -0300
Subject: [PATCH 09/46] feat: baileys provider for whatsapp (#7)

* feat: baileys provider and placeholder for link device modal

* chore: drop qrcode.vue in favor of just img tag

* chore: update modal props

* feat: setup channel provider connection

* chore: update .env.example with Baileys API default configuration

* feat: add support for Baileys provider in WhatsApp events processing

* chore: rename Baileys API default host variable to DEFAULT_BAILEYS_URL

* feat: add setup and disconnect methods for Baileys channel provider in inboxes controller that will be implemented

* feat: add CHANNEL_CONNECTION_UPDATE event and include it in broadcast data preparation

* refactor: simplify channel retrieval logic in WhatsappEventsJob

* refactor: revert CHANNEL_UPDATE_EVENTS constant from ActionCableBroadcastJob

* feat: add 'baileys' as a provider option in Whatsapp channel model

* feat: add provider_connection field to Whatsapp channel model and migration

* refactor: remove unnecessary  CHANNEL_CONNECTION_UPDATE event type

* feat: implement channel provider connection with baileys API

* feat: add inbox association to Whatsapp channel model and update webhook URL handling

* feat: enhance Baileys service to handle webhook multiple event types

* refactor: simplify webhook verification logic in Baileys service

* feat: add setup channel provider call, and refactor some logic

* chore: adapt logic to new API

* refactor: fix typo

* refactor: fix import

* refactor: fix typo

* chore: add fixme comment about race condition

* fix: remove double disconnect call

* feat: implement message processing for incoming WhatsApp messages

* refactor: streamline message type determination and improve readability

* chore: increase cache key granularity

provider connection info might be updated multiple times within 1 second, so updates might be lost due to cache key not being updated. changing cache key to milliseconds solves this

* feat: add `is-loading` to buttons

* feat: update send_message method to use 'to' parameter and improve error handling

* refactor: simplify test setup and update API key in specs

* chore: add setup and disconnect channel provider specs

* test: fix spec after increase cache key granularity

* feat: handle reconnecting state on modal

* style: centered error text

* feat: advanced options on create inbox

* feat: handle new reconnecting on backend

* refactor: update inbox controller specs and leave a FIXME note

* test: add specs for Whatsapp::IncomingMessageBaileysService

* feat: add baileys configuration page

* feat: link device button when disconnected on conversation

* chore: refactor .env.example

* feat: add TODO for unimplemented methods in IncomingMessageBaileysService

* fix: correct method name and update environment variable references in WhatsappBaileysService

* refactor: simplify channel lookup by removing redundant method and handling phone number check directly

* chore: add TODO for unimplemented event processing methods in IncomingMessageBaileysService

* fix: update environment variable references in WhatsappBaileysService tests

* chore(webhook): add pt-BR translations

* chore: add pt-br translations

* chore: inboxname component margin

* refactor: inboxname computed prop

* feat: enhance WhatsApp provider connection handling and message processing

* test: inbox controller

* chore: improve baileys connection and messages handling

* test: incoming message service baileys

* refactor: update provider config validation and improve test setup for WhatsApp Baileys service

* fix: ensure only text messages are sent and update message source ID

* fix: create message

* fix: only update message on success

* test: fix broken specs

* chore: raise error on unsupported message content type

* feat: hide provider connection data from non-admins

* fix: update advanced options

* chore: move class definition

* fix: issue with send_message not returning id

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
---
 .env.example                                  |   6 +-
 .../api/v1/accounts/inboxes_controller.rb     |  22 ++
 app/helpers/cache_keys_helper.rb              |   2 +-
 app/javascript/dashboard/api/inboxes.js       |   8 +
 .../components/widgets/InboxName.vue          |  23 ++
 .../widgets/conversation/MessagesView.vue     |  48 ++++
 .../widgets/conversation/ReplyBox.vue         |   2 +-
 .../dashboard/composables/useInbox.js         |   8 +
 .../i18n/locale/en/conversation.json          |   7 +
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  29 +-
 .../i18n/locale/pt_BR/conversation.json       |   7 +
 .../i18n/locale/pt_BR/inboxMgmt.json          |  29 +-
 .../i18n/locale/pt_BR/integrations.json       |  11 +
 .../dashboard/settings/inbox/FinishSetup.vue  |  39 +++
 .../dashboard/settings/inbox/Settings.vue     |   3 +
 .../inbox/channels/BaileysWhatsapp.vue        | 171 +++++++++++
 .../settings/inbox/channels/Whatsapp.vue      |   8 +-
 .../WhatsappBaileysLinkDeviceModal.vue        | 165 +++++++++++
 .../inbox/settingsPage/ConfigurationPage.vue  | 157 +++++++++-
 .../dashboard/store/modules/inboxes.js        |  14 +
 .../FluentIcon/dashboard-icons.json           |   4 +-
 app/javascript/shared/mixins/inboxMixin.js    |   6 +
 .../shared/mixins/specs/inboxMixin.spec.js    |   8 +
 app/jobs/webhooks/whatsapp_events_job.rb      |  29 +-
 app/models/channel/whatsapp.rb                |  31 +-
 app/models/concerns/cache_keys.rb             |   3 +-
 app/policies/inbox_policy.rb                  |   8 +
 .../incoming_message_baileys_service.rb       | 140 +++++++++
 .../providers/whatsapp_baileys_service.rb     | 101 +++++++
 app/views/api/v1/models/_inbox.json.jbuilder  |   1 +
 config/locales/en.yml                         |   3 +
 config/locales/pt_BR.yml                      |   3 +
 config/routes.rb                              |   2 +
 ...939_add_provider_connection_to_whatsapp.rb |   5 +
 db/schema.rb                                  |   1 +
 .../v1/accounts/inboxes_controller_spec.rb    |  78 +++++
 .../super_admin/accounts_controller_spec.rb   |   4 +-
 spec/factories/channel/channel_whatsapp.rb    |   5 +-
 spec/helpers/cache_keys_helper_spec.rb        |   2 +-
 .../incoming_message_baileys_service_spec.rb  | 268 ++++++++++++++++++
 .../whatsapp_baileys_service_spec.rb          | 232 +++++++++++++++
 41 files changed, 1656 insertions(+), 37 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue
 create mode 100644 app/services/whatsapp/incoming_message_baileys_service.rb
 create mode 100644 app/services/whatsapp/providers/whatsapp_baileys_service.rb
 create mode 100644 db/migrate/20250314185939_add_provider_connection_to_whatsapp.rb
 create mode 100644 spec/services/whatsapp/incoming_message_baileys_service_spec.rb
 create mode 100644 spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb

diff --git a/.env.example b/.env.example
index b7ba0920d..a8fdab64a 100644
--- a/.env.example
+++ b/.env.example
@@ -2,7 +2,7 @@
 # https://www.chatwoot.com/docs/self-hosted/configuration/environment-variables/#rails-production-variables
 
 # Used to verify the integrity of signed cookies. so ensure a secure value is set
-# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols. 
+# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols.
 # Use `rake secret` to generate this variable
 SECRET_KEY_BASE=replace_with_lengthy_secure_hex
 
@@ -258,3 +258,7 @@ AZURE_APP_SECRET=
 # contact_inboxes with no conversation older than 90 days will be removed
 # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
 
+# Baileys API Whatsapp provider
+BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=Chatwoot
+BAILEYS_PROVIDER_DEFAULT_URL=http://localhost:3025
+BAILEYS_PROVIDER_DEFAULT_API_KEY=
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 011faaf28..2d390bba9 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -62,6 +62,28 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     head :ok
   end
 
+  def setup_channel_provider
+    channel = @inbox.channel
+
+    unless channel.respond_to?(:setup_channel_provider)
+      render json: { error: 'Channel does not support setup' }, status: :unprocessable_entity and return
+    end
+
+    channel.setup_channel_provider
+    head :ok
+  end
+
+  def disconnect_channel_provider
+    channel = @inbox.channel
+
+    unless channel.respond_to?(:disconnect_channel_provider)
+      render json: { error: 'Channel does not support disconnect' }, status: :unprocessable_entity and return
+    end
+
+    channel.disconnect_channel_provider
+    head :ok
+  end
+
   def destroy
     ::DeleteObjectJob.perform_later(@inbox, Current.user, request.ip) if @inbox.present?
     render status: :ok, json: { message: I18n.t('messages.inbox_deletetion_response') }
diff --git a/app/helpers/cache_keys_helper.rb b/app/helpers/cache_keys_helper.rb
index aab33e44c..366c87383 100644
--- a/app/helpers/cache_keys_helper.rb
+++ b/app/helpers/cache_keys_helper.rb
@@ -10,6 +10,6 @@ module CacheKeysHelper
     return value_from_cache if value_from_cache.present?
 
     # zero epoch time: 1970-01-01 00:00:00 UTC
-    '0000000000'
+    '0000000000000'
   end
 end
diff --git a/app/javascript/dashboard/api/inboxes.js b/app/javascript/dashboard/api/inboxes.js
index 8c09791c8..7af82a720 100644
--- a/app/javascript/dashboard/api/inboxes.js
+++ b/app/javascript/dashboard/api/inboxes.js
@@ -28,6 +28,14 @@ class Inboxes extends CacheEnabledApiClient {
       agent_bot: botId,
     });
   }
+
+  setupChannelProvider(inboxId) {
+    return axios.post(`${this.url}/${inboxId}/setup_channel_provider`);
+  }
+
+  disconnectChannelProvider(inboxId) {
+    return axios.post(`${this.url}/${inboxId}/disconnect_channel_provider`);
+  }
 }
 
 export default new Inboxes();
diff --git a/app/javascript/dashboard/components/widgets/InboxName.vue b/app/javascript/dashboard/components/widgets/InboxName.vue
index 693162f95..a5840caaa 100644
--- a/app/javascript/dashboard/components/widgets/InboxName.vue
+++ b/app/javascript/dashboard/components/widgets/InboxName.vue
@@ -7,6 +7,14 @@ export default {
       type: Object,
       default: () => {},
     },
+    withPhoneNumber: {
+      type: Boolean,
+      default: false,
+    },
+    withProviderConnectionStatus: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     computedInboxClass() {
@@ -14,6 +22,9 @@ export default {
       const classByType = getInboxClassByType(type, phoneNumber);
       return classByType;
     },
+    providerConnection() {
+      return this.inbox.provider_connection?.connection;
+    },
   },
 };
 </script>
@@ -28,5 +39,17 @@ export default {
       size="12"
     />
     {{ inbox.name }}
+    <span v-if="withPhoneNumber" class="ml-2 text-n-slate-12">{{
+      inbox.phone_number
+    }}</span>
+    <span v-if="withProviderConnectionStatus" class="ml-2">
+      <fluent-icon
+        icon="circle"
+        type="filled"
+        :class="
+          providerConnection === 'open' ? 'text-green-500' : 'text-n-slate-8'
+        "
+      />
+    </span>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index ae798d8d9..e1ee9ce2d 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -5,6 +5,7 @@ import { useConfig } from 'dashboard/composables/useConfig';
 import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
 import { useAI } from 'dashboard/composables/useAI';
 import { useMapGetter } from 'dashboard/composables/store';
+import { useAdmin } from 'dashboard/composables/useAdmin';
 
 // components
 import ReplyBox from './ReplyBox.vue';
@@ -36,6 +37,7 @@ import { REPLY_POLICY } from 'shared/constants/links';
 import wootConstants from 'dashboard/constants/globals';
 import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
 import { FEATURE_FLAGS } from '../../../featureFlags';
+import WhatsappBaileysLinkDeviceModal from '../../../routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue';
 
 import NextButton from 'dashboard/components-next/button/Button.vue';
 
@@ -47,6 +49,7 @@ export default {
     Banner,
     ConversationLabelSuggestion,
     NextButton,
+    WhatsappBaileysLinkDeviceModal,
   },
   mixins: [inboxMixin],
   props: {
@@ -61,6 +64,7 @@ export default {
   },
   emits: ['contactPanelToggle'],
   setup() {
+    const { isAdmin } = useAdmin();
     const isPopOutReplyBox = ref(false);
     const { isEnterprise } = useConfig();
 
@@ -107,6 +111,7 @@ export default {
       fetchIntegrationsIfRequired,
       fetchLabelSuggestions,
       showNextBubbles,
+      isAdmin,
     };
   },
   data() {
@@ -118,6 +123,7 @@ export default {
       isProgrammaticScroll: false,
       messageSentSinceOpened: false,
       labelSuggestions: [],
+      showBaileysLinkDeviceModal: false,
     };
   },
 
@@ -128,6 +134,9 @@ export default {
       listLoadingStatus: 'getAllMessagesLoaded',
       currentAccountId: 'getCurrentAccountId',
     }),
+    currentInbox() {
+      return this.$store.getters['inboxes/getInbox'](this.currentChat.inbox_id);
+    },
     isOpen() {
       return this.currentChat?.status === wootConstants.STATUS_TYPE.OPEN;
     },
@@ -266,6 +275,9 @@ export default {
 
       return { incoming, outgoing };
     },
+    inboxProviderConnection() {
+      return this.currentInbox.provider_connection?.connection;
+    },
   },
 
   watch: {
@@ -476,12 +488,48 @@ export default {
         return false;
       });
     },
+    onOpenBaileysLinkDeviceModal() {
+      this.showBaileysLinkDeviceModal = true;
+    },
+    onCloseBaileysLinkDeviceModal() {
+      this.showBaileysLinkDeviceModal = false;
+    },
   },
 };
 </script>
 
 <template>
   <div class="flex flex-col justify-between flex-grow h-full min-w-0 m-0">
+    <template v-if="isAWhatsAppBaileysChannel">
+      <WhatsappBaileysLinkDeviceModal
+        v-if="showBaileysLinkDeviceModal"
+        :show="showBaileysLinkDeviceModal"
+        :on-close="onCloseBaileysLinkDeviceModal"
+        :inbox="currentInbox"
+      />
+      <Banner
+        v-if="inboxProviderConnection !== 'open'"
+        color-scheme="alert"
+        class="mt-2 mx-2 rounded-lg overflow-hidden"
+        :banner-message="
+          isAdmin
+            ? $t(
+                'CONVERSATION.INBOX.WHATSAPP_BAILEYS_PROVIDER_CONNECTION.NOT_CONNECTED'
+              )
+            : $t(
+                'CONVERSATION.INBOX.WHATSAPP_BAILEYS_PROVIDER_CONNECTION.NOT_CONNECTED_CONTACT_ADMIN'
+              )
+        "
+        :has-action-button="isAdmin"
+        :action-button-label="
+          $t(
+            'CONVERSATION.INBOX.WHATSAPP_BAILEYS_PROVIDER_CONNECTION.LINK_DEVICE'
+          )
+        "
+        action-button-icon=""
+        @primary-action="onOpenBaileysLinkDeviceModal"
+      />
+    </template>
     <Banner
       v-if="!currentChat.can_reply"
       color-scheme="alert"
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index fd254c357..802fe1864 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -241,7 +241,7 @@ export default {
       if (this.isAFacebookInbox) {
         return MESSAGE_MAX_LENGTH.FACEBOOK;
       }
-      if (this.isAWhatsAppChannel) {
+      if (this.isATwilioWhatsAppChannel) {
         return MESSAGE_MAX_LENGTH.TWILIO_WHATSAPP;
       }
       if (this.isASmsInbox) {
diff --git a/app/javascript/dashboard/composables/useInbox.js b/app/javascript/dashboard/composables/useInbox.js
index b8e399665..028d1a523 100644
--- a/app/javascript/dashboard/composables/useInbox.js
+++ b/app/javascript/dashboard/composables/useInbox.js
@@ -114,6 +114,13 @@ export const useInbox = () => {
     );
   });
 
+  const isAWhatsAppBaileysChannel = computed(() => {
+    return (
+      channelType.value === INBOX_TYPES.WHATSAPP &&
+      whatsAppAPIProvider.value === 'baileys'
+    );
+  });
+
   const isAWhatsAppChannel = computed(() => {
     return (
       channelType.value === INBOX_TYPES.WHATSAPP ||
@@ -136,6 +143,7 @@ export const useInbox = () => {
     isATwilioWhatsAppChannel,
     isAWhatsAppCloudChannel,
     is360DialogWhatsAppChannel,
+    isAWhatsAppBaileysChannel,
     isAnEmailChannel,
   };
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 6cfe9d082..93bf73a43 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -234,6 +234,13 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "INBOX": {
+      "WHATSAPP_BAILEYS_PROVIDER_CONNECTION": {
+        "NOT_CONNECTED": "WhatsApp is not connected. Please link your device again.",
+        "NOT_CONNECTED_CONTACT_ADMIN": "WhatsApp is not connected. Please contact your administrator to link your device again.",
+        "LINK_DEVICE": "Link device"
+      }
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 5e26a34c0..e057b4c8a 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -221,7 +221,8 @@
           "LABEL": "API Provider",
           "TWILIO": "Twilio",
           "WHATSAPP_CLOUD": "WhatsApp Cloud",
-          "360_DIALOG": "360Dialog"
+          "360_DIALOG": "360Dialog",
+          "BAILEYS": "Baileys"
         },
         "INBOX_NAME": {
           "LABEL": "Inbox Name",
@@ -260,6 +261,25 @@
           "WEBHOOK_URL": "Webhook URL",
           "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
+        "PROVIDER_URL": {
+          "LABEL": "Provider URL",
+          "PLACEHOLDER": "If provider is not running locally, please provide the URL",
+          "ERROR":"Please enter a valid URL"
+        },
+        "ADVANCED_OPTIONS": "Advanced options",
+        "BAILEYS": {
+          "SUBTITLE": "Click below to setup the WhatsApp channel using Baileys.",
+          "LINK_BUTTON": "Link device",
+          "LINK_DEVICE_MODAL": {
+            "TITLE": "Link your device",
+            "SUBTITLE": "Scan the QR code to link your device. Make sure the phone number is correct before scanning.",
+            "LOADING_QRCODE": "Loading QR code...",
+            "RECONNECTING": "Connecting...",
+            "LINK_DEVICE": "Link device",
+            "DISCONNECT": "Disconnect",
+            "CONNECTED": "Your device has been connected successfully. You can now start sending and receiving messages."
+          }
+        },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
           "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
@@ -529,6 +549,13 @@
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
       "WHATSAPP_WEBHOOK_TITLE": "Webhook Verification Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
+      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_TITLE": "Manage Provider Connection",
+      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_SUBHEADER": "Link your device and manage the provider connection.",
+      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_BUTTON": "Manage connection",
+      "WHATSAPP_PROVIDER_URL_TITLE": "Provider URL",
+      "WHATSAPP_PROVIDER_URL_SUBHEADER": "If the provider is not running locally, please provide the URL.",
+      "WHATSAPP_PROVIDER_URL_PLACEHOLDER": "Enter the provider URL",
+      "WHATSAPP_PROVIDER_URL_ERROR": "Please enter a valid URL",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "HELP_CENTER": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 87c081c1f..d8a8da3f7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -234,6 +234,13 @@
     "SIDEBAR": {
       "CONTACT": "Contato",
       "COPILOT": "Copiloto"
+    },
+    "INBOX": {
+      "WHATSAPP_BAILEYS_PROVIDER_CONNECTION": {
+        "NOT_CONNECTED": "O WhatsApp não está conectado. Por favor conecte o seu dispositivo novamente.",
+        "NOT_CONNECTED_CONTACT_ADMIN": "O WhatsApp não está conectado. Por favor contate o seu administrador para conectar o dispositivo novamente.",
+        "LINK_DEVICE": "Conectar dispositivo"
+      }
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 2a4f91be4..06059a0bc 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -214,7 +214,8 @@
           "LABEL": "Provedor de API",
           "TWILIO": "Twilio",
           "WHATSAPP_CLOUD": "Cloud do WhatsApp",
-          "360_DIALOG": "360Dialog"
+          "360_DIALOG": "360Dialog",
+          "BAILEYS": "Baileys"
         },
         "INBOX_NAME": {
           "LABEL": "Nome da Caixa de Entrada",
@@ -253,6 +254,25 @@
           "WEBHOOK_URL": "URL do Webhook",
           "WEBHOOK_VERIFICATION_TOKEN": "Token de verificação Webhook"
         },
+        "PROVIDER_URL": {
+          "LABEL": "URL do provedor",
+          "PLACEHOLDER": "Se o provedor não está rodando localmente, por favor, insira a URL do provedor",
+          "ERROR":"Por favor, insira uma URL válida"
+        },
+        "ADVANCED_OPTIONS": "Opções avançadas",
+        "BAILEYS": {
+          "SUBTITLE": "Clique abaixo para configurar o canal do WhatsApp usando o Baileys.",
+          "LINK_BUTTON": "Conectar dispositivo",
+          "LINK_DEVICE_MODAL": {
+            "TITLE": "Conecte o seu dispositivo",
+            "SUBTITLE": "Escaneie o QR code para conectar seu dispositivo. Certifique-se de que o número de telefone esteja correto antes de escanear.",
+            "LOADING_QRCODE": "Carregando QR code...",
+            "RECONNECTING": "Conectando...",
+            "LINK_DEVICE": "Conectar dispositivo",
+            "DISCONNECT": "Desconectar",
+            "CONNECTED": "Seu dispositivo foi conectado com sucesso. Agora você pode começar a enviar e receber mensagens."
+          }
+        },
         "SUBMIT_BUTTON": "Criar canal do WhatsApp",
         "API": {
           "ERROR_MESSAGE": "Não foi possível salvar o canal do WhatsApp"
@@ -522,6 +542,13 @@
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualizar",
       "WHATSAPP_WEBHOOK_TITLE": "Token de verificação Webhook",
       "WHATSAPP_WEBHOOK_SUBHEADER": "Este token é usado para verificar a autenticidade do webhook endpoint.",
+      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_TITLE": "Gerenciar Conexão do Provedor",
+      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_SUBHEADER": "Conecte o seu dispositivo e gerencie a conexão do provedor.",
+      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_BUTTON": "Gerenciar conexão",
+      "WHATSAPP_PROVIDER_URL_TITLE": "URL do provedor",
+      "WHATSAPP_PROVIDER_URL_SUBHEADER": "Se o provedor não estiver rodando localmente, por favor, forneça a URL.",
+      "WHATSAPP_PROVIDER_URL_PLACEHOLDER": "Digite a URL do provedor",
+      "WHATSAPP_PROVIDER_URL_ERROR": "Por favor, insira uma URL válida",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
     "HELP_CENTER": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 33b371ef7..6a2fcd41c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -44,6 +44,17 @@
             "CONTACT_UPDATED": "Contato atualizado"
           }
         },
+        "NAME": {
+          "LABEL": "Nome do Webhook",
+          "PLACEHOLDER": "Insira o nome do webhook"
+        },
+        "INBOX": {
+          "LABEL": "Caixa de Entrada",
+          "TITLE": "Selecione a caixa de entrada",
+          "PLACEHOLDER": "Todas as caixas de entrada",
+          "NO_RESULTS": "Nenhuma caixa de entrada encontrada",
+          "INPUT_PLACEHOLDER": "Buscar caixa de entrada"
+        },
         "END_POINT": {
           "LABEL": "URL do Webhook",
           "PLACEHOLDER": "Exemplo: {webhookExampleURL}",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
index f40329256..903ec4669 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
@@ -1,11 +1,18 @@
 <script>
 import EmptyState from '../../../../components/widgets/EmptyState.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
+import WhatsappBaileysLinkDeviceModal from './components/WhatsappBaileysLinkDeviceModal.vue';
 
 export default {
   components: {
     EmptyState,
     NextButton,
+    WhatsappBaileysLinkDeviceModal,
+  },
+  data() {
+    return {
+      showBaileysLinkDeviceModal: false,
+    };
   },
   computed: {
     currentInbox() {
@@ -31,6 +38,12 @@ export default {
         this.currentInbox.provider === 'whatsapp_cloud'
       );
     },
+    isWhatsAppBaileysInbox() {
+      return (
+        this.currentInbox.channel_type === 'Channel::Whatsapp' &&
+        this.currentInbox.provider === 'baileys'
+      );
+    },
     message() {
       if (this.isATwilioInbox) {
         return `${this.$t('INBOX_MGMT.FINISH.MESSAGE')}. ${this.$t(
@@ -56,6 +69,12 @@ export default {
         )}`;
       }
 
+      if (this.isWhatsAppBaileysInbox) {
+        return `${this.$t('INBOX_MGMT.FINISH.MESSAGE')}. ${this.$t(
+          'INBOX_MGMT.ADD.WHATSAPP.BAILEYS.SUBTITLE'
+        )}`;
+      }
+
       if (this.isAEmailInbox && !this.currentInbox.provider) {
         return this.$t('INBOX_MGMT.ADD.EMAIL_CHANNEL.FINISH_MESSAGE');
       }
@@ -67,6 +86,14 @@ export default {
       return this.$t('INBOX_MGMT.FINISH.MESSAGE');
     },
   },
+  methods: {
+    onOpenBaileysLinkDeviceModal() {
+      this.showBaileysLinkDeviceModal = true;
+    },
+    onCloseBaileysLinkDeviceModal() {
+      this.showBaileysLinkDeviceModal = false;
+    },
+  },
 };
 </script>
 
@@ -110,6 +137,11 @@ export default {
             :script="currentInbox.provider_config.webhook_verify_token"
           />
         </div>
+        <div v-if="isWhatsAppBaileysInbox" class="w-[50%] max-w-[50%] ml-[25%]">
+          <woot-button @click="onOpenBaileysLinkDeviceModal">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_BUTTON') }}
+          </woot-button>
+        </div>
         <div class="w-[50%] max-w-[50%] ml-[25%]">
           <woot-code
             v-if="isALineInbox"
@@ -158,5 +190,12 @@ export default {
         </div>
       </div>
     </EmptyState>
+    <WhatsappBaileysLinkDeviceModal
+      v-if="showBaileysLinkDeviceModal"
+      :show="showBaileysLinkDeviceModal"
+      :on-close="onCloseBaileysLinkDeviceModal"
+      :inbox="currentInbox"
+      is-setup
+    />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 845206d1c..974dd4b6d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -88,6 +88,9 @@ export default {
       if (this.isATwilioWhatsAppChannel) {
         return this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO');
       }
+      if (this.isAWhatsAppBaileysChannel) {
+        return this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.BAILEYS');
+      }
       return '';
     },
     tabs() {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
new file mode 100644
index 000000000..dbfa2d739
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
@@ -0,0 +1,171 @@
+<script>
+import { mapGetters } from 'vuex';
+import { useVuelidate } from '@vuelidate/core';
+import { useAlert } from 'dashboard/composables';
+import { required, requiredIf } from '@vuelidate/validators';
+import router from '../../../../index';
+import { isPhoneE164OrEmpty } from 'shared/helpers/Validators';
+import { isValidURL } from '../../../../../helper/URLHelper';
+
+export default {
+  setup() {
+    return { v$: useVuelidate() };
+  },
+  data() {
+    return {
+      inboxName: '',
+      phoneNumber: '',
+      apiKey: '',
+      providerUrl: '',
+      showAdvancedOptions: false,
+    };
+  },
+  computed: {
+    ...mapGetters({ uiFlags: 'inboxes/getUIFlags' }),
+  },
+  validations() {
+    return {
+      inboxName: { required },
+      phoneNumber: { required, isPhoneE164OrEmpty },
+      providerUrl: {
+        isValidURL: value => !value || isValidURL(value),
+        requiredIf: requiredIf(this.apiKey),
+      },
+      apiKey: { requiredIf: requiredIf(this.providerUrl) },
+    };
+  },
+  methods: {
+    async createChannel() {
+      this.v$.$touch();
+      if (this.v$.$invalid) {
+        return;
+      }
+
+      try {
+        const whatsappChannel = await this.$store.dispatch(
+          'inboxes/createChannel',
+          {
+            name: this.inboxName,
+            channel: {
+              type: 'whatsapp',
+              phone_number: this.phoneNumber,
+              provider: 'baileys',
+              provider_config:
+                this.apiKey || this.providerUrl
+                  ? {
+                      api_key: this.apiKey,
+                      url: this.providerUrl,
+                    }
+                  : {},
+            },
+          }
+        );
+
+        router.replace({
+          name: 'settings_inboxes_add_agents',
+          params: {
+            page: 'new',
+            inbox_id: whatsappChannel.id,
+          },
+        });
+      } catch (error) {
+        useAlert(
+          error.message || this.$t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE')
+        );
+      }
+    },
+    setShowAdvancedOptions() {
+      this.showAdvancedOptions = true;
+    },
+  },
+};
+</script>
+
+<template>
+  <form class="flex flex-wrap mx-0" @submit.prevent="createChannel()">
+    <div class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%]">
+      <label :class="{ error: v$.inboxName.$error }">
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.INBOX_NAME.LABEL') }}
+        <input
+          v-model="inboxName"
+          type="text"
+          :placeholder="$t('INBOX_MGMT.ADD.WHATSAPP.INBOX_NAME.PLACEHOLDER')"
+          @blur="v$.inboxName.$touch"
+        />
+        <span v-if="v$.inboxName.$error" class="message">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.INBOX_NAME.ERROR') }}
+        </span>
+      </label>
+    </div>
+
+    <div class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%]">
+      <label :class="{ error: v$.phoneNumber.$error }">
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.PHONE_NUMBER.LABEL') }}
+        <input
+          v-model="phoneNumber"
+          type="text"
+          :placeholder="$t('INBOX_MGMT.ADD.WHATSAPP.PHONE_NUMBER.PLACEHOLDER')"
+          @blur="v$.phoneNumber.$touch"
+        />
+        <span v-if="v$.phoneNumber.$error" class="message">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.PHONE_NUMBER.ERROR') }}
+        </span>
+      </label>
+    </div>
+
+    <div
+      v-if="!showAdvancedOptions"
+      class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%] mb-4"
+    >
+      <woot-button
+        icon="add"
+        size="small"
+        variant="link"
+        @click="setShowAdvancedOptions"
+      >
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.ADVANCED_OPTIONS') }}
+      </woot-button>
+    </div>
+    <template v-else>
+      <div class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%]">
+        <span class="text-sm text-gray-600">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.ADVANCED_OPTIONS') }}
+        </span>
+        <label :class="{ error: v$.providerUrl.$error }">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDER_URL.LABEL') }}
+          <input
+            v-model="providerUrl"
+            type="text"
+            :placeholder="
+              $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDER_URL.PLACEHOLDER')
+            "
+          />
+          <span v-if="v$.providerUrl.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDER_URL.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%]">
+        <label :class="{ error: v$.apiKey.$error }">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.API_KEY.LABEL') }}
+          <input
+            v-model="apiKey"
+            type="text"
+            :placeholder="$t('INBOX_MGMT.ADD.WHATSAPP.API_KEY.PLACEHOLDER')"
+          />
+          <span v-if="v$.apiKey.$error" class="message">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.API_KEY.ERROR') }}
+          </span>
+        </label>
+      </div>
+    </template>
+
+    <div class="w-full">
+      <woot-submit-button
+        :loading="uiFlags.isCreating"
+        :button-text="$t('INBOX_MGMT.ADD.WHATSAPP.SUBMIT_BUTTON')"
+      />
+    </div>
+  </form>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index 68a9d8bcd..f07d266af 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -3,6 +3,7 @@ import PageHeader from '../../SettingsSubPageHeader.vue';
 import Twilio from './Twilio.vue';
 import ThreeSixtyDialogWhatsapp from './360DialogWhatsapp.vue';
 import CloudWhatsapp from './CloudWhatsapp.vue';
+import BaileysWhatsapp from './BaileysWhatsapp.vue';
 
 export default {
   components: {
@@ -10,6 +11,7 @@ export default {
     Twilio,
     ThreeSixtyDialogWhatsapp,
     CloudWhatsapp,
+    BaileysWhatsapp,
   },
   data() {
     return {
@@ -37,12 +39,16 @@ export default {
           <option value="twilio">
             {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO') }}
           </option>
+          <option value="baileys">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.BAILEYS') }}
+          </option>
         </select>
       </label>
     </div>
 
     <Twilio v-if="provider === 'twilio'" type="whatsapp" />
     <ThreeSixtyDialogWhatsapp v-else-if="provider === '360dialog'" />
-    <CloudWhatsapp v-else />
+    <CloudWhatsapp v-if="provider === 'whatsapp_cloud'" />
+    <BaileysWhatsapp v-if="provider === 'baileys'" />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue
new file mode 100644
index 000000000..bf12a8982
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue
@@ -0,0 +1,165 @@
+<script setup>
+import { onMounted, computed, onUnmounted, ref, watchEffect } from 'vue';
+import { useStore } from 'vuex';
+import { useAlert } from 'dashboard/composables';
+import InboxName from 'dashboard/components/widgets/InboxName.vue';
+import Spinner from 'shared/components/Spinner.vue';
+
+const props = defineProps({
+  show: { type: Boolean, required: true },
+  onClose: { type: Function, required: true },
+  isSetup: { type: Boolean, required: false },
+  inbox: {
+    type: Object,
+    required: true,
+  },
+});
+
+const store = useStore();
+
+const providerConnection = computed(() => props.inbox.provider_connection);
+const connection = computed(() => providerConnection.value?.connection);
+const qrDataUrl = computed(() => providerConnection.value?.qr_data_url);
+const error = computed(() => providerConnection.value?.error);
+
+const loading = ref(false);
+
+const handleError = e => {
+  useAlert(e.message);
+  loading.value = false;
+};
+const setup = () => {
+  loading.value = true;
+  store
+    .dispatch('inboxes/setupChannelProvider', props.inbox.id)
+    .catch(handleError);
+};
+const disconnect = () => {
+  loading.value = true;
+  store
+    .dispatch('inboxes/disconnectChannelProvider', props.inbox.id)
+    .catch(handleError);
+};
+
+onMounted(() => {
+  if (!connection.value || connection.value === 'close') {
+    setup();
+  }
+});
+onUnmounted(() => {
+  if (connection.value === 'connecting') {
+    disconnect();
+  }
+});
+watchEffect(() => {
+  if (connection.value) {
+    loading.value = false;
+  }
+});
+</script>
+
+<template>
+  <woot-modal :show="show" size="small" @close="onClose">
+    <div class="flex flex-col h-auto overflow-auto">
+      <woot-modal-header
+        :header-title="
+          $t('INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.TITLE')
+        "
+        :header-content="
+          $t('INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.SUBTITLE')
+        "
+      />
+
+      <div class="flex flex-col gap-4 p-8 pt-4">
+        <div class="flex flex-col gap-4 items-center">
+          <InboxName
+            :inbox="inbox"
+            class="!text-lg"
+            with-phone-number
+            with-provider-connection-status
+          />
+
+          <template v-if="!connection || connection === 'close' || error">
+            <p v-if="error" class="text-red-500 text-center">
+              {{ error }}
+            </p>
+            <woot-button
+              class="button clear w-fit"
+              :is-loading="loading"
+              @click="setup"
+            >
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.LINK_DEVICE'
+                )
+              }}
+            </woot-button>
+          </template>
+
+          <template v-else-if="connection === 'connecting'">
+            <div v-if="!qrDataUrl" class="flex flex-col gap-4 items-center">
+              <p>
+                {{
+                  $t(
+                    'INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.LOADING_QRCODE'
+                  )
+                }}
+              </p>
+              <Spinner />
+            </div>
+            <img
+              v-else
+              :src="qrDataUrl"
+              alt="QR Code"
+              class="w-[276px] h-[276px]"
+            />
+          </template>
+
+          <template v-else-if="connection === 'reconnecting'">
+            <p>
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.RECONNECTING'
+                )
+              }}
+            </p>
+            <Spinner />
+          </template>
+
+          <template v-else-if="connection === 'open'">
+            <p v-if="isSetup" class="text-center">
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.CONNECTED'
+                )
+              }}
+            </p>
+            <div class="flex gap-4">
+              <woot-button
+                class="button clear w-fit"
+                :is-loading="loading"
+                @click="disconnect"
+              >
+                {{
+                  $t(
+                    'INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.DISCONNECT'
+                  )
+                }}
+              </woot-button>
+              <router-link
+                v-if="isSetup"
+                class="rounded button success"
+                :to="{
+                  name: 'inbox_dashboard',
+                  params: { inboxId: inbox.id },
+                }"
+              >
+                {{ $t('INBOX_MGMT.FINISH.BUTTON_TEXT') }}
+              </router-link>
+            </div>
+          </template>
+        </div>
+      </div>
+    </div>
+  </woot-modal>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index bc5355c3c..792a15299 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -5,8 +5,11 @@ import SettingsSection from '../../../../../components/SettingsSection.vue';
 import ImapSettings from '../ImapSettings.vue';
 import SmtpSettings from '../SmtpSettings.vue';
 import { useVuelidate } from '@vuelidate/core';
-import { required } from '@vuelidate/validators';
 import NextButton from 'dashboard/components-next/button/Button.vue';
+import { requiredIf } from '@vuelidate/validators';
+import { isValidURL } from '../../../../../helper/URLHelper';
+import WhatsappBaileysLinkDeviceModal from '../components/WhatsappBaileysLinkDeviceModal.vue';
+import InboxName from '../../../../../components/widgets/InboxName.vue';
 
 export default {
   components: {
@@ -14,6 +17,8 @@ export default {
     ImapSettings,
     SmtpSettings,
     NextButton,
+    WhatsappBaileysLinkDeviceModal,
+    InboxName,
   },
   mixins: [inboxMixin],
   props: {
@@ -29,10 +34,17 @@ export default {
     return {
       hmacMandatory: false,
       whatsAppInboxAPIKey: '',
+      whatsAppProviderUrl: '',
+      showBaileysLinkDeviceModal: false,
     };
   },
-  validations: {
-    whatsAppInboxAPIKey: { required },
+  validations() {
+    return {
+      whatsAppInboxAPIKey: {
+        requiredIf: requiredIf(!this.isAWhatsAppBaileysChannel),
+      },
+      whatsAppProviderUrl: { isValidURL: value => !value || isValidURL(value) },
+    };
   },
   watch: {
     inbox() {
@@ -83,6 +95,31 @@ export default {
         useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
       }
     },
+    async updateWhatsAppProviderUrl() {
+      try {
+        const payload = {
+          id: this.inbox.id,
+          formData: false,
+          channel: {
+            provider_config: {
+              ...this.inbox.provider_config,
+              provider_url: this.whatsAppProviderUrl,
+            },
+          },
+        };
+
+        await this.$store.dispatch('inboxes/updateInbox', payload);
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
+      }
+    },
+    onOpenBaileysLinkDeviceModal() {
+      this.showBaileysLinkDeviceModal = true;
+    },
+    onCloseBaileysLinkDeviceModal() {
+      this.showBaileysLinkDeviceModal = false;
+    },
   },
 };
 </script>
@@ -194,8 +231,8 @@ export default {
     <ImapSettings :inbox="inbox" />
     <SmtpSettings v-if="inbox.imap_enabled" :inbox="inbox" />
   </div>
-  <div v-else-if="isAWhatsAppChannel && !isATwilioChannel">
-    <div v-if="inbox.provider_config" class="mx-8">
+  <div v-else-if="isAWhatsAppCloudChannel && inbox.provider_config">
+    <div class="mx-8">
       <SettingsSection
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_WEBHOOK_TITLE')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_WEBHOOK_SUBHEADER')"
@@ -237,6 +274,116 @@ export default {
       </SettingsSection>
     </div>
   </div>
+  <div v-else-if="isAWhatsAppBaileysChannel">
+    <WhatsappBaileysLinkDeviceModal
+      v-if="showBaileysLinkDeviceModal"
+      :show="showBaileysLinkDeviceModal"
+      :on-close="onCloseBaileysLinkDeviceModal"
+      :inbox="inbox"
+    />
+    <div class="mx-8">
+      <SettingsSection
+        :title="
+          $t(
+            'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_TITLE'
+          )
+        "
+        :sub-title="
+          $t(
+            'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_SUBHEADER'
+          )
+        "
+      >
+        <div class="flex flex-col gap-2">
+          <InboxName
+            :inbox="inbox"
+            class="!text-lg !m-0"
+            with-phone-number
+            with-provider-connection-status
+          />
+          <woot-button class="w-fit" @click="onOpenBaileysLinkDeviceModal">
+            {{
+              $t(
+                'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_BUTTON'
+              )
+            }}
+          </woot-button>
+        </div>
+      </SettingsSection>
+      <SettingsSection
+        :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_TITLE')"
+        :sub-title="
+          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_SUBHEADER')
+        "
+      >
+        <div
+          class="flex items-center justify-between flex-1 mt-2 whatsapp-settings--content"
+        >
+          <woot-input
+            v-model="whatsAppProviderUrl"
+            type="text"
+            class="flex-1 mr-2"
+            :placeholder="
+              $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_PLACEHOLDER')
+            "
+            @keydown="v$.whatsAppProviderUrl.$touch"
+          />
+          <woot-button
+            :disabled="
+              v$.whatsAppProviderUrl.$invalid ||
+              whatsAppProviderUrl === inbox.provider_config.provider_url
+            "
+            @click="updateWhatsAppProviderUrl"
+          >
+            {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
+          </woot-button>
+        </div>
+        <span v-if="v$.whatsAppProviderUrl.$error" class="text-red-400">
+          {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_ERROR') }}
+        </span>
+      </SettingsSection>
+      <template v-if="inbox.provider_config.api_key">
+        <SettingsSection
+          :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_TITLE')"
+          :sub-title="
+            $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_SUBHEADER')
+          "
+        >
+          <woot-code :script="inbox.provider_config.api_key" />
+        </SettingsSection>
+      </template>
+      <SettingsSection
+        :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_TITLE')"
+        :sub-title="
+          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_SUBHEADER')
+        "
+      >
+        <div
+          class="flex items-center justify-between flex-1 mt-2 whatsapp-settings--content"
+        >
+          <woot-input
+            v-model="whatsAppInboxAPIKey"
+            type="text"
+            class="flex-1 mr-2"
+            :placeholder="
+              $t(
+                'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_PLACEHOLDER'
+              )
+            "
+          />
+          <woot-button
+            :disabled="
+              v$.whatsAppInboxAPIKey.$invalid ||
+              whatsAppInboxAPIKey === inbox.provider_config.api_key
+            "
+            @click="updateWhatsAppInboxAPIKey"
+          >
+            {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
+          </woot-button>
+        </div>
+      </SettingsSection>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index 001cc237e..75837b004 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -268,6 +268,20 @@ export const actions = {
       throw new Error(error);
     }
   },
+  setupChannelProvider: async (_, inboxId) => {
+    try {
+      await InboxesAPI.setupChannelProvider(inboxId);
+    } catch (error) {
+      throwErrorMessage(error);
+    }
+  },
+  disconnectChannelProvider: async (_, inboxId) => {
+    try {
+      await InboxesAPI.disconnectChannelProvider(inboxId);
+    } catch (error) {
+      throwErrorMessage(error);
+    }
+  },
 };
 
 export const mutations = {
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 918d012be..7a5d3a131 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -285,5 +285,7 @@
     "M9.60364 9.20645C9.60364 8.67008 10.0385 8.23523 10.5749 8.23523C11.1113 8.23523 11.5461 8.67008 11.5461 9.20645V11.4511C11.5461 11.9875 11.1113 12.4223 10.5749 12.4223C10.0385 12.4223 9.60364 11.9875 9.60364 11.4511V9.20645Z",
     "M17.1442 5.57049C13.5275 5.06019 10.5793 5.04007 6.88135 5.56825C5.9466 5.70176 5.32812 5.79197 4.85654 5.92976C4.41928 6.05757 4.17061 6.20994 3.96492 6.43984C3.539 6.91583 3.48286 7.45419 3.4248 9.33184C3.36775 11.1772 3.48076 12.831 3.69481 14.6918C3.80887 15.6834 3.88736 16.3526 4.01268 16.8613C4.13155 17.3439 4.27532 17.6034 4.47513 17.802C4.67654 18.0023 4.93467 18.1435 5.40841 18.2581C5.90952 18.3793 6.56702 18.4526 7.5442 18.5592C10.7045 18.904 13.0702 18.9022 16.2423 18.561C17.2313 18.4546 17.8995 18.3813 18.4081 18.2609C18.8913 18.1465 19.1511 18.0063 19.3497 17.8118C19.5442 17.6213 19.6928 17.3587 19.8217 16.852C19.9561 16.3234 20.0476 15.624 20.18 14.5966C20.4162 12.7633 20.5863 11.1533 20.5929 9.3896C20.5999 7.50391 20.5613 6.96737 20.1306 6.46971C19.9226 6.22932 19.6696 6.0713 19.2224 5.93968C18.7395 5.79754 18.1042 5.70594 17.1442 5.57049ZM6.65555 3.98715C10.5078 3.43695 13.6072 3.45849 17.3674 3.98902L17.4224 3.99678C18.3127 4.12235 19.0648 4.22844 19.6733 4.40753C20.33 4.60078 20.8792 4.89417 21.3382 5.4245C22.2041 6.42482 22.1984 7.6117 22.1909 9.18858C22.1905 9.25686 22.1902 9.32584 22.19 9.3956C22.183 11.2604 22.0026 12.949 21.764 14.8006L21.7577 14.8496C21.6332 15.8159 21.5307 16.6121 21.3695 17.2458C21.2 17.9121 20.9467 18.4833 20.4672 18.9529C19.9919 19.4183 19.4302 19.6602 18.776 19.8151C18.1582 19.9613 17.3895 20.044 16.4629 20.1436L16.4131 20.149C13.1283 20.5023 10.6472 20.5043 7.37097 20.1469L7.32043 20.1414C6.40679 20.0417 5.64604 19.9587 5.03292 19.8104C4.38112 19.6527 3.82317 19.406 3.34911 18.9347C2.87346 18.4618 2.62363 17.8999 2.46191 17.2433C2.30938 16.6241 2.22071 15.8531 2.11393 14.9246L2.10815 14.8743C1.88863 12.9659 1.76823 11.23 1.82845 9.28246C1.83063 9.2118 1.83272 9.14191 1.83479 9.07281C1.8816 7.50776 1.91671 6.33374 2.7747 5.37486C3.22992 4.86612 3.76798 4.58399 4.40853 4.39678C5.00257 4.22316 5.73505 4.11858 6.60207 3.99479C6.61981 3.99225 6.63764 3.9897 6.65555 3.98715Z"
   ],
-  "scan-person-outline": "M5.25 3.5A1.75 1.75 0 0 0 3.5 5.25v3a.75.75 0 0 1-1.5 0v-3A3.25 3.25 0 0 1 5.25 2h3a.75.75 0 0 1 0 1.5zm0 17a1.75 1.75 0 0 1-1.75-1.75v-3a.75.75 0 0 0-1.5 0v3A3.25 3.25 0 0 0 5.25 22h3a.75.75 0 0 0 .707-1l-.005-.015a.75.75 0 0 0-.702-.485zM20.5 5.25a1.75 1.75 0 0 0-1.75-1.75h-3a.75.75 0 0 1 0-1.5h3A3.25 3.25 0 0 1 22 5.25v3a.75.75 0 0 1-1.5 0zM18.75 20.5a1.75 1.75 0 0 0 1.75-1.75v-3a.75.75 0 0 1 1.5 0v3A3.25 3.25 0 0 1 18.75 22h-3a.75.75 0 0 1 0-1.5zM6.5 18.616q0 .465.258.884H5.25a1 1 0 0 1-.129-.011A3.1 3.1 0 0 1 5 18.616v-.366A2.25 2.25 0 0 1 7.25 16h9.5A2.25 2.25 0 0 1 19 18.25v.366c0 .31-.047.601-.132.875a1 1 0 0 1-.118.009h-1.543a1.56 1.56 0 0 0 .293-.884v-.366a.75.75 0 0 0-.75-.75h-9.5a.75.75 0 0 0-.75.75zm8.25-8.866a2.75 2.75 0 1 0-5.5 0a2.75 2.75 0 0 0 5.5 0m1.5 0a4.25 4.25 0 1 1-8.5 0a4.25 4.25 0 0 1 8.5 0"
+  "scan-person-outline": "M5.25 3.5A1.75 1.75 0 0 0 3.5 5.25v3a.75.75 0 0 1-1.5 0v-3A3.25 3.25 0 0 1 5.25 2h3a.75.75 0 0 1 0 1.5zm0 17a1.75 1.75 0 0 1-1.75-1.75v-3a.75.75 0 0 0-1.5 0v3A3.25 3.25 0 0 0 5.25 22h3a.75.75 0 0 0 .707-1l-.005-.015a.75.75 0 0 0-.702-.485zM20.5 5.25a1.75 1.75 0 0 0-1.75-1.75h-3a.75.75 0 0 1 0-1.5h3A3.25 3.25 0 0 1 22 5.25v3a.75.75 0 0 1-1.5 0zM18.75 20.5a1.75 1.75 0 0 0 1.75-1.75v-3a.75.75 0 0 1 1.5 0v3A3.25 3.25 0 0 1 18.75 22h-3a.75.75 0 0 1 0-1.5zM6.5 18.616q0 .465.258.884H5.25a1 1 0 0 1-.129-.011A3.1 3.1 0 0 1 5 18.616v-.366A2.25 2.25 0 0 1 7.25 16h9.5A2.25 2.25 0 0 1 19 18.25v.366c0 .31-.047.601-.132.875a1 1 0 0 1-.118.009h-1.543a1.56 1.56 0 0 0 .293-.884v-.366a.75.75 0 0 0-.75-.75h-9.5a.75.75 0 0 0-.75.75zm8.25-8.866a2.75 2.75 0 1 0-5.5 0a2.75 2.75 0 0 0 5.5 0m1.5 0a4.25 4.25 0 1 1-8.5 0a4.25 4.25 0 0 1 8.5 0",
+  "circle-outline": "M12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22ZM12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20Z",
+  "circle-filled": "M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"
 }
diff --git a/app/javascript/shared/mixins/inboxMixin.js b/app/javascript/shared/mixins/inboxMixin.js
index 94f5997f7..f2fb2a36a 100644
--- a/app/javascript/shared/mixins/inboxMixin.js
+++ b/app/javascript/shared/mixins/inboxMixin.js
@@ -86,6 +86,12 @@ export default {
         this.whatsAppAPIProvider === 'default'
       );
     },
+    isAWhatsAppBaileysChannel() {
+      return (
+        this.channelType === INBOX_TYPES.WHATSAPP &&
+        this.whatsAppAPIProvider === 'baileys'
+      );
+    },
     chatAdditionalAttributes() {
       const { additional_attributes: additionalAttributes } = this.chat || {};
       return additionalAttributes || {};
diff --git a/app/javascript/shared/mixins/specs/inboxMixin.spec.js b/app/javascript/shared/mixins/specs/inboxMixin.spec.js
index 5d5fb329b..31944fc73 100644
--- a/app/javascript/shared/mixins/specs/inboxMixin.spec.js
+++ b/app/javascript/shared/mixins/specs/inboxMixin.spec.js
@@ -269,6 +269,14 @@ describe('inboxMixin', () => {
       expect(wrapper.vm.is360DialogWhatsAppChannel).toBe(true);
     });
 
+    it('isAWhatsAppBaileysChannel returns true if channel type is WhatsApp and provider is baileys', () => {
+      const Component = getComponentConfigForInbox('Channel::Whatsapp', {
+        provider: 'baileys',
+      });
+      const wrapper = shallowMount(Component);
+      expect(wrapper.vm.isAWhatsAppBaileysChannel).toBe(true);
+    });
+
     it('isAWhatsAppChannel returns true if channel type is WhatsApp', () => {
       const Component = getComponentConfigForInbox('Channel::Whatsapp');
       const wrapper = shallowMount(Component);
diff --git a/app/jobs/webhooks/whatsapp_events_job.rb b/app/jobs/webhooks/whatsapp_events_job.rb
index b130161de..54f43343b 100644
--- a/app/jobs/webhooks/whatsapp_events_job.rb
+++ b/app/jobs/webhooks/whatsapp_events_job.rb
@@ -2,8 +2,7 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
   queue_as :low
 
   def perform(params = {})
-    channel = find_channel_from_whatsapp_business_payload(params)
-
+    channel = find_channel(params)
     if channel_is_inactive?(channel)
       Rails.logger.warn("Inactive WhatsApp channel: #{channel&.phone_number || "unknown - #{params[:phone_number]}"}")
       return
@@ -12,6 +11,8 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
     case channel.provider
     when 'whatsapp_cloud'
       Whatsapp::IncomingMessageWhatsappCloudService.new(inbox: channel.inbox, params: params).perform
+    when 'baileys'
+      Whatsapp::IncomingMessageBaileysService.new(inbox: channel.inbox, params: params).perform
     else
       Whatsapp::IncomingMessageService.new(inbox: channel.inbox, params: params).perform
     end
@@ -19,6 +20,14 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
 
   private
 
+  def find_channel(params)
+    return find_channel_from_whatsapp_business_payload(params) if params[:object] == 'whatsapp_business_account'
+
+    return unless params[:phone_number]
+
+    Channel::Whatsapp.find_by(phone_number: params[:phone_number])
+  end
+
   def channel_is_inactive?(channel)
     return true if channel.blank?
     return true if channel.reauthorization_required?
@@ -27,24 +36,12 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
     false
   end
 
-  def find_channel_by_url_param(params)
-    return unless params[:phone_number]
-
-    Channel::Whatsapp.find_by(phone_number: params[:phone_number])
-  end
-
   def find_channel_from_whatsapp_business_payload(params)
     # for the case where facebook cloud api support multiple numbers for a single app
     # https://github.com/chatwoot/chatwoot/issues/4712#issuecomment-1173838350
     # we will give priority to the phone_number in the payload
-    return get_channel_from_wb_payload(params) if params[:object] == 'whatsapp_business_account'
-
-    find_channel_by_url_param(params)
-  end
-
-  def get_channel_from_wb_payload(wb_params)
-    phone_number = "+#{wb_params[:entry].first[:changes].first.dig(:value, :metadata, :display_phone_number)}"
-    phone_number_id = wb_params[:entry].first[:changes].first.dig(:value, :metadata, :phone_number_id)
+    phone_number = "+#{params[:entry].first[:changes].first.dig(:value, :metadata, :display_phone_number)}"
+    phone_number_id = params[:entry].first[:changes].first.dig(:value, :metadata, :phone_number_id)
     channel = Channel::Whatsapp.find_by(phone_number: phone_number)
     # validate to ensure the phone number id matches the whatsapp channel
     channel if channel && channel.provider_config['phone_number_id'] == phone_number_id
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index f95c2c30a..b8191e17c 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -8,6 +8,7 @@
 #  phone_number                   :string           not null
 #  provider                       :string           default("default")
 #  provider_config                :jsonb
+#  provider_connection            :jsonb
 #  created_at                     :datetime         not null
 #  updated_at                     :datetime         not null
 #  account_id                     :integer          not null
@@ -25,13 +26,15 @@ class Channel::Whatsapp < ApplicationRecord
   EDITABLE_ATTRS = [:phone_number, :provider, { provider_config: {} }].freeze
 
   # default at the moment is 360dialog lets change later.
-  PROVIDERS = %w[default whatsapp_cloud].freeze
+  PROVIDERS = %w[default whatsapp_cloud baileys].freeze
   before_validation :ensure_webhook_verify_token
 
   validates :provider, inclusion: { in: PROVIDERS }
   validates :phone_number, presence: true, uniqueness: true
   validate :validate_provider_config
 
+  has_one :inbox, as: :channel, dependent: :destroy
+
   after_create :sync_templates
 
   def name
@@ -39,15 +42,18 @@ class Channel::Whatsapp < ApplicationRecord
   end
 
   def provider_service
-    if provider == 'whatsapp_cloud'
+    case provider
+    when 'whatsapp_cloud'
       Whatsapp::Providers::WhatsappCloudService.new(whatsapp_channel: self)
+    when 'baileys'
+      Whatsapp::Providers::WhatsappBaileysService.new(whatsapp_channel: self)
     else
       Whatsapp::Providers::Whatsapp360DialogService.new(whatsapp_channel: self)
     end
   end
 
   def messaging_window_enabled?
-    true
+    provider != 'baileys'
   end
 
   def mark_message_templates_updated
@@ -56,6 +62,23 @@ class Channel::Whatsapp < ApplicationRecord
     # rubocop:enable Rails/SkipsModelValidations
   end
 
+  def update_provider_connection!(provider_connection)
+    assign_attributes(provider_connection: provider_connection)
+    # NOTE: Skip `validate_provider_config?` check
+    save!(validate: false)
+  end
+
+  def provider_connection_data
+    data = { connection: provider_connection['connection'] }
+    if Current.account_user&.administrator?
+      data[:qr_data_url] = provider_connection['qr_data_url']
+      data[:error] = provider_connection['error']
+    end
+    data
+  end
+
+  delegate :setup_channel_provider, to: :provider_service
+  delegate :disconnect_channel_provider, to: :provider_service
   delegate :send_message, to: :provider_service
   delegate :send_template, to: :provider_service
   delegate :sync_templates, to: :provider_service
@@ -65,7 +88,7 @@ class Channel::Whatsapp < ApplicationRecord
   private
 
   def ensure_webhook_verify_token
-    provider_config['webhook_verify_token'] ||= SecureRandom.hex(16) if provider == 'whatsapp_cloud'
+    provider_config['webhook_verify_token'] ||= SecureRandom.hex(16) if provider.in?(%w[whatsapp_cloud baileys])
   end
 
   def validate_provider_config
diff --git a/app/models/concerns/cache_keys.rb b/app/models/concerns/cache_keys.rb
index 3ad9bbadc..a798c9f7a 100644
--- a/app/models/concerns/cache_keys.rb
+++ b/app/models/concerns/cache_keys.rb
@@ -37,7 +37,8 @@ module CacheKeys
 
   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)
+    timestamp = (Time.now.utc.to_f * 1000).to_i
+    Redis::Alfred.setex(prefixed_cache_key, timestamp, CACHE_KEYS_EXPIRY)
   end
 
   def dispatch_cache_update_event
diff --git a/app/policies/inbox_policy.rb b/app/policies/inbox_policy.rb
index 9c2d3c094..d9f4f1066 100644
--- a/app/policies/inbox_policy.rb
+++ b/app/policies/inbox_policy.rb
@@ -57,4 +57,12 @@ class InboxPolicy < ApplicationPolicy
   def avatar?
     @account_user.administrator?
   end
+
+  def setup_channel_provider?
+    @account_user.administrator?
+  end
+
+  def disconnect_channel_provider?
+    @account_user.administrator?
+  end
 end
diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
new file mode 100644
index 000000000..93371a6c8
--- /dev/null
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -0,0 +1,140 @@
+class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseService
+  class InvalidWebhookVerifyToken < StandardError; end
+
+  def perform
+    raise InvalidWebhookVerifyToken if processed_params[:webhookVerifyToken] != inbox.channel.provider_config['webhook_verify_token']
+    return if processed_params[:event].blank? || processed_params[:data].blank?
+
+    event_prefix = processed_params[:event].gsub(/[\.-]/, '_')
+    method_name = "process_#{event_prefix}"
+    if respond_to?(method_name, true)
+      # TODO: Implement the methods for all expected events
+      send(method_name)
+    else
+      Rails.logger.warn "Baileys unsupported event: #{processed_params[:event]}"
+    end
+  end
+
+  private
+
+  def process_connection_update
+    data = processed_params[:data]
+
+    # NOTE: `connection` values
+    #   - `close`: Never opened, or closed and no longer able to send/receive messages
+    #   - `connecting`: In the process of connecting, expecting QR code to be read
+    #   - `reconnecting`: Connection has been established, but not open (i.e. device is being linked for the first time, or Baileys server restart)
+    #   - `open`: Open and ready to send/receive messages
+    inbox.channel.update_provider_connection!({
+      connection: data[:connection] || inbox.channel.provider_connection['connection'],
+      qr_data_url: data[:qrDataUrl] || nil,
+      error: data[:error] ? I18n.t("errors.inboxes.channel.provider_connection.#{data[:error]}") : nil
+    }.compact)
+
+    Rails.logger.error "Baileys connection error: #{data[:error]}" if data[:error].present?
+  end
+
+  def process_messages_upsert
+    messages = processed_params[:data][:messages]
+    messages.each do |message|
+      @message = nil
+      @contact_inbox = nil
+      @contact = nil
+      @raw_message = message
+      handle_message
+    end
+  end
+
+  def handle_message
+    return if find_message_by_source_id(message_id) || message_under_process?
+
+    cache_message_source_id_in_redis
+    set_contact
+
+    unless @contact
+      Rails.logger.warn "Contact not found for message: #{message_id}"
+      return
+    end
+
+    set_conversation
+    handle_create_message
+    clear_message_source_id_from_redis
+  end
+
+  def set_contact
+    phone_number_from_jid = @raw_message[:key][:remoteJid].split('@').first.split(':').first
+
+    contact_inbox = ::ContactInboxWithContactBuilder.new(
+      source_id: phone_number_from_jid,
+      inbox: inbox,
+      contact_attributes: { name: @raw_message[:pushName], phone_number: "+#{phone_number_from_jid}" }
+    ).perform
+
+    @contact_inbox = contact_inbox
+    @contact = contact_inbox.contact
+  end
+
+  def handle_create_message
+    case message_type
+    when 'text'
+      create_text_message
+    else
+      Rails.logger.warn "Baileys unsupported message type: #{message_type}"
+    end
+  end
+
+  def message_type # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    msg = @raw_message[:message]
+    return 'text' if msg.key?(:conversation)
+    return 'contacts' if msg.key?(:contactMessage)
+    return 'image' if msg.key?(:imageMessage)
+    return 'audio' if msg.key?(:audioMessage)
+    return 'video' if msg.key?(:videoMessage)
+    return 'video_note' if msg.key?(:ptvMessage)
+    return 'location' if msg.key?(:locationMessage)
+    return 'live_location' if msg.key?(:liveLocationMessage)
+    return 'document' if msg.key?(:documentMessage)
+    return 'poll' if msg.key?(:pollCreationMessageV3)
+    return 'event' if msg.key?(:eventMessage)
+    return 'sticker' if msg.key?(:stickerMessage)
+
+    'unsupported'
+  end
+
+  def create_text_message
+    is_outgoing = @raw_message[:key][:fromMe]
+    sender = is_outgoing ? @inbox.account.account_users.first.user : @contact
+    sender_type = is_outgoing ? 'User' : 'Contact'
+    message_type = is_outgoing ? :outgoing : :incoming
+
+    @message = @conversation.messages.create!(
+      content: @raw_message[:message][:conversation],
+      account_id: @inbox.account_id,
+      inbox_id: @inbox.id,
+      source_id: message_id,
+      sender: sender,
+      sender_type: sender_type,
+      message_type: message_type,
+      in_reply_to_external_id: nil
+    )
+  end
+
+  def message_id
+    @raw_message[:key][:id]
+  end
+
+  def message_under_process?
+    key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: message_id)
+    Redis::Alfred.get(key)
+  end
+
+  def cache_message_source_id_in_redis
+    key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: message_id)
+    ::Redis::Alfred.setex(key, true)
+  end
+
+  def clear_message_source_id_from_redis
+    key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: message_id)
+    ::Redis::Alfred.delete(key)
+  end
+end
diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
new file mode 100644
index 000000000..28ca975d0
--- /dev/null
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -0,0 +1,101 @@
+class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseService
+  class MessageContentTypeNotSupported < StandardError; end
+
+  DEFAULT_CLIENT_NAME = ENV.fetch('BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME', nil)
+  DEFAULT_URL = ENV.fetch('BAILEYS_PROVIDER_DEFAULT_URL', nil)
+  DEFAULT_API_KEY = ENV.fetch('BAILEYS_PROVIDER_DEFAULT_API_KEY', nil)
+
+  def setup_channel_provider
+    response = HTTParty.post(
+      "#{provider_url}/connections/#{whatsapp_channel.phone_number}",
+      headers: api_headers,
+      body: {
+        clientName: DEFAULT_CLIENT_NAME,
+        webhookUrl: whatsapp_channel.inbox.callback_webhook_url,
+        webhookVerifyToken: whatsapp_channel.provider_config['webhook_verify_token']
+      }.to_json
+    )
+
+    process_response(response)
+  end
+
+  def disconnect_channel_provider
+    response = HTTParty.delete(
+      "#{provider_url}/connections/#{whatsapp_channel.phone_number}",
+      headers: api_headers
+    )
+
+    process_response(response)
+  end
+
+  def send_message(phone_number, message)
+    raise MessageContentTypeNotSupported unless message.content_type == 'text'
+
+    response = HTTParty.post(
+      "#{provider_url}/connections/#{whatsapp_channel.phone_number}/send-message",
+      headers: api_headers,
+      body: {
+        type: 'text',
+        recipient: phone_number,
+        message: message.content
+      }.to_json
+    )
+
+    return unless process_response(response)
+
+    response.parsed_response.dig('data', 'key', 'id')
+  end
+
+  def send_template(phone_number, template_info); end
+
+  def sync_templates; end
+
+  def media_url(media_id); end
+
+  def api_headers
+    { 'x-api-key' => api_key, 'Content-Type' => 'application/json' }
+  end
+
+  def validate_provider_config?
+    response = HTTParty.get(
+      "#{provider_url}/status",
+      headers: api_headers
+    )
+
+    process_response(response)
+  end
+
+  private
+
+  def provider_url
+    whatsapp_channel.provider_config['provider_url'].presence || DEFAULT_URL
+  end
+
+  def api_key
+    whatsapp_channel.provider_config['api_key'].presence || DEFAULT_API_KEY
+  end
+
+  def process_response(response)
+    Rails.logger.error response.body unless response.success?
+    response.success?
+  end
+
+  private_class_method def self.with_error_handling(*method_names)
+    method_names.each do |method_name|
+      original_method = instance_method(method_name)
+
+      define_method(method_name) do |*args, &block|
+        original_method.bind_call(self, *args, &block)
+      rescue StandardError => e
+        handle_channel_error
+        raise e
+      end
+    end
+  end
+
+  def handle_channel_error
+    whatsapp_channel.update_provider_connection!(connection: 'close')
+  end
+
+  with_error_handling :setup_channel_provider, :disconnect_channel_provider, :send_message
+end
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 9527b0787..8bae33f93 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -110,4 +110,5 @@ json.provider resource.channel.try(:provider)
 if resource.whatsapp?
   json.message_templates resource.channel.try(:message_templates)
   json.provider_config resource.channel.try(:provider_config) if Current.account_user&.administrator?
+  json.provider_connection resource.channel.try(:provider_connection_data)
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a4341927e..752c43fca 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -76,6 +76,9 @@ en:
         connection_closed_error: Connection closed.
       validations:
         name: should not start or end with symbols, and it should not have < > / \ @ characters.
+      channel:
+        provider_connection:
+          wrong_phone_number: The phone number you are trying to link is not the same as the one you have configured. Please make sure the phone number is correct before scanning the QR code.
     custom_filters:
       number_of_records: Limit reached. The maximum number of allowed custom filters for a user per account is 50.
       invalid_attribute: Invalid attribute key - [%{key}]. The key should be one of [%{allowed_keys}] or a custom attribute defined in the account.
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index dab14bb08..030d14204 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -64,6 +64,9 @@ pt_BR:
         connection_closed_error: Conexão fechada.
       validations:
         name: 'não deve iniciar ou terminar com símbolos e não deve ter os caracteres: < > / \ @.'
+      channel:
+        provider_connection:
+          wrong_phone_number: O número de telefone que você está tentando conectar não é o mesmo que o configurado. Certifique-se de que o número está correto antes de escanear o QR code.
     custom_filters:
       number_of_records: Limite atingido. O número máximo de filtros personalizados permitidos para um usuário por conta é de 50.
       invalid_attribute: Chave de atributo inválido - [%{key}]. A chave deve ser uma das [%{allowed_keys}] ou um atributo personalizado definido na conta.
diff --git a/config/routes.rb b/config/routes.rb
index 46199db12..f630dc885 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -173,6 +173,8 @@ Rails.application.routes.draw do
             get :campaigns, on: :member
             get :agent_bot, on: :member
             post :set_agent_bot, on: :member
+            post :setup_channel_provider, on: :member
+            post :disconnect_channel_provider, on: :member
             delete :avatar, on: :member
           end
           resources :inbox_members, only: [:create, :show], param: :inbox_id do
diff --git a/db/migrate/20250314185939_add_provider_connection_to_whatsapp.rb b/db/migrate/20250314185939_add_provider_connection_to_whatsapp.rb
new file mode 100644
index 000000000..95f32b41d
--- /dev/null
+++ b/db/migrate/20250314185939_add_provider_connection_to_whatsapp.rb
@@ -0,0 +1,5 @@
+class AddProviderConnectionToWhatsapp < ActiveRecord::Migration[7.0]
+  def change
+    add_column :channel_whatsapp, :provider_connection, :jsonb, default: {}
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 84962a097..3f982d11e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -471,6 +471,7 @@ ActiveRecord::Schema[7.0].define(version: 2025_04_02_233933) do
     t.datetime "updated_at", null: false
     t.jsonb "message_templates", default: {}
     t.datetime "message_templates_last_updated", precision: nil
+    t.jsonb "provider_connection", default: {}
     t.index ["phone_number"], name: "index_channel_whatsapp_on_phone_number", unique: true
   end
 
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 7b3dafccb..374e10125 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -774,4 +774,82 @@ RSpec.describe 'Inboxes API', type: :request do
       end
     end
   end
+
+  describe 'POST /api/v1/accounts/:account_id/inboxes/:id/setup_channel_provider' do
+    let(:channel) { create(:channel_whatsapp, account: account, provider: 'baileys', validate_provider_config: false) }
+    let(:inbox) { channel.inbox }
+
+    context 'when unauthenticated' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/setup_channel_provider"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated' do
+      it 'returns unprocessable entity when channel does not support setup' do
+        inbox = create(:inbox, account: account)
+
+        post "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/setup_channel_provider",
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.parsed_body['error']).to eq('Channel does not support setup')
+      end
+
+      it 'calls setup_channel_provider when supported and returns ok' do
+        service_double = instance_double(Whatsapp::Providers::WhatsappBaileysService, setup_channel_provider: true)
+        allow(Whatsapp::Providers::WhatsappBaileysService).to receive(:new)
+          .with(whatsapp_channel: channel)
+          .and_return(service_double)
+
+        post "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/setup_channel_provider",
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:ok)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/:account_id/inboxes/:id/disconnect_channel_provider' do
+    let(:channel) { create(:channel_whatsapp, account: account, provider: 'baileys', validate_provider_config: false) }
+    let(:inbox) { channel.inbox }
+
+    context 'when unauthenticated' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/disconnect_channel_provider"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated' do
+      it 'returns unprocessable entity when channel does not support disconnect' do
+        inbox = create(:inbox, account: account)
+
+        post "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/disconnect_channel_provider",
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.parsed_body['error']).to eq('Channel does not support disconnect')
+      end
+
+      it 'calls disconnect_channel_provider when supported and returns ok' do
+        service_double = instance_double(Whatsapp::Providers::WhatsappBaileysService, disconnect_channel_provider: true)
+        allow(Whatsapp::Providers::WhatsappBaileysService).to receive(:new)
+          .with(whatsapp_channel: channel)
+          .and_return(service_double)
+
+        post "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/disconnect_channel_provider",
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:ok)
+      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 6b7e6eeed..82df4b291 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -44,12 +44,12 @@ RSpec.describe 'Super Admin accounts API', type: :request 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
+        now_timestamp = (Time.now.utc.to_f * 1000).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')
 
-        range = now_timestamp..(now_timestamp + 10)
+        range = now_timestamp..(now_timestamp + 10_000)
         expect(account.reload.cache_keys.values.all? { |v| range.cover?(v.to_i) }).to be(true)
       end
     end
diff --git a/spec/factories/channel/channel_whatsapp.rb b/spec/factories/channel/channel_whatsapp.rb
index d437ed346..36e696e81 100644
--- a/spec/factories/channel/channel_whatsapp.rb
+++ b/spec/factories/channel/channel_whatsapp.rb
@@ -75,7 +75,10 @@ FactoryBot.define do
       # since factory already has the required message templates, we just need to bypass it getting updated
       channel_whatsapp.define_singleton_method(:sync_templates) { nil } unless options.sync_templates
       channel_whatsapp.define_singleton_method(:validate_provider_config) { nil } unless options.validate_provider_config
-      if channel_whatsapp.provider == 'whatsapp_cloud'
+      if channel_whatsapp.provider == 'baileys'
+        channel_whatsapp.provider_config = channel_whatsapp.provider_config.merge({ 'api_key' => 'test_key', 'provider_url' => 'https://baileys.api',
+                                                                                    'phone_number_id' => '123456789' })
+      elsif channel_whatsapp.provider == 'whatsapp_cloud'
         channel_whatsapp.provider_config = channel_whatsapp.provider_config.merge({ 'api_key' => 'test_key', 'phone_number_id' => '123456789',
                                                                                     'business_account_id' => '123456789' })
       end
diff --git a/spec/helpers/cache_keys_helper_spec.rb b/spec/helpers/cache_keys_helper_spec.rb
index de4b71755..542889618 100644
--- a/spec/helpers/cache_keys_helper_spec.rb
+++ b/spec/helpers/cache_keys_helper_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe CacheKeysHelper do
     it 'returns the zero epoch time if no value is cached' do
       result = helper.fetch_value_for_key(account_id, 'another-key')
 
-      expect(result).to eq('0000000000')
+      expect(result).to eq('0000000000000')
     end
 
     it 'returns a cached value if it exists' do
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
new file mode 100644
index 000000000..1d08f2ef8
--- /dev/null
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -0,0 +1,268 @@
+require 'rails_helper'
+
+describe Whatsapp::IncomingMessageBaileysService do
+  describe '#perform' do
+    let(:webhook_verify_token) { 'valid_token' }
+    let!(:whatsapp_channel) do
+      create(:channel_whatsapp,
+             provider: 'baileys',
+             provider_config: { webhook_verify_token: webhook_verify_token },
+             validate_provider_config: false)
+    end
+    let(:inbox) { whatsapp_channel.inbox }
+
+    context 'when webhook verify token is invalid' do
+      it 'raises an InvalidWebhookVerifyToken error' do
+        params = { webhookVerifyToken: 'invalid_token' }
+
+        expect do
+          described_class.new(inbox: inbox, params: params).perform
+        end.to raise_error(Whatsapp::IncomingMessageBaileysService::InvalidWebhookVerifyToken)
+      end
+    end
+
+    context 'when event is blank' do
+      it 'returns early and does nothing' do
+        params = {
+          webhookVerifyToken: webhook_verify_token,
+          event: '',
+          data: { connection: 'open' }
+        }
+        service = described_class.new(inbox: inbox, params: params)
+        allow(service).to receive(:respond_to?)
+
+        service.perform
+
+        expect(service).not_to have_received(:respond_to?)
+      end
+    end
+
+    context 'when data is blank' do
+      it 'returns early and does nothing' do
+        params = {
+          webhookVerifyToken: webhook_verify_token,
+          event: 'connection.update',
+          data: {}
+        }
+        service = described_class.new(inbox: inbox, params: params)
+        allow(service).to receive(:respond_to?)
+
+        service.perform
+
+        expect(service).not_to have_received(:respond_to?)
+      end
+    end
+
+    context 'when event is unsupported' do
+      it 'logs a warning message' do
+        params = {
+          webhookVerifyToken: webhook_verify_token,
+          event: 'unsupported.event',
+          data: 'some-data'
+        }
+        allow(Rails.logger).to receive(:warn).with('Baileys unsupported event: unsupported.event')
+
+        described_class.new(inbox: inbox, params: params).perform
+
+        expect(Rails.logger).to have_received(:warn)
+      end
+    end
+
+    context 'when processing connection.update event' do
+      let(:base_params) { { webhookVerifyToken: webhook_verify_token, event: 'connection.update' } }
+
+      it 'updates the channel provider_connection' do
+        params = base_params.merge(
+          {
+            data: {
+              connection: 'open',
+              qrDataUrl: 'data:image/jpeg;base64,',
+              error: 'wrong_phone_number'
+            }
+          }
+        )
+
+        described_class.new(inbox: inbox, params: params).perform
+
+        expect(inbox.channel.provider_connection).to include(
+          'connection' => 'open',
+          'qr_data_url' => 'data:image/jpeg;base64,',
+          'error' => I18n.t('errors.inboxes.channel.provider_connection.wrong_phone_number')
+        )
+      end
+
+      it "logs an error message if there's an error" do
+        params = base_params.merge(
+          {
+            data: { error: 'wrong_phone_number' }
+          }
+        )
+        allow(Rails.logger).to receive(:error).with('Baileys connection error: wrong_phone_number')
+
+        described_class.new(inbox: inbox, params: params).perform
+
+        expect(Rails.logger).to have_received(:error)
+      end
+
+      it "keeps connection value if it's not present in the data" do
+        inbox.channel.update_provider_connection!(connection: 'connecting')
+        params = base_params.merge(
+          {
+            data: { qrDataUrl: 'data:image/jpeg;base64,' }
+          }
+        )
+
+        described_class.new(inbox: inbox, params: params).perform
+
+        expect(inbox.channel.provider_connection['connection']).to eq('connecting')
+      end
+
+      it "removes qr_data_url value if it's not present in the data" do
+        inbox.channel.update_provider_connection!(qr_data_url: 'data:image/jpeg;base64,')
+        params = base_params.merge(
+          {
+            data: { connection: 'open' }
+          }
+        )
+
+        described_class.new(inbox: inbox, params: params).perform
+
+        expect(inbox.channel.provider_connection['qr_data_url']).to be_nil
+      end
+
+      it "removes error value if it's not present in the data" do
+        inbox.channel.update_provider_connection!(error: 'wrong_phone_number')
+        params = base_params.merge(
+          {
+            data: { connection: 'open' }
+          }
+        )
+
+        described_class.new(inbox: inbox, params: params).perform
+
+        expect(inbox.channel.provider_connection['error']).to be_nil
+      end
+    end
+
+    context 'when processing messages.upsert event' do
+      context 'when message type is unsupported' do
+        let(:raw_message) do
+          {
+            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { unsupported: 'message' },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            }
+          }
+        end
+
+        it 'logs a warning message' do
+          allow(Rails.logger).to receive(:warn).with('Baileys unsupported message type: unsupported')
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(Rails.logger).to have_received(:warn)
+        end
+      end
+
+      context 'when message type is text' do
+        let(:raw_message) do
+          {
+            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { conversation: 'Hello from Baileys' },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            }
+          }
+        end
+
+        it 'creates an incoming message' do
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+          expect(message).to be_present
+          expect(message.content).to eq('Hello from Baileys')
+          expect(message.message_type).to eq('incoming')
+          expect(message.sender).to be_present
+          expect(message.sender.name).to eq('John Doe')
+        end
+
+        it 'creates an outgoing message' do
+          raw_message_outgoing = raw_message.merge(
+            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: true }
+          )
+          params_outgoing = params.merge(data: { type: 'notify', messages: [raw_message_outgoing] })
+          create(:account_user, account: inbox.account)
+
+          described_class.new(inbox: inbox, params: params_outgoing).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+          expect(message).to be_present
+          expect(message.content).to eq('Hello from Baileys')
+          expect(message.message_type).to eq('outgoing')
+        end
+
+        it 'creates a message on an existing conversation' do
+          contact = create(:contact, account: inbox.account, name: 'John Doe')
+          contact_inbox = create(:contact_inbox, inbox: inbox, contact: contact, source_id: '5511912345678')
+          existing_conversation = create(:conversation, inbox: inbox, contact_inbox: contact_inbox)
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          message = existing_conversation.messages.last
+          expect(message.sender).to eq(contact)
+        end
+
+        it 'does not create a message if it already exists' do
+          message = create(:message, inbox: inbox, source_id: 'msg_123')
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          messages = conversation.messages
+          expect(messages).to eq([message])
+        end
+
+        it 'does not create a message if it is already being processed' do
+          allow(Redis::Alfred).to receive(:get).with(format_message_source_key('msg_123')).and_return(true)
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(inbox.conversations).to be_empty
+        end
+
+        it 'caches the message source id in Redis and clears it' do
+          allow(Redis::Alfred).to receive(:setex).with(format_message_source_key('msg_123'), true)
+          allow(Redis::Alfred).to receive(:delete).with(format_message_source_key('msg_123'))
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(Redis::Alfred).to have_received(:setex)
+          expect(Redis::Alfred).to have_received(:delete)
+        end
+      end
+    end
+  end
+
+  def format_message_source_key(message_id)
+    format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: message_id)
+  end
+end
diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
new file mode 100644
index 000000000..7d86f1aee
--- /dev/null
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -0,0 +1,232 @@
+require 'rails_helper'
+
+describe Whatsapp::Providers::WhatsappBaileysService do
+  subject(:service) { described_class.new(whatsapp_channel: whatsapp_channel) }
+
+  let(:whatsapp_channel) { create(:channel_whatsapp, provider: 'baileys', validate_provider_config: false) }
+  let(:message) { create(:message) }
+
+  let(:test_send_phone_number) { '+5511987654321' }
+
+  before do
+    stub_const('Whatsapp::Providers::WhatsappBaileysService::DEFAULT_CLIENT_NAME', 'chatwoot-test')
+  end
+
+  describe '#setup_channel_provider' do
+    context 'when response is successful' do
+      it 'calls the connection endpoint' do
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}")
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              clientName: 'chatwoot-test',
+              webhookUrl: whatsapp_channel.inbox.callback_webhook_url,
+              webhookVerifyToken: whatsapp_channel.provider_config['webhook_verify_token']
+            }.to_json
+          )
+          .to_return(status: 200)
+
+        response = service.setup_channel_provider
+
+        expect(response).to be true
+      end
+    end
+
+    context 'when response is unsuccessful' do
+      it 'logs the error and returns false' do
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}")
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              clientName: 'chatwoot-test',
+              webhookUrl: whatsapp_channel.inbox.callback_webhook_url,
+              webhookVerifyToken: whatsapp_channel.provider_config['webhook_verify_token']
+            }.to_json
+          )
+          .to_return(
+            status: 400,
+            body: 'error message',
+            headers: {}
+          )
+        allow(Rails.logger).to receive(:error).with('error message')
+
+        response = service.setup_channel_provider
+
+        expect(response).to be(false)
+        expect(Rails.logger).to have_received(:error)
+      end
+    end
+  end
+
+  describe '#disconnect_channel_provider' do
+    context 'when response is successful' do
+      it 'disconnects the whatsapp connection' do
+        stub_request(:delete, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}")
+          .with(headers: stub_headers(whatsapp_channel))
+          .to_return(status: 200)
+
+        response = service.disconnect_channel_provider
+
+        expect(response).to be true
+      end
+    end
+
+    context 'when response is unsuccessful' do
+      it 'logs the error and returns false' do
+        stub_request(:delete, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}")
+          .with(headers: stub_headers(whatsapp_channel))
+          .to_return(
+            status: 400,
+            body: 'error message',
+            headers: {}
+          )
+        allow(Rails.logger).to receive(:error).with('error message')
+
+        response = service.disconnect_channel_provider
+
+        expect(response).to be(false)
+        expect(Rails.logger).to have_received(:error)
+      end
+    end
+  end
+
+  describe '#send_message' do
+    context 'when response is successful' do
+      it 'returns true' do
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              type: 'text',
+              recipient: test_send_phone_number,
+              message: message.content
+            }.to_json
+          )
+          .to_return(
+            status: 200,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => message.id } } }.to_json
+          )
+
+        result = service.send_message(test_send_phone_number, message)
+
+        expect(result).to be message.id
+      end
+    end
+
+    context 'when response is unsuccessful' do
+      it 'logs the error and returns false' do
+        with_modified_env BAILEYS_PROVIDER_DEFAULT_URL: 'http://test.com' do
+          stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+            .with(
+              headers: stub_headers(whatsapp_channel),
+              body: {
+                type: 'text',
+                recipient: test_send_phone_number,
+                message: message.content
+              }.to_json
+            )
+            .to_return(
+              status: 400,
+              body: 'error message',
+              headers: {}
+            )
+          allow(Rails.logger).to receive(:error).with('error message')
+
+          result = service.send_message(test_send_phone_number, message)
+
+          expect(result).to be_nil
+          expect(Rails.logger).to have_received(:error)
+        end
+      end
+    end
+
+    context 'when message content type is not supported' do
+      it 'raises an error' do
+        message.update!(content_type: 'sticker')
+
+        expect do
+          service.send_message(test_send_phone_number, message)
+        end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageContentTypeNotSupported)
+      end
+    end
+  end
+
+  describe '#api_headers' do
+    context 'when called' do
+      it 'returns the headers' do
+        expect(service.api_headers).to eq('x-api-key' => 'test_key', 'Content-Type' => 'application/json')
+      end
+    end
+  end
+
+  describe '#validate_provider_config?' do
+    context 'when response is successful' do
+      it 'returns true' do
+        stub_request(:get, "#{whatsapp_channel.provider_config['provider_url']}/status")
+          .with(headers: { 'Content-Type' => 'application/json', 'x-api-key' => whatsapp_channel.provider_config['api_key'] })
+          .to_return(status: 200, body: '', headers: {})
+
+        expect(service.validate_provider_config?).to be true
+      end
+    end
+
+    context 'when response is unsuccessful' do
+      it 'logs the error and returns false' do
+        stub_request(:get, "#{whatsapp_channel.provider_config['provider_url']}/status")
+          .with(headers: { 'Content-Type' => 'application/json', 'x-api-key' => whatsapp_channel.provider_config['api_key'] })
+          .to_return(status: 400, body: 'error message', headers: {})
+        allow(Rails.logger).to receive(:error).with('error message')
+
+        expect(service.validate_provider_config?).to be false
+        expect(Rails.logger).to have_received(:error)
+      end
+    end
+  end
+
+  context 'when provider responds with 5XX' do
+    it 'updated provider connection to close' do
+      whatsapp_channel.update!(provider_connection: { 'connection' => 'open' })
+      allow(HTTParty).to receive(:post).with(
+        "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message",
+        headers: stub_headers(whatsapp_channel),
+        body: {
+          type: 'text',
+          recipient: test_send_phone_number,
+          message: message.content
+        }.to_json
+      ).and_raise(HTTParty::ResponseError.new(OpenStruct.new(status_code: 500)))
+
+      expect do
+        service.send_message(test_send_phone_number, message)
+      end.to raise_error(HTTParty::ResponseError)
+
+      expect(whatsapp_channel.provider_connection['connection']).to eq('close')
+    end
+  end
+
+  context 'when environment variable BAILEYS_PROVIDER_DEFAULT_URL is set' do
+    it 'uses the base url from the environment variable' do
+      stub_const('Whatsapp::Providers::WhatsappBaileysService::DEFAULT_URL', 'http://test.com')
+      whatsapp_channel.update!(provider_config: {})
+
+      expect(service.send(:provider_url)).to eq('http://test.com')
+    end
+  end
+
+  context 'when environment variable BAILEYS_PROVIDER_DEFAULT_API_KEY is set' do
+    it 'uses the API key from the environment variable' do
+      stub_const('Whatsapp::Providers::WhatsappBaileysService::DEFAULT_API_KEY', 'key')
+      whatsapp_channel.update!(provider_config: {})
+
+      expect(service.send(:api_key)).to eq('key')
+    end
+  end
+
+  def stub_headers(channel)
+    {
+      'Content-Type' => 'application/json',
+      'x-api-key' => channel.provider_config['api_key']
+    }
+  end
+end

From 51c47cd3b55cec91d32fe49331f7a9dbe8003f24 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 28 Mar 2025 10:11:48 -0300
Subject: [PATCH 10/46] chore: fix cursor pointer on router-link sidebar menu

---
 .../components-next/dropdown-menu/base/DropdownItem.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownItem.vue b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownItem.vue
index 9db3a09d4..fb4dc416c 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownItem.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownItem.vue
@@ -44,7 +44,7 @@ const triggerClick = () => {
     <component
       :is="componentIs"
       v-bind="$attrs"
-      class="flex text-left rtl:text-right items-center p-2 reset-base text-sm text-n-slate-12 w-full border-0"
+      class="flex text-left rtl:text-right items-center p-2 reset-base text-sm text-n-slate-12 w-full border-0 cursor-pointer"
       :class="{
         'hover:bg-n-alpha-2 rounded-lg w-full gap-3': !$slots.default,
       }"

From dd8ba3585656d7971284435fdd82df01dca28bb9 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 28 Mar 2025 10:13:44 -0300
Subject: [PATCH 11/46] chore: change enter to default send

---
 app/javascript/dashboard/composables/useUISettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/composables/useUISettings.js b/app/javascript/dashboard/composables/useUISettings.js
index f67f58ebc..1c18d6cdc 100644
--- a/app/javascript/dashboard/composables/useUISettings.js
+++ b/app/javascript/dashboard/composables/useUISettings.js
@@ -110,7 +110,7 @@ const isEditorHotKeyEnabled = (key, uiSettings) => {
     enter_to_send_enabled: enterToSendEnabled,
   } = uiSettings.value || {};
   if (!editorMessageKey) {
-    return key === (enterToSendEnabled ? 'enter' : 'cmd_enter');
+    return key === (enterToSendEnabled ? 'cmd_enter' : 'enter');
   }
   return editorMessageKey === key;
 };

From 975e56efc60fc2ed80aeaa305847fd0e9322056c Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Tue, 1 Apr 2025 10:21:26 -0300
Subject: [PATCH 12/46] ci: add baileys-api service to docker-compose
 configuration

---
 .github/workflows/publish_github_docker.yml | 136 ++++++++++++++++++
 docker-compose.coolify.yaml                 | 149 ++++++++++++++++++++
 2 files changed, 285 insertions(+)
 create mode 100644 .github/workflows/publish_github_docker.yml
 create mode 100644 docker-compose.coolify.yaml

diff --git a/.github/workflows/publish_github_docker.yml b/.github/workflows/publish_github_docker.yml
new file mode 100644
index 000000000..b971dfff1
--- /dev/null
+++ b/.github/workflows/publish_github_docker.yml
@@ -0,0 +1,136 @@
+name: Publish Chatwoot docker images to GitHub
+
+permissions:
+  contents: read
+  packages: write
+
+on:
+  push:
+    branches:
+      - fazer-ai/main
+  workflow_dispatch:
+
+env:
+  GITHUB_REPO: ghcr.io/${{ github.repository }}
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    env:
+      GIT_REF: ${{ github.head_ref || github.ref_name }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
+      - name: Strip enterprise code
+        run: |
+          rm -rf enterprise
+          rm -rf spec/enterprise
+
+      - name: Set Docker Tags
+        run: |
+          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
+          if [ "${{ github.ref_name }}" = "fazer-ai/main" ]; then
+            echo "GITHUB_TAG=${GITHUB_REPO}:latest" >> $GITHUB_ENV
+          else
+            echo "GITHUB_TAG=${GITHUB_REPO}:${SANITIZED_REF}" >> $GITHUB_ENV
+          fi
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push to GitHub Container Registry
+        id: build-ghcr
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/Dockerfile
+          platforms: ${{ matrix.platform }}
+          push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+          outputs: type=image,name=${{ env.GITHUB_TAG }},name-canonical=true,push=true
+
+      - name: Export digest
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build-ghcr.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        env:
+          GIT_REF: ${{ github.head_ref || github.ref_name }}
+        run: |
+          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
+          if [ "${{ github.ref_name }}" = "fazer-ai/main" ]; then
+            GITHUB_TAG="ghcr.io/${{ github.repository }}:latest"
+          else
+            GITHUB_TAG="ghcr.io/${{ github.repository }}:${SANITIZED_REF}"
+          fi
+
+          docker buildx imagetools create -t $GITHUB_TAG \
+            $(printf 'ghcr.io/${{ github.repository }}@sha256:%s ' *)
+
+      - name: Inspect image
+        env:
+          GIT_REF: ${{ github.head_ref || github.ref_name }}
+        run: |
+          SANITIZED_REF=$(echo "$GIT_REF" | sed 's/\//-/g')
+          if [ "${{ github.ref_name }}" = "fazer-ai/main" ]; then
+            GITHUB_TAG="ghcr.io/${{ github.repository }}:latest"
+          else
+            GITHUB_TAG="ghcr.io/${{ github.repository }}:${SANITIZED_REF}"
+          fi
+
+          docker buildx imagetools inspect $GITHUB_TAG
diff --git a/docker-compose.coolify.yaml b/docker-compose.coolify.yaml
new file mode 100644
index 000000000..d6024cde2
--- /dev/null
+++ b/docker-compose.coolify.yaml
@@ -0,0 +1,149 @@
+version: '3'
+
+services:
+  rails:
+    image: 'ghcr.io/fazer-ai/chatwoot:latest'
+    pull_policy: always
+    volumes:
+      - 'storage:/app/storage'
+    depends_on:
+      - postgres
+      - redis
+    environment:
+      - NODE_ENV=production
+      - RAILS_ENV=production
+      - INSTALLATION_ENV=docker
+      - FRONTEND_URL=http://rails:3000
+      - REDIS_URL=redis://redis:6379
+      - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/chatwoot_production
+      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
+      - REDIS_PASSWORD=${REDIS_PASSWORD}
+      - BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=${BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME}
+      - BAILEYS_PROVIDER_DEFAULT_URL=http://baileys-api:3025
+      - BAILEYS_PROVIDER_DEFAULT_API_KEY=${BAILEYS_PROVIDER_DEFAULT_API_KEY}
+    entrypoint: docker/entrypoints/rails.sh
+    command:
+      - bundle
+      - exec
+      - rails
+      - s
+      - '-p'
+      - '3000'
+      - '-b'
+      - 0.0.0.0
+    restart: always
+    post_start:
+      - command:
+          - bundle
+          - exec
+          - rails
+          - db:chatwoot_prepare
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'wget -qO- http://127.0.0.1:3000/'
+      interval: 60s
+      timeout: 20s
+      retries: 10
+
+  sidekiq:
+    image: 'ghcr.io/fazer-ai/chatwoot:latest'
+    pull_policy: always
+    volumes:
+      - 'storage:/app/storage'
+    depends_on:
+      - postgres
+      - redis
+    environment:
+      - NODE_ENV=production
+      - RAILS_ENV=production
+      - INSTALLATION_ENV=docker
+      - REDIS_URL=redis://redis:6379
+      - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/chatwoot_production
+      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
+      - REDIS_PASSWORD=${REDIS_PASSWORD}
+    command:
+      - bundle
+      - exec
+      - sidekiq
+      - '-C'
+      - config/sidekiq.yml
+    restart: always
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'ps aux | grep [s]idekiq'
+      interval: 20s
+      timeout: 20s
+      retries: 10
+
+  baileys-api:
+    image: 'ghcr.io/fazer-ai/baileys-api:latest'
+    pull_policy: always
+    volumes:
+      - 'storage:/app/storage'
+    depends_on:
+      - rails
+      - sidekiq
+      - redis
+    environment:
+      - NODE_ENV=production
+      - REDIS_URL=redis://redis:6379
+      - REDIS_PASSWORD=${REDIS_PASSWORD}
+      - LOG_LEVEL=${LOG_LEVEL:-debug}
+      - BAILEYS_LOG_LEVEL=${BAILEYS_LOG_LEVEL:-error}
+    command:
+      - bun
+      - start
+    restart: always
+    post_start:
+      - command:
+          - bun
+          - manage-api-keys
+          - create
+          - user 
+          - ${BAILEYS_PROVIDER_DEFAULT_API_KEY}
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - "wget --header='x-api-key: ${BAILEYS_PROVIDER_DEFAULT_API_KEY}' -qO- http://localhost:3025/status"
+      interval: 20s
+      timeout: 20s
+      retries: 10
+
+  postgres:
+    image: 'pgvector/pgvector:pg16'
+    restart: always
+    volumes:
+      - 'postgres:/var/lib/postgresql/data'
+    environment:
+      - POSTGRES_DB=chatwoot_production
+      - POSTGRES_USERNAME=postgres
+      - POSTGRES_PASSWORD=postgres
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'pg_isready -h localhost -p 5432 -U postgres'
+      interval: 20s
+      timeout: 20s
+      retries: 10
+
+  redis:
+    image: 'redis:alpine'
+    restart: always
+    command:
+      - sh
+      - '-c'
+      - 'redis-server --requirepass "$REDIS_PASSWORD"'
+    volumes:
+      - 'redis:/data'
+    environment:
+      - REDIS_PASSWORD=${REDIS_PASSWORD}
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'redis-cli -h localhost -p 6379 -a $REDIS_PASSWORD ping'
+      interval: 20s
+      timeout: 20s
+      retries: 10
+

From a9f0dc35f9b839177362a141e7707a25450eea38 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Tue, 1 Apr 2025 16:36:33 -0300
Subject: [PATCH 13/46] feat!: update validate_provider_config? endpoint

---
 .../whatsapp/providers/whatsapp_baileys_service.rb        | 2 +-
 .../whatsapp/providers/whatsapp_baileys_service_spec.rb   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index 28ca975d0..006474038 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -58,7 +58,7 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
 
   def validate_provider_config?
     response = HTTParty.get(
-      "#{provider_url}/status",
+      "#{provider_url}/status/auth",
       headers: api_headers
     )
 
diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index 7d86f1aee..859a065a8 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -163,8 +163,8 @@ describe Whatsapp::Providers::WhatsappBaileysService do
   describe '#validate_provider_config?' do
     context 'when response is successful' do
       it 'returns true' do
-        stub_request(:get, "#{whatsapp_channel.provider_config['provider_url']}/status")
-          .with(headers: { 'Content-Type' => 'application/json', 'x-api-key' => whatsapp_channel.provider_config['api_key'] })
+        stub_request(:get, "#{whatsapp_channel.provider_config['provider_url']}/status/auth")
+          .with(headers: stub_headers(whatsapp_channel))
           .to_return(status: 200, body: '', headers: {})
 
         expect(service.validate_provider_config?).to be true
@@ -173,8 +173,8 @@ describe Whatsapp::Providers::WhatsappBaileysService do
 
     context 'when response is unsuccessful' do
       it 'logs the error and returns false' do
-        stub_request(:get, "#{whatsapp_channel.provider_config['provider_url']}/status")
-          .with(headers: { 'Content-Type' => 'application/json', 'x-api-key' => whatsapp_channel.provider_config['api_key'] })
+        stub_request(:get, "#{whatsapp_channel.provider_config['provider_url']}/status/auth")
+          .with(headers: stub_headers(whatsapp_channel))
           .to_return(status: 400, body: 'error message', headers: {})
         allow(Rails.logger).to receive(:error).with('error message')
 

From 5b7fc9ae77f90b381a00be4f89a92753ba84d805 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Tue, 1 Apr 2025 23:29:18 -0300
Subject: [PATCH 14/46] feat: add Resend email delivery method and
 configuration (#11)

* feat: add Resend email delivery method and configuration

* chore: simplify ResendProvider initialization by removing settings parameter

* test: update ResendProvider initialization in tests by removing unnecessary settings parameter

* chore: improvements
---
 .env.example                                  |  2 +
 Gemfile                                       |  2 +
 Gemfile.lock                                  |  3 +
 .../reset_password_instructions.html.erb      |  2 +
 config/initializers/mailer.rb                 |  5 ++
 config/initializers/resend.rb                 |  3 +
 lib/mail/resend_provider.rb                   | 29 ++++++++++
 spec/lib/mail/resend_provider_spec.rb         | 57 +++++++++++++++++++
 8 files changed, 103 insertions(+)
 create mode 100644 config/initializers/resend.rb
 create mode 100644 lib/mail/resend_provider.rb
 create mode 100644 spec/lib/mail/resend_provider_spec.rb

diff --git a/.env.example b/.env.example
index a8fdab64a..cd20ca72a 100644
--- a/.env.example
+++ b/.env.example
@@ -262,3 +262,5 @@ AZURE_APP_SECRET=
 BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=Chatwoot
 BAILEYS_PROVIDER_DEFAULT_URL=http://localhost:3025
 BAILEYS_PROVIDER_DEFAULT_API_KEY=
+
+RESEND_API_KEY=
diff --git a/Gemfile b/Gemfile
index 92c2d8e72..769022c1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -178,6 +178,8 @@ gem 'ruby-openai'
 
 gem 'shopify_api'
 
+gem 'resend', '~> 0.19.0'
+
 ### Gems required only in specific deployment environments ###
 ##############################################################
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ebaa749dd..637f5f79d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -634,6 +634,8 @@ GEM
       uber (< 0.2.0)
     request_store (1.5.1)
       rack (>= 1.4)
+    resend (0.19.0)
+      httparty (>= 0.21.0)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
@@ -957,6 +959,7 @@ DEPENDENCIES
   rails (~> 7.0.8.4)
   redis
   redis-namespace
+  resend (~> 0.19.0)
   responders (>= 3.1.1)
   rest-client
   reverse_markdown
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
index 9405c99b1..61c48c68d 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -4,5 +4,7 @@
 
 <p><%= link_to 'Change my password', frontend_url('auth/password/edit', reset_password_token: @token) %></p>
 
+<p style="color: #999999; font-size: 12px;">Copy and paste the URL into your browser if the link above doesn't work: <%= frontend_url('auth/password/edit', reset_password_token: @token) %></p>
+
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>
diff --git a/config/initializers/mailer.rb b/config/initializers/mailer.rb
index a0e5d7b73..d1093a108 100644
--- a/config/initializers/mailer.rb
+++ b/config/initializers/mailer.rb
@@ -1,3 +1,5 @@
+require_relative '../../lib/mail/resend_provider'
+
 Rails.application.configure do
   #########################################
   # Configuration Related to Action Mailer
@@ -36,6 +38,9 @@ Rails.application.configure do
   # You can use letter opener for your local development by setting the environment variable
   config.action_mailer.delivery_method = :letter_opener if Rails.env.development? && ENV['LETTER_OPENER']
 
+  config.action_mailer.delivery_method = :resend if ENV['RESEND_API_KEY'].present?
+  ActionMailer::Base.add_delivery_method :resend, Mail::ResendProvider
+
   #########################################
   # Configuration Related to Action MailBox
   #########################################
diff --git a/config/initializers/resend.rb b/config/initializers/resend.rb
new file mode 100644
index 000000000..e28d7e527
--- /dev/null
+++ b/config/initializers/resend.rb
@@ -0,0 +1,3 @@
+require 'resend'
+
+Resend.api_key = ENV.fetch('RESEND_API_KEY', nil)
diff --git a/lib/mail/resend_provider.rb b/lib/mail/resend_provider.rb
new file mode 100644
index 000000000..f151abfcf
--- /dev/null
+++ b/lib/mail/resend_provider.rb
@@ -0,0 +1,29 @@
+module Mail # rubocop:disable Style/ClassAndModuleChildren
+  class ResendProvider
+    class DeliveryError < StandardError; end
+
+    def initialize(_settings); end # rubocop:disable Style/RedundantInitialize
+
+    def deliver!(mail)
+      Resend::Emails.send(
+        from: mail.smtp_envelope_from,
+        to: mail.smtp_envelope_to,
+        subject: mail.subject,
+        html: mail.decoded,
+        text: sanitize_html(mail.decoded)
+      )
+    rescue Resend::Error => e
+      raise DeliveryError, "Failed to send email: #{e.message}"
+    rescue StandardError => e
+      raise DeliveryError, "An error occurred while sending email: #{e.message}"
+    end
+
+    private
+
+    def sanitize_html(html)
+      sanitized = ActionView::Base.full_sanitizer.sanitize(html)
+      # NOTE: Remove more than two consecutive newlines
+      sanitized.lines.map(&:strip).join("\n").gsub(/\n{3,}/, "\n\n").strip
+    end
+  end
+end
diff --git a/spec/lib/mail/resend_provider_spec.rb b/spec/lib/mail/resend_provider_spec.rb
new file mode 100644
index 000000000..fc4d126b0
--- /dev/null
+++ b/spec/lib/mail/resend_provider_spec.rb
@@ -0,0 +1,57 @@
+require 'rails_helper'
+
+describe Mail::ResendProvider do
+  let(:provider) { described_class.new({}) }
+  let(:mail) do
+    instance_double(Mail::Message,
+                    smtp_envelope_from: 'sender@example.com',
+                    smtp_envelope_to: ['receiver@example.com'],
+                    subject: 'Test Email',
+                    decoded: '<p>This is a test email message.</p>')
+  end
+
+  describe '#deliver!' do
+    it 'calls Resend with the correct parameters' do
+      response = instance_double(HTTParty::Response, success?: true)
+      allow(Resend::Emails).to receive(:send)
+        .with(
+          from: 'sender@example.com',
+          to: ['receiver@example.com'],
+          subject: 'Test Email',
+          html: '<p>This is a test email message.</p>',
+          text: 'This is a test email message.'
+        )
+        .and_return(response)
+
+      provider.deliver!(mail)
+
+      expect(Resend::Emails).to have_received(:send)
+    end
+
+    context 'when response is not successful' do
+      it 'raises a DeliveryError with the error message' do
+        allow(Resend::Emails).to receive(:send)
+          .with(
+            from: 'sender@example.com',
+            to: ['receiver@example.com'],
+            subject: 'Test Email',
+            html: '<p>This is a test email message.</p>',
+            text: 'This is a test email message.'
+          )
+          .and_raise(Resend::Error.new('Service unavailable'))
+
+        expect { provider.deliver!(mail) }
+          .to raise_error(described_class::DeliveryError, 'Failed to send email: Service unavailable')
+      end
+    end
+
+    context 'when an exception occurs during sending' do
+      it 'raises a DeliveryError with the exception message' do
+        allow(Resend::Emails).to receive(:send).and_raise(StandardError, 'Connection timed out')
+
+        expect { provider.deliver!(mail) }
+          .to raise_error(described_class::DeliveryError, 'An error occurred while sending email: Connection timed out')
+      end
+    end
+  end
+end

From 0348d0b25ade96967822c217f5bddf9f3ff7caa7 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Tue, 1 Apr 2025 23:59:07 -0300
Subject: [PATCH 15/46] chore: add support for external frontend URL in
 environment configuration

---
 .env.example                              | 3 +++
 app/helpers/frontend_urls_helper.rb       | 3 ++-
 spec/helpers/frontend_urls_helper_spec.rb | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index cd20ca72a..443baeb57 100644
--- a/.env.example
+++ b/.env.example
@@ -258,6 +258,9 @@ AZURE_APP_SECRET=
 # contact_inboxes with no conversation older than 90 days will be removed
 # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
 
+# NOTE: Useful when running inside docker-compose network to link to external domain
+FRONTEND_URL_EXTERNAL=
+
 # Baileys API Whatsapp provider
 BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=Chatwoot
 BAILEYS_PROVIDER_DEFAULT_URL=http://localhost:3025
diff --git a/app/helpers/frontend_urls_helper.rb b/app/helpers/frontend_urls_helper.rb
index 1867c77ea..281c8bcc3 100644
--- a/app/helpers/frontend_urls_helper.rb
+++ b/app/helpers/frontend_urls_helper.rb
@@ -1,6 +1,7 @@
 module FrontendUrlsHelper
   def frontend_url(path, **query_params)
     url_params = query_params.blank? ? '' : "?#{query_params.to_query}"
-    "#{root_url}app/#{path}#{url_params}"
+    host = ENV.fetch('FRONTEND_URL_EXTERNAL', root_url)
+    "#{host}app/#{path}#{url_params}"
   end
 end
diff --git a/spec/helpers/frontend_urls_helper_spec.rb b/spec/helpers/frontend_urls_helper_spec.rb
index c522d0ee9..beefd23e6 100644
--- a/spec/helpers/frontend_urls_helper_spec.rb
+++ b/spec/helpers/frontend_urls_helper_spec.rb
@@ -13,5 +13,13 @@ describe FrontendUrlsHelper do
         expect(helper.frontend_url('dashboard', p1: 'p1', p2: 'p2')).to eq 'http://test.host/app/dashboard?p1=p1&p2=p2'
       end
     end
+
+    context 'with set FRONTEND_URL_EXTERNAL' do
+      it 'creates path correctly' do
+        with_modified_env 'FRONTEND_URL_EXTERNAL' => 'http://external.url/' do
+          expect(helper.frontend_url('dashboard')).to eq 'http://external.url/app/dashboard'
+        end
+      end
+    end
   end
 end

From 3325539edff02ef394e54c017e494864d36a1215 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Wed, 2 Apr 2025 00:31:43 -0300
Subject: [PATCH 16/46] chore: ensure trailing slash

---
 app/helpers/frontend_urls_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/frontend_urls_helper.rb b/app/helpers/frontend_urls_helper.rb
index 281c8bcc3..67b117f06 100644
--- a/app/helpers/frontend_urls_helper.rb
+++ b/app/helpers/frontend_urls_helper.rb
@@ -2,6 +2,7 @@ module FrontendUrlsHelper
   def frontend_url(path, **query_params)
     url_params = query_params.blank? ? '' : "?#{query_params.to_query}"
     host = ENV.fetch('FRONTEND_URL_EXTERNAL', root_url)
+    host = "#{host}/" unless host.end_with?('/')
     "#{host}app/#{path}#{url_params}"
   end
 end

From a119641c216e6cf9ecf13e23c668d93b9eac9bfa Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Wed, 2 Apr 2025 00:31:55 -0300
Subject: [PATCH 17/46] ci: updated docker compose

---
 docker-compose.coolify.yaml | 49 +++++++++----------------------------
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/docker-compose.coolify.yaml b/docker-compose.coolify.yaml
index d6024cde2..3ce039a5a 100644
--- a/docker-compose.coolify.yaml
+++ b/docker-compose.coolify.yaml
@@ -13,14 +13,17 @@ services:
       - NODE_ENV=production
       - RAILS_ENV=production
       - INSTALLATION_ENV=docker
-      - FRONTEND_URL=http://rails:3000
+      - FRONTEND_URL=${FRONTEND_URL}
+      - FRONTEND_URL_EXTERNAL=${FRONTEND_URL_EXTERNAL}
       - REDIS_URL=redis://redis:6379
       - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/chatwoot_production
       - SECRET_KEY_BASE=${SECRET_KEY_BASE}
       - REDIS_PASSWORD=${REDIS_PASSWORD}
       - BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=${BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME}
-      - BAILEYS_PROVIDER_DEFAULT_URL=http://baileys-api:3025
+      - BAILEYS_PROVIDER_DEFAULT_URL=${BAILEYS_PROVIDER_DEFAULT_URL}
       - BAILEYS_PROVIDER_DEFAULT_API_KEY=${BAILEYS_PROVIDER_DEFAULT_API_KEY}
+      - MAILER_SENDER_EMAIL=${MAILER_SENDER_EMAIL}
+      - RESEND_API_KEY=${RESEND_API_KEY}
     entrypoint: docker/entrypoints/rails.sh
     command:
       - bundle
@@ -58,10 +61,17 @@ services:
       - NODE_ENV=production
       - RAILS_ENV=production
       - INSTALLATION_ENV=docker
+      - FRONTEND_URL=${FRONTEND_URL}
+      - FRONTEND_URL_EXTERNAL=${FRONTEND_URL_EXTERNAL}
       - REDIS_URL=redis://redis:6379
       - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/chatwoot_production
       - SECRET_KEY_BASE=${SECRET_KEY_BASE}
       - REDIS_PASSWORD=${REDIS_PASSWORD}
+      - BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=${BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME}
+      - BAILEYS_PROVIDER_DEFAULT_URL=${BAILEYS_PROVIDER_DEFAULT_URL}
+      - BAILEYS_PROVIDER_DEFAULT_API_KEY=${BAILEYS_PROVIDER_DEFAULT_API_KEY}
+      - MAILER_SENDER_EMAIL=${MAILER_SENDER_EMAIL}
+      - RESEND_API_KEY=${RESEND_API_KEY}
     command:
       - bundle
       - exec
@@ -77,40 +87,6 @@ services:
       timeout: 20s
       retries: 10
 
-  baileys-api:
-    image: 'ghcr.io/fazer-ai/baileys-api:latest'
-    pull_policy: always
-    volumes:
-      - 'storage:/app/storage'
-    depends_on:
-      - rails
-      - sidekiq
-      - redis
-    environment:
-      - NODE_ENV=production
-      - REDIS_URL=redis://redis:6379
-      - REDIS_PASSWORD=${REDIS_PASSWORD}
-      - LOG_LEVEL=${LOG_LEVEL:-debug}
-      - BAILEYS_LOG_LEVEL=${BAILEYS_LOG_LEVEL:-error}
-    command:
-      - bun
-      - start
-    restart: always
-    post_start:
-      - command:
-          - bun
-          - manage-api-keys
-          - create
-          - user 
-          - ${BAILEYS_PROVIDER_DEFAULT_API_KEY}
-    healthcheck:
-      test:
-        - CMD-SHELL
-        - "wget --header='x-api-key: ${BAILEYS_PROVIDER_DEFAULT_API_KEY}' -qO- http://localhost:3025/status"
-      interval: 20s
-      timeout: 20s
-      retries: 10
-
   postgres:
     image: 'pgvector/pgvector:pg16'
     restart: always
@@ -146,4 +122,3 @@ services:
       interval: 20s
       timeout: 20s
       retries: 10
-

From 217cecae9e1517d5d4b26d7aceeb726ae9110bad Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Wed, 2 Apr 2025 09:38:04 -0300
Subject: [PATCH 18/46] feat: update Resend email delivery method to use
 headers for sender and recipient

---
 lib/mail/resend_provider.rb           |  6 +++---
 spec/lib/mail/resend_provider_spec.rb | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/mail/resend_provider.rb b/lib/mail/resend_provider.rb
index f151abfcf..dfc95b4c0 100644
--- a/lib/mail/resend_provider.rb
+++ b/lib/mail/resend_provider.rb
@@ -6,9 +6,9 @@ module Mail # rubocop:disable Style/ClassAndModuleChildren
 
     def deliver!(mail)
       Resend::Emails.send(
-        from: mail.smtp_envelope_from,
-        to: mail.smtp_envelope_to,
-        subject: mail.subject,
+        from: mail.header[:from].to_s,
+        to: mail.header[:to].to_s,
+        subject: mail.header[:subject].to_s,
         html: mail.decoded,
         text: sanitize_html(mail.decoded)
       )
diff --git a/spec/lib/mail/resend_provider_spec.rb b/spec/lib/mail/resend_provider_spec.rb
index fc4d126b0..16cefea51 100644
--- a/spec/lib/mail/resend_provider_spec.rb
+++ b/spec/lib/mail/resend_provider_spec.rb
@@ -3,11 +3,14 @@ require 'rails_helper'
 describe Mail::ResendProvider do
   let(:provider) { described_class.new({}) }
   let(:mail) do
-    instance_double(Mail::Message,
-                    smtp_envelope_from: 'sender@example.com',
-                    smtp_envelope_to: ['receiver@example.com'],
-                    subject: 'Test Email',
-                    decoded: '<p>This is a test email message.</p>')
+    Mail::Message.new(
+      headers: {
+        from: 'Sender <sender@example.com>',
+        to: ['Receiver <receiver@example.com>'],
+        subject: 'Test Email'
+      },
+      body: '<p>This is a test email message.</p>'
+    )
   end
 
   describe '#deliver!' do
@@ -15,8 +18,8 @@ describe Mail::ResendProvider do
       response = instance_double(HTTParty::Response, success?: true)
       allow(Resend::Emails).to receive(:send)
         .with(
-          from: 'sender@example.com',
-          to: ['receiver@example.com'],
+          from: 'Sender <sender@example.com>',
+          to: 'Receiver <receiver@example.com>',
           subject: 'Test Email',
           html: '<p>This is a test email message.</p>',
           text: 'This is a test email message.'
@@ -32,8 +35,8 @@ describe Mail::ResendProvider do
       it 'raises a DeliveryError with the error message' do
         allow(Resend::Emails).to receive(:send)
           .with(
-            from: 'sender@example.com',
-            to: ['receiver@example.com'],
+            from: 'Sender <sender@example.com>',
+            to: 'Receiver <receiver@example.com>',
             subject: 'Test Email',
             html: '<p>This is a test email message.</p>',
             text: 'This is a test email message.'

From 010575e0053af0feb51381a9ec56d3363106ca1f Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Wed, 2 Apr 2025 10:08:07 -0300
Subject: [PATCH 19/46] feat: update email templates to use user's name instead
 of email

---
 app/views/devise/mailer/password_change.html.erb             | 2 +-
 app/views/devise/mailer/reset_password_instructions.html.erb | 2 +-
 app/views/devise/mailer/unlock_instructions.html.erb         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
index b41daf476..a3f00032e 100644
--- a/app/views/devise/mailer/password_change.html.erb
+++ b/app/views/devise/mailer/password_change.html.erb
@@ -1,3 +1,3 @@
-<p>Hello <%= @resource.email %>!</p>
+<p>Hello <%= @resource.name  %>!</p>
 
 <p>We're contacting you to notify you that your password has been changed.</p>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
index 61c48c68d..e46695cc2 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -1,4 +1,4 @@
-<p>Hello <%= @resource.email %>!</p>
+<p>Hello <%= @resource.name %>!</p>
 
 <p>Someone has requested a link to change your password. You can do this through the link below.</p>
 
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
index 41e148bf2..c1096b443 100644
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -1,4 +1,4 @@
-<p>Hello <%= @resource.email %>!</p>
+<p>Hello <%= @resource.name %>!</p>
 
 <p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
 

From 7ee0ec2fdbf8fbed9c5431ff8b99a4eb39961455 Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayoproliveira@gmail.com>
Date: Wed, 2 Apr 2025 14:29:27 -0300
Subject: [PATCH 20/46] fix: handle extended text message type of incoming
 message upsert (#9)

* feat: support extended text messages in WhatsApp incoming message service

* fix: correct isEditorHotKeyEnabled's spec

* ci: add baileys-api service to docker-compose configuration

* feat!: update validate_provider_config? endpoint

* feat: add Resend email delivery method and configuration (#11)

* feat: add Resend email delivery method and configuration

* chore: simplify ResendProvider initialization by removing settings parameter

* test: update ResendProvider initialization in tests by removing unnecessary settings parameter

* chore: improvements

* chore: add support for external frontend URL in environment configuration

* chore: ensure trailing slash

* ci: updated docker compose

* feat: update Resend email delivery method to use headers for sender and recipient

* feat: update email templates to use user's name instead of email

* fix: simplify extended text message structure in Baileys service spec

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
Co-authored-by: Gabriel Jablonski <gabriel@fazer.ai>
---
 .../composables/spec/useUISettings.spec.js    |   4 +-
 .../incoming_message_baileys_service.rb       |   5 +-
 .../incoming_message_baileys_service_spec.rb  | 144 ++++++++++--------
 3 files changed, 89 insertions(+), 64 deletions(-)

diff --git a/app/javascript/dashboard/composables/spec/useUISettings.spec.js b/app/javascript/dashboard/composables/spec/useUISettings.spec.js
index 396363bbf..7b1602904 100644
--- a/app/javascript/dashboard/composables/spec/useUISettings.spec.js
+++ b/app/javascript/dashboard/composables/spec/useUISettings.spec.js
@@ -119,8 +119,8 @@ describe('useUISettings', () => {
   it('returns correct value for isEditorHotKeyEnabled when editor_message_key is not configured', () => {
     getUISettingsMock.value.editor_message_key = undefined;
     const { isEditorHotKeyEnabled } = useUISettings();
-    expect(isEditorHotKeyEnabled('enter')).toBe(false);
-    expect(isEditorHotKeyEnabled('cmd_enter')).toBe(true);
+    expect(isEditorHotKeyEnabled('enter')).toBe(true);
+    expect(isEditorHotKeyEnabled('cmd_enter')).toBe(false);
   });
 
   it('handles non-existent keys', () => {
diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index 93371a6c8..fe4ba67b1 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -85,7 +85,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
 
   def message_type # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     msg = @raw_message[:message]
-    return 'text' if msg.key?(:conversation)
+    return 'text' if msg.key?(:conversation) || msg.dig(:extendedTextMessage, :text)
     return 'contacts' if msg.key?(:contactMessage)
     return 'image' if msg.key?(:imageMessage)
     return 'audio' if msg.key?(:audioMessage)
@@ -106,9 +106,10 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     sender = is_outgoing ? @inbox.account.account_users.first.user : @contact
     sender_type = is_outgoing ? 'User' : 'Contact'
     message_type = is_outgoing ? :outgoing : :incoming
+    content = @raw_message.dig(:message, :conversation) || @raw_message.dig(:message, :extendedTextMessage, :text)
 
     @message = @conversation.messages.create!(
-      content: @raw_message[:message][:conversation],
+      content: content,
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
       source_id: message_id,
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 1d08f2ef8..88411fff0 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -192,71 +192,95 @@ describe Whatsapp::IncomingMessageBaileysService do
           }
         end
 
-        it 'creates an incoming message' do
-          described_class.new(inbox: inbox, params: params).perform
+        context 'when has key conversation' do # rubocop:disable RSpec/NestedGroups
+          it 'creates an incoming message' do
+            described_class.new(inbox: inbox, params: params).perform
 
-          conversation = inbox.conversations.last
-          message = conversation.messages.last
-          expect(message).to be_present
-          expect(message.content).to eq('Hello from Baileys')
-          expect(message.message_type).to eq('incoming')
-          expect(message.sender).to be_present
-          expect(message.sender.name).to eq('John Doe')
+            conversation = inbox.conversations.last
+            message = conversation.messages.last
+            expect(message).to be_present
+            expect(message.content).to eq('Hello from Baileys')
+            expect(message.message_type).to eq('incoming')
+            expect(message.sender).to be_present
+            expect(message.sender.name).to eq('John Doe')
+          end
+
+          it 'creates an outgoing message' do
+            raw_message_outgoing = raw_message.merge(
+              key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: true }
+            )
+            params_outgoing = params.merge(data: { type: 'notify', messages: [raw_message_outgoing] })
+            create(:account_user, account: inbox.account)
+
+            described_class.new(inbox: inbox, params: params_outgoing).perform
+
+            conversation = inbox.conversations.last
+            message = conversation.messages.last
+            expect(message).to be_present
+            expect(message.content).to eq('Hello from Baileys')
+            expect(message.message_type).to eq('outgoing')
+          end
+
+          it 'creates a message on an existing conversation' do
+            contact = create(:contact, account: inbox.account, name: 'John Doe')
+            contact_inbox = create(:contact_inbox, inbox: inbox, contact: contact, source_id: '5511912345678')
+            existing_conversation = create(:conversation, inbox: inbox, contact_inbox: contact_inbox)
+
+            described_class.new(inbox: inbox, params: params).perform
+
+            message = existing_conversation.messages.last
+            expect(message.sender).to eq(contact)
+          end
+
+          it 'does not create a message if it already exists' do
+            message = create(:message, inbox: inbox, source_id: 'msg_123')
+
+            described_class.new(inbox: inbox, params: params).perform
+
+            conversation = inbox.conversations.last
+            messages = conversation.messages
+            expect(messages).to eq([message])
+          end
+
+          it 'does not create a message if it is already being processed' do
+            allow(Redis::Alfred).to receive(:get).with(format_message_source_key('msg_123')).and_return(true)
+
+            described_class.new(inbox: inbox, params: params).perform
+
+            expect(inbox.conversations).to be_empty
+          end
+
+          it 'caches the message source id in Redis and clears it' do
+            allow(Redis::Alfred).to receive(:setex).with(format_message_source_key('msg_123'), true)
+            allow(Redis::Alfred).to receive(:delete).with(format_message_source_key('msg_123'))
+
+            described_class.new(inbox: inbox, params: params).perform
+
+            expect(Redis::Alfred).to have_received(:setex)
+            expect(Redis::Alfred).to have_received(:delete)
+          end
         end
 
-        it 'creates an outgoing message' do
-          raw_message_outgoing = raw_message.merge(
-            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: true }
-          )
-          params_outgoing = params.merge(data: { type: 'notify', messages: [raw_message_outgoing] })
-          create(:account_user, account: inbox.account)
+        context 'when is a extendedTextMessage that has key text' do # rubocop:disable RSpec/NestedGroups
+          let(:raw_message) do
+            {
+              key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+              message: { 'extendedTextMessage': { text: 'Hello from Baileys' } },
+              pushName: 'John Doe'
+            }
+          end
 
-          described_class.new(inbox: inbox, params: params_outgoing).perform
+          it 'creates an incoming message' do
+            described_class.new(inbox: inbox, params: params).perform
 
-          conversation = inbox.conversations.last
-          message = conversation.messages.last
-          expect(message).to be_present
-          expect(message.content).to eq('Hello from Baileys')
-          expect(message.message_type).to eq('outgoing')
-        end
-
-        it 'creates a message on an existing conversation' do
-          contact = create(:contact, account: inbox.account, name: 'John Doe')
-          contact_inbox = create(:contact_inbox, inbox: inbox, contact: contact, source_id: '5511912345678')
-          existing_conversation = create(:conversation, inbox: inbox, contact_inbox: contact_inbox)
-
-          described_class.new(inbox: inbox, params: params).perform
-
-          message = existing_conversation.messages.last
-          expect(message.sender).to eq(contact)
-        end
-
-        it 'does not create a message if it already exists' do
-          message = create(:message, inbox: inbox, source_id: 'msg_123')
-
-          described_class.new(inbox: inbox, params: params).perform
-
-          conversation = inbox.conversations.last
-          messages = conversation.messages
-          expect(messages).to eq([message])
-        end
-
-        it 'does not create a message if it is already being processed' do
-          allow(Redis::Alfred).to receive(:get).with(format_message_source_key('msg_123')).and_return(true)
-
-          described_class.new(inbox: inbox, params: params).perform
-
-          expect(inbox.conversations).to be_empty
-        end
-
-        it 'caches the message source id in Redis and clears it' do
-          allow(Redis::Alfred).to receive(:setex).with(format_message_source_key('msg_123'), true)
-          allow(Redis::Alfred).to receive(:delete).with(format_message_source_key('msg_123'))
-
-          described_class.new(inbox: inbox, params: params).perform
-
-          expect(Redis::Alfred).to have_received(:setex)
-          expect(Redis::Alfred).to have_received(:delete)
+            conversation = inbox.conversations.last
+            message = conversation.messages.last
+            expect(message).to be_present
+            expect(message.content).to eq('Hello from Baileys')
+            expect(message.message_type).to eq('incoming')
+            expect(message.sender).to be_present
+            expect(message.sender.name).to eq('John Doe')
+          end
         end
       end
     end

From e930820f680004cfcc3dc76195b53faa0c1e57a9 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Thu, 3 Apr 2025 22:30:17 -0300
Subject: [PATCH 21/46] ci: update workflow to trigger on fazer-ai/main branch
 and remove from PRs (#17)

* ci: update workflow to trigger on fazer-ai/main branch and remove from PRs

* ci: update workflows to trigger on fazer-ai/main branch and enable manual dispatch
---
 .github/workflows/frontend-fe.yml   | 6 ++----
 .github/workflows/run_foss_spec.yml | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/frontend-fe.yml b/.github/workflows/frontend-fe.yml
index 5af4857e0..50ed8d005 100644
--- a/.github/workflows/frontend-fe.yml
+++ b/.github/workflows/frontend-fe.yml
@@ -3,10 +3,8 @@ name: Frontend Lint & Test
 on:
   push:
     branches:
-      - develop
-  pull_request:
-    branches:
-      - develop
+      - fazer-ai/main
+  workflow_dispatch:
 
 jobs:
   test:
diff --git a/.github/workflows/run_foss_spec.yml b/.github/workflows/run_foss_spec.yml
index 5a9d35d0b..dd8a0bdca 100644
--- a/.github/workflows/run_foss_spec.yml
+++ b/.github/workflows/run_foss_spec.yml
@@ -1,10 +1,9 @@
 name: Run Chatwoot CE spec
+
 on:
   push:
     branches:
-      - develop
-      - master
-  pull_request:
+      - fazer-ai/main
   workflow_dispatch:
 
 jobs:

From 02732b3db66914141bce9852bf74f706b2d976aa Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Thu, 3 Apr 2025 22:30:57 -0300
Subject: [PATCH 22/46] chore: enable ActiveRecord logging in Rails console for
 better debugging (#16)

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

diff --git a/config/application.rb b/config/application.rb
index 34fa37dc3..fffb740a5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -59,6 +59,8 @@ module Chatwoot
     # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
     # FIX ME : fixes breakage of installation config. we need to migrate.
     config.active_record.yaml_column_permitted_classes = [ActiveSupport::HashWithIndifferentAccess]
+
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new($stdout) if defined?(Rails::Console)
   end
 
   def self.config

From e0708ca6f8f9a98fa25ea486d21e50cd557d5e1e Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayoproliveira@gmail.com>
Date: Thu, 3 Apr 2025 23:09:49 -0300
Subject: [PATCH 23/46] fix: handle new contact without push name (#13)

* fix: resolve bug for contact name when user stats a new conversation with a new contact

* chore: update specs to cover the bug resolution

* chore: correct variable name

* chore: simplify update contact name handling

* chore: ensure pushName is always a string and leave a comment to keep an eye if always pushName will be present

* fix: update contact name access

* chore: identify and permit only direct users jid types (#14)

* fix: add jid_type method to classify message sender types and prevent processing for non-user jids

* chore: update jid parsing to correctly extract phone number and improve message type detection

* chore: add spec to ensure no conversation is created for non-user messages

* chore: update jid shape comment

* chore: refactor jid_type method

* chore: update message_type logic for classify text messages when is a extendedTextMessage

* refactor: update spec that no conversation is created for non-user messages

* fix: use update! method for contact name update

* chore: add note on distinguishing broadcast and status JIDs in Baileys

* chore: add note on Baileys internal function for JID classification
---
 .../incoming_message_baileys_service.rb       | 41 +++++++++++++++++--
 .../incoming_message_baileys_service_spec.rb  | 40 +++++++++++++++++-
 2 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index fe4ba67b1..34a0fc296 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -46,6 +46,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
   end
 
   def handle_message
+    return if jid_type != 'user'
     return if find_message_by_source_id(message_id) || message_under_process?
 
     cache_message_source_id_in_redis
@@ -62,16 +63,23 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
   end
 
   def set_contact
-    phone_number_from_jid = @raw_message[:key][:remoteJid].split('@').first.split(':').first
-
+    # NOTE: jid shape is `<user>_<agent>:<device>@<server>`
+    # https://github.com/WhiskeySockets/Baileys/blob/v6.7.16/src/WABinary/jid-utils.ts#L19
+    phone_number_from_jid = @raw_message[:key][:remoteJid].split('@').first.split(':').first.split('_').first
+    phone_number_formatted = "+#{phone_number_from_jid}"
+    # NOTE: We're assuming `pushName` will always be present when `fromMe: false`.
+    # This assumption might be incorrect, so let's keep an eye out for contacts being created with empty name.
+    push_name = @raw_message[:key][:fromMe] ? phone_number_formatted : @raw_message[:pushName].to_s
     contact_inbox = ::ContactInboxWithContactBuilder.new(
       source_id: phone_number_from_jid,
       inbox: inbox,
-      contact_attributes: { name: @raw_message[:pushName], phone_number: "+#{phone_number_from_jid}" }
+      contact_attributes: { name: push_name, phone_number: phone_number_formatted }
     ).perform
 
     @contact_inbox = contact_inbox
     @contact = contact_inbox.contact
+
+    @contact.update!(name: push_name) if @contact.name == phone_number_formatted && !@raw_message[:key][:fromMe]
   end
 
   def handle_create_message
@@ -83,9 +91,34 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     end
   end
 
+  def jid_type # rubocop:disable Metrics/CyclomaticComplexity
+    jid = @raw_message[:key][:remoteJid]
+    server = jid.split('@').last
+
+    # NOTE: Based on Baileys internal functions
+    # https://github.com/WhiskeySockets/Baileys/blob/v6.7.16/src/WABinary/jid-utils.ts#L48-L58
+    case server
+    when 's.whatsapp.net', 'c.us'
+      'user'
+    when 'g.us'
+      'group'
+    when 'lid'
+      'lid'
+    when 'broadcast'
+      jid.start_with?('status@') ? 'status' : 'broadcast'
+    when 'newsletter'
+      'newsletter'
+    when 'call'
+      'call'
+    else
+      'unknown'
+    end
+  end
+
   def message_type # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     msg = @raw_message[:message]
-    return 'text' if msg.key?(:conversation) || msg.dig(:extendedTextMessage, :text)
+
+    return 'text' if msg.key?(:conversation) || msg.dig(:extendedTextMessage, :text).present?
     return 'contacts' if msg.key?(:contactMessage)
     return 'image' if msg.key?(:imageMessage)
     return 'audio' if msg.key?(:audioMessage)
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 88411fff0..4bc7ab5bd 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -173,6 +173,32 @@ describe Whatsapp::IncomingMessageBaileysService do
         end
       end
 
+      context 'when message is not from a user' do
+        let(:raw_message) do
+          {
+            key: { id: 'msg_123', remoteJid: 'status@broadcast', participant: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { extendedTextMessage: { text: 'message' } },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            }
+          }
+        end
+
+        it 'does not create a conversation' do
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(inbox.conversations).to be_empty
+        end
+      end
+
       context 'when message type is text' do
         let(:raw_message) do
           {
@@ -206,8 +232,9 @@ describe Whatsapp::IncomingMessageBaileysService do
           end
 
           it 'creates an outgoing message' do
+            number = '5511912345678'
             raw_message_outgoing = raw_message.merge(
-              key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: true }
+              key: { id: 'msg_123', remoteJid: "#{number}@s.whatsapp.net", fromMe: true }
             )
             params_outgoing = params.merge(data: { type: 'notify', messages: [raw_message_outgoing] })
             create(:account_user, account: inbox.account)
@@ -219,6 +246,15 @@ describe Whatsapp::IncomingMessageBaileysService do
             expect(message).to be_present
             expect(message.content).to eq('Hello from Baileys')
             expect(message.message_type).to eq('outgoing')
+            expect(conversation.contact.name).to eq("+#{number}")
+          end
+
+          it 'updates the contact name if the current name is a phone number when a incoming message is received' do
+            create(:contact, account: inbox.account, name: '+5511912345678', phone_number: '+5511912345678')
+            described_class.new(inbox: inbox, params: params).perform
+
+            conversation = inbox.conversations.last
+            expect(conversation.contact.name).to eq('John Doe')
           end
 
           it 'creates a message on an existing conversation' do
@@ -265,7 +301,7 @@ describe Whatsapp::IncomingMessageBaileysService do
           let(:raw_message) do
             {
               key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
-              message: { 'extendedTextMessage': { text: 'Hello from Baileys' } },
+              message: { extendedTextMessage: { text: 'Hello from Baileys' } },
               pushName: 'John Doe'
             }
           end

From 659c3e7c2f9bbe6928d213c3e1eabc645ad627b7 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Thu, 3 Apr 2025 23:10:23 -0300
Subject: [PATCH 24/46] chore: apply Rails/SaveBang cop (#15)

* chore: apply Rails/SaveBang cop

* fix: correct locale validation in category model spec

* fix: update save methods to avoid Rails/SaveBang cop violations
---
 .rubocop.yml                                  |  7 +++
 .../messages/messenger/message_builder.rb     |  2 +-
 .../api/v1/accounts/callbacks_controller.rb   |  2 +-
 .../accounts/integrations/slack_controller.rb |  2 +-
 .../v1/accounts/notifications_controller.rb   |  8 ++--
 .../api/v1/accounts/portals_controller.rb     |  2 +-
 app/controllers/api/v1/profiles_controller.rb |  2 +-
 .../api/v1/widget/contacts_controller.rb      |  2 +-
 .../platform/api/v1/accounts_controller.rb    |  2 +-
 .../platform/api/v1/agent_bots_controller.rb  |  2 +-
 .../api/v1/inboxes/contacts_controller.rb     |  2 +-
 .../super_admin/app_configs_controller.rb     |  2 +-
 app/jobs/bulk_actions_job.rb                  |  4 +-
 app/jobs/conversations/user_mention_job.rb    |  2 +-
 app/mailers/conversation_reply_mailer.rb      |  2 +-
 app/models/article.rb                         |  2 +-
 app/models/channel/twilio_sms.rb              |  2 +-
 .../concerns/conversation_mute_helpers.rb     |  4 +-
 app/models/concerns/featurable.rb             |  4 +-
 app/models/conversation.rb                    |  4 +-
 app/models/message.rb                         |  8 ++--
 app/models/portal.rb                          |  2 +-
 app/models/team.rb                            |  2 +-
 app/services/action_service.rb                |  2 +-
 .../agent_assignment_service.rb               |  2 +-
 app/services/data_import/contact_manager.rb   |  2 +-
 .../instagram/webhooks_base_service.rb        |  2 +-
 app/services/twilio/webhook_setup_service.rb  |  2 +-
 .../providers/whatsapp_360_dialog_service.rb  |  2 +-
 .../providers/whatsapp_cloud_service.rb       |  2 +-
 ...0230515051424_update_article_image_keys.rb |  2 +-
 .../captain/assistant_responses_controller.rb |  2 +-
 .../accounts/captain/assistants_controller.rb |  2 +-
 .../captain/bulk_actions_controller.rb        |  2 +-
 .../accounts/captain/documents_controller.rb  |  2 +-
 .../enterprise/api/v1/accounts_controller.rb  |  2 +-
 .../app/jobs/enterprise/delete_object_job.rb  |  2 +-
 .../account/plan_usage_and_limits.rb          |  6 +--
 .../models/enterprise/audit/inbox_member.rb   |  2 +-
 .../models/enterprise/audit/team_member.rb    |  2 +-
 .../app/models/enterprise/channelable.rb      |  2 +-
 .../account_updater_service.rb                |  2 +-
 lib/action_view/template/handlers/liquid.rb   |  2 +-
 lib/config_loader.rb                          |  2 +-
 lib/global_config_service.rb                  |  2 +-
 lib/integrations/slack/channel_builder.rb     | 18 +++----
 lib/vapid_service.rb                          |  2 +-
 spec/builders/notification_builder_spec.rb    |  4 +-
 spec/builders/v2/report_builder_spec.rb       |  4 +-
 .../api/v1/accounts/agents_controller_spec.rb |  2 +-
 .../accounts/bulk_actions_controller_spec.rb  |  8 ++--
 .../v1/accounts/contacts_controller_spec.rb   |  4 +-
 .../custom_filters_controller_spec.rb         |  2 +-
 .../api/v1/accounts/macros_controller_spec.rb |  2 +-
 .../v1/accounts/portals_controller_spec.rb    |  2 +-
 .../api/v1/accounts_controller_spec.rb        |  6 +--
 .../widget/conversations_controller_spec.rb   |  4 +-
 .../public/api/v1/portals_controller_spec.rb  |  2 +-
 .../api/v1/accounts/agents_controller_spec.rb |  6 +--
 .../accounts/applied_slas_controller_spec.rb  |  4 +-
 .../accounts/conversations_controller_spec.rb |  2 +-
 .../v1/accounts/portals_controller_spec.rb    |  2 +-
 .../api/v1/accounts_controller_spec.rb        |  8 ++--
 spec/enterprise/models/account_spec.rb        | 14 +++---
 .../enterprise/models/automation_rule_spec.rb |  2 +-
 spec/enterprise/models/inbox_member_spec.rb   |  2 +-
 spec/enterprise/models/inbox_spec.rb          | 14 +++---
 spec/enterprise/models/macro_spec.rb          |  2 +-
 spec/enterprise/models/team_member_spec.rb    |  2 +-
 spec/enterprise/models/team_spec.rb           |  2 +-
 spec/enterprise/models/user_spec.rb           |  2 +-
 spec/enterprise/models/webhook_spec.rb        |  2 +-
 .../permission_filter_service_spec.rb         |  8 ++--
 .../sla/evaluate_applied_sla_service_spec.rb  | 24 +++++-----
 spec/finders/email_channel_finder_spec.rb     | 12 ++---
 ...ersations_resolution_scheduler_job_spec.rb |  2 +-
 .../jobs/conversations/resolution_job_spec.rb |  6 +--
 .../jobs/webhooks/whatsapp_events_job_spec.rb |  2 +-
 .../dialogflow/processor_service_spec.rb      |  2 +-
 .../facebook/delivery_status_spec.rb          |  4 +-
 spec/lib/online_status_tracker_spec.rb        |  2 +-
 spec/listeners/action_cable_listener_spec.rb  |  2 +-
 .../automation_rule_listener_old_spec.rb      |  8 ++--
 spec/listeners/notification_listener_spec.rb  |  6 +--
 .../reporting_event_listener_spec.rb          |  2 +-
 spec/listeners/webhook_listener_spec.rb       |  2 +-
 spec/mailboxes/application_mailbox_spec.rb    |  6 +--
 .../mailers/conversation_reply_mailer_spec.rb | 48 +++++++++----------
 spec/models/account_spec.rb                   | 14 +++---
 spec/models/category_spec.rb                  |  2 +-
 spec/models/channel/twilio_sms_spec.rb        |  6 +--
 .../concerns/assignment_handler_shared.rb     |  8 ++--
 .../auto_assignment_handler_shared.rb         |  2 +-
 spec/models/contact_inbox_spec.rb             |  4 +-
 spec/models/conversation_spec.rb              | 20 ++++----
 spec/models/inbox_spec.rb                     | 10 ++--
 spec/models/label_spec.rb                     |  4 +-
 spec/models/message_spec.rb                   |  2 +-
 spec/models/portal_spec.rb                    |  6 +--
 spec/models/working_hour_spec.rb              |  6 +--
 .../integrations/slack_request_spec.rb        |  4 +-
 .../automation_rules/action_service_spec.rb   |  4 +-
 .../condition_validation_service_spec.rb      | 14 +++---
 .../conditions_filter_service_spec.rb         | 18 +++----
 spec/services/contacts/filter_service_spec.rb |  6 +--
 .../services/contacts/sync_attributes_spec.rb |  4 +-
 .../refresh_oauth_token_service_spec.rb       |  2 +-
 .../hook_execution_service_spec.rb            | 28 +++++------
 .../refresh_oauth_token_service_spec.rb       |  2 +-
 .../sms/incoming_message_service_spec.rb      | 12 ++---
 .../twilio/incoming_message_service_spec.rb   | 12 ++---
 .../oneoff_sms_campaign_service_spec.rb       |  6 +--
 .../twilio/send_on_twilio_service_spec.rb     | 12 ++---
 .../whatsapp/incoming_message_service_spec.rb | 12 ++---
 114 files changed, 301 insertions(+), 298 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 679531c66..2dcf6eec4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -170,3 +170,10 @@ AllCops:
 
 Layout/LeadingCommentSpace:
   Enabled: false
+
+Rails/SaveBang:
+  Enabled: true
+  AllowedReceivers:
+    - Stripe::Subscription
+    - Stripe::Customer
+    - FactoryBot
diff --git a/app/builders/messages/messenger/message_builder.rb b/app/builders/messages/messenger/message_builder.rb
index f01a236c9..4866769fd 100644
--- a/app/builders/messages/messenger/message_builder.rb
+++ b/app/builders/messages/messenger/message_builder.rb
@@ -77,7 +77,7 @@ class Messages::Messenger::MessageBuilder
   rescue Koala::Facebook::ClientError => e
     # The exception occurs when we are trying fetch the deleted story or blocked story.
     @message.attachments.destroy_all
-    @message.update(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
+    @message.update!(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
     Rails.logger.error e
     {}
   rescue StandardError => e
diff --git a/app/controllers/api/v1/accounts/callbacks_controller.rb b/app/controllers/api/v1/accounts/callbacks_controller.rb
index 6e119ca3d..960fc5725 100644
--- a/app/controllers/api/v1/accounts/callbacks_controller.rb
+++ b/app/controllers/api/v1/accounts/callbacks_controller.rb
@@ -39,7 +39,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
     return if response['instagram_business_account'].blank?
 
     instagram_id = response['instagram_business_account']['id']
-    facebook_channel.update(instagram_id: instagram_id)
+    facebook_channel.update!(instagram_id: instagram_id)
   rescue StandardError => e
     Rails.logger.error "Error in set_instagram_id: #{e.message}"
   end
diff --git a/app/controllers/api/v1/accounts/integrations/slack_controller.rb b/app/controllers/api/v1/accounts/integrations/slack_controller.rb
index eaa18c2de..eadd46e4a 100644
--- a/app/controllers/api/v1/accounts/integrations/slack_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/slack_controller.rb
@@ -16,7 +16,7 @@ class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::Base
   end
 
   def update
-    @hook = channel_builder.update(permitted_params[:reference_id])
+    @hook = channel_builder.update_reference_id(permitted_params[:reference_id])
     render json: { error: I18n.t('errors.slack.invalid_channel_id') }, status: :unprocessable_entity if @hook.blank?
   end
 
diff --git a/app/controllers/api/v1/accounts/notifications_controller.rb b/app/controllers/api/v1/accounts/notifications_controller.rb
index 52035ce64..874fb67a4 100644
--- a/app/controllers/api/v1/accounts/notifications_controller.rb
+++ b/app/controllers/api/v1/accounts/notifications_controller.rb
@@ -25,17 +25,17 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
   end
 
   def update
-    @notification.update(read_at: DateTime.now.utc)
+    @notification.update!(read_at: DateTime.now.utc)
     render json: @notification
   end
 
   def unread
-    @notification.update(read_at: nil)
+    @notification.update!(read_at: nil)
     render json: @notification
   end
 
   def destroy
-    @notification.destroy
+    @notification.destroy!
     head :ok
   end
 
@@ -55,7 +55,7 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
 
   def snooze
     updated_meta = (@notification.meta || {}).merge('last_snoozed_at' => nil)
-    @notification.update(snoozed_until: parse_date_time(params[:snoozed_until].to_s), meta: updated_meta) if params[:snoozed_until]
+    @notification.update!(snoozed_until: parse_date_time(params[:snoozed_until].to_s), meta: updated_meta) if params[:snoozed_until]
     render json: @notification
   end
 
diff --git a/app/controllers/api/v1/accounts/portals_controller.rb b/app/controllers/api/v1/accounts/portals_controller.rb
index 6cfed161f..73bba60eb 100644
--- a/app/controllers/api/v1/accounts/portals_controller.rb
+++ b/app/controllers/api/v1/accounts/portals_controller.rb
@@ -38,7 +38,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   end
 
   def archive
-    @portal.update(archive: true)
+    @portal.update!(archive: true)
     head :ok
   end
 
diff --git a/app/controllers/api/v1/profiles_controller.rb b/app/controllers/api/v1/profiles_controller.rb
index ae1a1fe30..7eabf686f 100644
--- a/app/controllers/api/v1/profiles_controller.rb
+++ b/app/controllers/api/v1/profiles_controller.rb
@@ -29,7 +29,7 @@ class Api::V1::ProfilesController < Api::BaseController
   end
 
   def set_active_account
-    @user.account_users.find_by(account_id: profile_params[:account_id]).update(active_at: Time.now.utc)
+    @user.account_users.find_by(account_id: profile_params[:account_id]).update!(active_at: Time.now.utc)
     head :ok
   end
 
diff --git a/app/controllers/api/v1/widget/contacts_controller.rb b/app/controllers/api/v1/widget/contacts_controller.rb
index 5138fe675..32d89f450 100644
--- a/app/controllers/api/v1/widget/contacts_controller.rb
+++ b/app/controllers/api/v1/widget/contacts_controller.rb
@@ -19,7 +19,7 @@ class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
       contact = @contact
     end
 
-    @contact_inbox.update(hmac_verified: true) if should_verify_hmac? && valid_hmac?
+    @contact_inbox.update!(hmac_verified: true) if should_verify_hmac? && valid_hmac?
 
     identify_contact(contact)
   end
diff --git a/app/controllers/platform/api/v1/accounts_controller.rb b/app/controllers/platform/api/v1/accounts_controller.rb
index e11cf9d4a..4b3c7cfee 100644
--- a/app/controllers/platform/api/v1/accounts_controller.rb
+++ b/app/controllers/platform/api/v1/accounts_controller.rb
@@ -5,7 +5,7 @@ class Platform::Api::V1::AccountsController < PlatformController
     @resource = Account.create!(account_params)
     update_resource_features
     @resource.save!
-    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
+    @platform_app.platform_app_permissibles.find_or_create_by!(permissible: @resource)
   end
 
   def update
diff --git a/app/controllers/platform/api/v1/agent_bots_controller.rb b/app/controllers/platform/api/v1/agent_bots_controller.rb
index dd70a1ba5..a3ed639fd 100644
--- a/app/controllers/platform/api/v1/agent_bots_controller.rb
+++ b/app/controllers/platform/api/v1/agent_bots_controller.rb
@@ -12,7 +12,7 @@ class Platform::Api::V1::AgentBotsController < PlatformController
     @resource = AgentBot.new(agent_bot_params.except(:avatar_url))
     @resource.save!
     process_avatar_from_url
-    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
+    @platform_app.platform_app_permissibles.find_or_create_by!(permissible: @resource)
   end
 
   def update
diff --git a/app/controllers/public/api/v1/inboxes/contacts_controller.rb b/app/controllers/public/api/v1/inboxes/contacts_controller.rb
index 835c2596b..246c95d25 100644
--- a/app/controllers/public/api/v1/inboxes/contacts_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/contacts_controller.rb
@@ -31,7 +31,7 @@ class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesCon
     return if params[:identifier_hash].blank? && !@inbox_channel.hmac_mandatory
     raise StandardError, 'HMAC failed: Invalid Identifier Hash Provided' unless valid_hmac?
 
-    @contact_inbox.update(hmac_verified: true) if @contact_inbox.present?
+    @contact_inbox.update!(hmac_verified: true) if @contact_inbox.present?
   end
 
   def valid_hmac?
diff --git a/app/controllers/super_admin/app_configs_controller.rb b/app/controllers/super_admin/app_configs_controller.rb
index 550b6c893..4ff461672 100644
--- a/app/controllers/super_admin/app_configs_controller.rb
+++ b/app/controllers/super_admin/app_configs_controller.rb
@@ -18,7 +18,7 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
     params['app_config'].each do |key, value|
       next unless @allowed_configs.include?(key)
 
-      i = InstallationConfig.where(name: key).first_or_create(value: value, locked: false)
+      i = InstallationConfig.where(name: key).first_or_create!(value: value, locked: false)
       i.value = value
       i.save!
     end
diff --git a/app/jobs/bulk_actions_job.rb b/app/jobs/bulk_actions_job.rb
index 73fa1b151..59248e9b9 100644
--- a/app/jobs/bulk_actions_job.rb
+++ b/app/jobs/bulk_actions_job.rb
@@ -26,7 +26,7 @@ class BulkActionsJob < ApplicationJob
     records.each do |conversation|
       bulk_add_labels(conversation)
       bulk_snoozed_until(conversation)
-      conversation.update(params) if params
+      conversation.update!(params) if params
     end
   end
 
@@ -54,7 +54,7 @@ class BulkActionsJob < ApplicationJob
     return unless @params[:labels] && @params[:labels][:remove]
 
     labels = conversation.label_list - @params[:labels][:remove]
-    conversation.update(label_list: labels)
+    conversation.update!(label_list: labels)
   end
 
   def records_to_updated(ids)
diff --git a/app/jobs/conversations/user_mention_job.rb b/app/jobs/conversations/user_mention_job.rb
index fe162792e..e6ca1afcd 100644
--- a/app/jobs/conversations/user_mention_job.rb
+++ b/app/jobs/conversations/user_mention_job.rb
@@ -17,7 +17,7 @@ class Conversations::UserMentionJob < ApplicationJob
           account_id: account_id
         )
       else
-        mention.update(mentioned_at: Time.zone.now)
+        mention.update!(mentioned_at: Time.zone.now)
       end
     end
   end
diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index 7c00d92d0..b55f848d5 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -35,7 +35,7 @@ class ConversationReplyMailer < ApplicationMailer
     init_conversation_attributes(message.conversation)
     @message = message
     reply_mail_object = prepare_mail(true)
-    message.update(source_id: reply_mail_object.message_id)
+    message.update!(source_id: reply_mail_object.message_id)
   end
 
   def conversation_transcript(conversation, to_email)
diff --git a/app/models/article.rb b/app/models/article.rb
index 48e0529a2..c4ba15b20 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -107,7 +107,7 @@ class Article < ApplicationRecord
 
     root_article_id = self.class.find_root_article_id(article)
 
-    update(associated_article_id: root_article_id) if root_article_id.present?
+    update!(associated_article_id: root_article_id) if root_article_id.present?
   end
 
   # Make sure we always associate the parent's associated id to avoid the deeper associations od articles.
diff --git a/app/models/channel/twilio_sms.rb b/app/models/channel/twilio_sms.rb
index 935ab2a14..20ebe519e 100644
--- a/app/models/channel/twilio_sms.rb
+++ b/app/models/channel/twilio_sms.rb
@@ -49,7 +49,7 @@ class Channel::TwilioSms < ApplicationRecord
     params = send_message_from.merge(to: to, body: body)
     params[:media_url] = media_url if media_url.present?
     params[:status_callback] = twilio_delivery_status_index_url
-    client.messages.create(**params)
+    client.messages.create!(**params)
   end
 
   private
diff --git a/app/models/concerns/conversation_mute_helpers.rb b/app/models/concerns/conversation_mute_helpers.rb
index c6ea4c7b1..0db70467f 100644
--- a/app/models/concerns/conversation_mute_helpers.rb
+++ b/app/models/concerns/conversation_mute_helpers.rb
@@ -3,12 +3,12 @@ module ConversationMuteHelpers
 
   def mute!
     resolved!
-    contact.update(blocked: true)
+    contact.update!(blocked: true)
     create_muted_message
   end
 
   def unmute!
-    contact.update(blocked: false)
+    contact.update!(blocked: false)
     create_unmuted_message
   end
 
diff --git a/app/models/concerns/featurable.rb b/app/models/concerns/featurable.rb
index ff4aa961b..919dddd41 100644
--- a/app/models/concerns/featurable.rb
+++ b/app/models/concerns/featurable.rb
@@ -27,7 +27,7 @@ module Featurable
 
   def enable_features!(*)
     enable_features(*)
-    save
+    save!
   end
 
   def disable_features(*names)
@@ -38,7 +38,7 @@ module Featurable
 
   def disable_features!(*)
     disable_features(*)
-    save
+    save!
   end
 
   def feature_enabled?(name)
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index e09e6efaf..32a214759 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -159,12 +159,12 @@ class Conversation < ApplicationRecord
     # FIXME: implement state machine with aasm
     self.status = open? ? :resolved : :open
     self.status = :open if pending? || snoozed?
-    save
+    save!
   end
 
   def toggle_priority(priority = nil)
     self.priority = priority.presence
-    save
+    save!
   end
 
   def bot_handoff!
diff --git a/app/models/message.rb b/app/models/message.rb
index c6c737fe6..101b0c176 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -268,7 +268,7 @@ class Message < ApplicationRecord
   end
 
   def update_contact_activity
-    sender.update(last_activity_at: DateTime.now) if sender.is_a?(Contact)
+    sender.update!(last_activity_at: DateTime.now) if sender.is_a?(Contact)
   end
 
   def update_waiting_since
@@ -276,9 +276,9 @@ class Message < ApplicationRecord
       Rails.configuration.dispatcher.dispatch(
         REPLY_CREATED, Time.zone.now, waiting_since: conversation.waiting_since, message: self
       )
-      conversation.update(waiting_since: nil)
+      conversation.update!(waiting_since: nil)
     end
-    conversation.update(waiting_since: created_at) if incoming? && conversation.waiting_since.blank?
+    conversation.update!(waiting_since: created_at) if incoming? && conversation.waiting_since.blank?
   end
 
   def human_response?
@@ -296,7 +296,7 @@ class Message < ApplicationRecord
 
     if valid_first_reply?
       Rails.configuration.dispatcher.dispatch(FIRST_REPLY_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
-      conversation.update(first_reply_created_at: created_at, waiting_since: nil)
+      conversation.update!(first_reply_created_at: created_at, waiting_since: nil)
     else
       update_waiting_since
     end
diff --git a/app/models/portal.rb b/app/models/portal.rb
index cb87929f5..623ec4a03 100644
--- a/app/models/portal.rb
+++ b/app/models/portal.rb
@@ -66,6 +66,6 @@ class Portal < ApplicationRecord
   def config_json_format
     config['default_locale'] = default_locale
     denied_keys = config.keys - CONFIG_JSON_KEYS
-    errors.add(:cofig, "in portal on #{denied_keys.join(',')} is not supported.") if denied_keys.any?
+    errors.add(:config, "in portal on #{denied_keys.join(',')} is not supported.") if denied_keys.any?
   end
 end
diff --git a/app/models/team.rb b/app/models/team.rb
index a2b69c7fb..731138e85 100644
--- a/app/models/team.rb
+++ b/app/models/team.rb
@@ -36,7 +36,7 @@ class Team < ApplicationRecord
   # @return [Array<User>] Array of newly added members
   def add_members(user_ids)
     team_members_to_create = user_ids.map { |user_id| { user_id: user_id } }
-    created_members = team_members.create(team_members_to_create)
+    created_members = team_members.create!(team_members_to_create)
     added_users = created_members.filter_map(&:user)
 
     update_account_cache
diff --git a/app/services/action_service.rb b/app/services/action_service.rb
index 4f33a302b..21a3fa087 100644
--- a/app/services/action_service.rb
+++ b/app/services/action_service.rb
@@ -46,7 +46,7 @@ class ActionService
     return if labels.empty?
 
     labels = @conversation.label_list - labels
-    @conversation.update(label_list: labels)
+    @conversation.update!(label_list: labels)
   end
 
   def assign_team(team_ids = [])
diff --git a/app/services/auto_assignment/agent_assignment_service.rb b/app/services/auto_assignment/agent_assignment_service.rb
index 5beaee2c3..934a4bd14 100644
--- a/app/services/auto_assignment/agent_assignment_service.rb
+++ b/app/services/auto_assignment/agent_assignment_service.rb
@@ -10,7 +10,7 @@ class AutoAssignment::AgentAssignmentService
 
   def perform
     new_assignee = find_assignee
-    conversation.update(assignee: new_assignee) if new_assignee
+    conversation.update!(assignee: new_assignee) if new_assignee
   end
 
   private
diff --git a/app/services/data_import/contact_manager.rb b/app/services/data_import/contact_manager.rb
index 460a83726..d02f6f66e 100644
--- a/app/services/data_import/contact_manager.rb
+++ b/app/services/data_import/contact_manager.rb
@@ -53,7 +53,7 @@ class DataImport::ContactManager
     contact.email = params[:email] if params[:email].present?
     contact.phone_number = format_phone_number(params[:phone_number]) if params[:phone_number].present?
     update_contact_attributes(params, contact)
-    contact.save
+    contact.save # rubocop:disable Rails/SaveBang
   end
 
   private
diff --git a/app/services/instagram/webhooks_base_service.rb b/app/services/instagram/webhooks_base_service.rb
index 419270d70..75dcb92d8 100644
--- a/app/services/instagram/webhooks_base_service.rb
+++ b/app/services/instagram/webhooks_base_service.rb
@@ -27,6 +27,6 @@ class Instagram::WebhooksBaseService
     # 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
+    @contact.save!
   end
 end
diff --git a/app/services/twilio/webhook_setup_service.rb b/app/services/twilio/webhook_setup_service.rb
index b949bf37c..5a666f3ed 100644
--- a/app/services/twilio/webhook_setup_service.rb
+++ b/app/services/twilio/webhook_setup_service.rb
@@ -29,7 +29,7 @@ class Twilio::WebhookSetupService
     else
       twilio_client
         .incoming_phone_numbers(phonenumber_sid)
-        .update(sms_method: 'POST', sms_url: twilio_callback_index_url)
+        .update(sms_method: 'POST', sms_url: twilio_callback_index_url) # rubocop:disable Rails/SaveBang
     end
   end
 
diff --git a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
index 61cdeebf1..17da55ced 100644
--- a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
@@ -28,7 +28,7 @@ class Whatsapp::Providers::Whatsapp360DialogService < Whatsapp::Providers::BaseS
     # ensuring that channels with wrong provider config wouldn't keep trying to sync templates
     whatsapp_channel.mark_message_templates_updated
     response = HTTParty.get("#{api_base_path}/configs/templates", headers: api_headers)
-    whatsapp_channel.update(message_templates: response['waba_templates'], message_templates_last_updated: Time.now.utc) if response.success?
+    whatsapp_channel.update!(message_templates: response['waba_templates'], message_templates_last_updated: Time.now.utc) if response.success?
   end
 
   def validate_provider_config?
diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
index ec2275920..5856f1520 100644
--- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
@@ -30,7 +30,7 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
     # ensuring that channels with wrong provider config wouldn't keep trying to sync templates
     whatsapp_channel.mark_message_templates_updated
     templates = fetch_whatsapp_templates("#{business_account_path}/message_templates?access_token=#{whatsapp_channel.provider_config['api_key']}")
-    whatsapp_channel.update(message_templates: templates, message_templates_last_updated: Time.now.utc) if templates.present?
+    whatsapp_channel.update!(message_templates: templates, message_templates_last_updated: Time.now.utc) if templates.present?
   end
 
   def fetch_whatsapp_templates(url)
diff --git a/db/migrate/20230515051424_update_article_image_keys.rb b/db/migrate/20230515051424_update_article_image_keys.rb
index b80e6c86e..60bc4312d 100644
--- a/db/migrate/20230515051424_update_article_image_keys.rb
+++ b/db/migrate/20230515051424_update_article_image_keys.rb
@@ -5,7 +5,7 @@ class ArticleKeyConverter
 
   def process
     new_content = replace(@article.content)
-    @article.update(content: new_content)
+    @article.update!(content: new_content)
   end
 
   private
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb
index c7b0366dd..a22f73ddb 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb
@@ -40,7 +40,7 @@ class Api::V1::Accounts::Captain::AssistantResponsesController < Api::V1::Accoun
   end
 
   def destroy
-    @response.destroy
+    @response.destroy!
     head :no_content
   end
 
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
index e424a8a62..3bafd7420 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
@@ -19,7 +19,7 @@ class Api::V1::Accounts::Captain::AssistantsController < Api::V1::Accounts::Base
   end
 
   def destroy
-    @assistant.destroy
+    @assistant.destroy!
     head :no_content
   end
 
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
index 5d6875cbb..00408c8df 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
@@ -37,7 +37,7 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
 
     case params[:fields][:status]
     when 'approve'
-      responses.pending.update(status: 'approved')
+      responses.pending.update!(status: 'approved')
       responses
     when 'delete'
       responses.destroy_all
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/documents_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/documents_controller.rb
index 594aa0642..cfc25b2f1 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/documents_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/documents_controller.rb
@@ -28,7 +28,7 @@ class Api::V1::Accounts::Captain::DocumentsController < Api::V1::Accounts::BaseC
   end
 
   def destroy
-    @document.destroy
+    @document.destroy!
     head :no_content
   end
 
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
index 70f1d177d..3cb668688 100644
--- a/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
@@ -6,7 +6,7 @@ class Enterprise::Api::V1::AccountsController < Api::BaseController
 
   def subscription
     if stripe_customer_id.blank? && @account.custom_attributes['is_creating_customer'].blank?
-      @account.update(custom_attributes: { is_creating_customer: true })
+      @account.update!(custom_attributes: { is_creating_customer: true })
       Enterprise::CreateStripeCustomerJob.perform_later(@account)
     end
     head :no_content
diff --git a/enterprise/app/jobs/enterprise/delete_object_job.rb b/enterprise/app/jobs/enterprise/delete_object_job.rb
index d7a7f2f17..e419a1378 100644
--- a/enterprise/app/jobs/enterprise/delete_object_job.rb
+++ b/enterprise/app/jobs/enterprise/delete_object_job.rb
@@ -6,7 +6,7 @@ module Enterprise::DeleteObjectJob
   def create_audit_entry(object, user, ip)
     return unless ['Inbox'].include?(object.class.to_s) && user.present?
 
-    Enterprise::AuditLog.create(
+    Enterprise::AuditLog.create!(
       auditable: object,
       audited_changes: object.attributes,
       action: 'destroy',
diff --git a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
index ce03efa41..5b76600fc 100644
--- a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
+++ b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
@@ -18,18 +18,18 @@ module Enterprise::Account::PlanUsageAndLimits
   def increment_response_usage
     current_usage = custom_attributes[CAPTAIN_RESPONSES_USAGE].to_i || 0
     custom_attributes[CAPTAIN_RESPONSES_USAGE] = current_usage + 1
-    save
+    save!
   end
 
   def reset_response_usage
     custom_attributes[CAPTAIN_RESPONSES_USAGE] = 0
-    save
+    save!
   end
 
   def update_document_usage
     # this will ensure that the document count is always accurate
     custom_attributes[CAPTAIN_DOCUMENTS_USAGE] = captain_documents.count
-    save
+    save!
   end
 
   def subscribed_features
diff --git a/enterprise/app/models/enterprise/audit/inbox_member.rb b/enterprise/app/models/enterprise/audit/inbox_member.rb
index d5f3362b2..1a0e8e83d 100644
--- a/enterprise/app/models/enterprise/audit/inbox_member.rb
+++ b/enterprise/app/models/enterprise/audit/inbox_member.rb
@@ -19,7 +19,7 @@ module Enterprise::Audit::InboxMember
   def create_audit_log_entry(action)
     return if inbox.blank?
 
-    Enterprise::AuditLog.create(
+    Enterprise::AuditLog.create!(
       auditable_id: id,
       auditable_type: 'InboxMember',
       action: action,
diff --git a/enterprise/app/models/enterprise/audit/team_member.rb b/enterprise/app/models/enterprise/audit/team_member.rb
index 9be448b6c..c9c2b8e08 100644
--- a/enterprise/app/models/enterprise/audit/team_member.rb
+++ b/enterprise/app/models/enterprise/audit/team_member.rb
@@ -19,7 +19,7 @@ module Enterprise::Audit::TeamMember
   def create_audit_log_entry(action)
     return if team.blank?
 
-    Enterprise::AuditLog.create(
+    Enterprise::AuditLog.create!(
       auditable_id: id,
       auditable_type: 'TeamMember',
       action: action,
diff --git a/enterprise/app/models/enterprise/channelable.rb b/enterprise/app/models/enterprise/channelable.rb
index 6fcae73d8..403f21915 100644
--- a/enterprise/app/models/enterprise/channelable.rb
+++ b/enterprise/app/models/enterprise/channelable.rb
@@ -24,7 +24,7 @@ module Enterprise::Channelable
       # skip audit log creation if the only change is whatsapp channel template update
       return if messaging_template_updates?(audited_changes)
 
-      Enterprise::AuditLog.create(
+      Enterprise::AuditLog.create!(
         auditable_id: auditable_id,
         auditable_type: auditable_type,
         action: 'update',
diff --git a/enterprise/app/services/internal/account_analysis/account_updater_service.rb b/enterprise/app/services/internal/account_analysis/account_updater_service.rb
index feb54881b..e3f9271c1 100644
--- a/enterprise/app/services/internal/account_analysis/account_updater_service.rb
+++ b/enterprise/app/services/internal/account_analysis/account_updater_service.rb
@@ -19,7 +19,7 @@ class Internal::AccountAnalysis::AccountUpdaterService
   def save_error(error_message)
     @account.internal_attributes['security_flagged'] = true
     @account.internal_attributes['security_flag_reason'] = "Error: #{error_message}"
-    @account.save
+    @account.save!
   end
 
   def save_analysis_results(analysis)
diff --git a/lib/action_view/template/handlers/liquid.rb b/lib/action_view/template/handlers/liquid.rb
index 65c0b1b3e..ad281bd45 100644
--- a/lib/action_view/template/handlers/liquid.rb
+++ b/lib/action_view/template/handlers/liquid.rb
@@ -33,7 +33,7 @@ class ActionView::Template::Handlers::Liquid
 
   def drops
     droppables = @controller.send(:liquid_droppables) if @controller.respond_to?(:liquid_droppables, true)
-    droppables.update(droppables) { |_, obj| obj.try(:to_drop) || nil }
+    droppables.update(droppables) { |_, obj| obj.try(:to_drop) || nil } # rubocop:disable Rails/SaveBang
   end
 
   def filters
diff --git a/lib/config_loader.rb b/lib/config_loader.rb
index f637c4588..9062a4fd7 100644
--- a/lib/config_loader.rb
+++ b/lib/config_loader.rb
@@ -86,6 +86,6 @@ class ConfigLoader
                  # update the existing feature flag values with default values and add new feature flags with default values
                  (account_features + config.value).uniq { |h| h['name'] }
                end
-    config.update({ name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS', value: features, locked: true })
+    config.update!({ name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS', value: features, locked: true })
   end
 end
diff --git a/lib/global_config_service.rb b/lib/global_config_service.rb
index 8de1c50c9..44b08526a 100644
--- a/lib/global_config_service.rb
+++ b/lib/global_config_service.rb
@@ -9,7 +9,7 @@ class GlobalConfigService
 
     return if config_value.blank?
 
-    i = InstallationConfig.where(name: config_key).first_or_create(value: config_value, locked: false)
+    i = InstallationConfig.where(name: config_key).first_or_create!(value: config_value, locked: false)
     # To clear a nil value that might have been cached in the previous call
     GlobalConfig.clear_cache
     i.value
diff --git a/lib/integrations/slack/channel_builder.rb b/lib/integrations/slack/channel_builder.rb
index 1edacf8f7..504803852 100644
--- a/lib/integrations/slack/channel_builder.rb
+++ b/lib/integrations/slack/channel_builder.rb
@@ -9,8 +9,13 @@ class Integrations::Slack::ChannelBuilder
     channels
   end
 
-  def update(reference_id)
-    update_reference_id(reference_id)
+  def update_reference_id(reference_id)
+    channel = find_channel(reference_id)
+    return if channel.blank?
+
+    slack_client.conversations_join(channel: channel[:id]) if channel[:is_private] == false
+    @hook.update!(reference_id: channel[:id], settings: { channel_name: channel[:name] }, status: 'enabled')
+    @hook
   end
 
   private
@@ -36,13 +41,4 @@ class Integrations::Slack::ChannelBuilder
   def find_channel(reference_id)
     channels.find { |channel| channel['id'] == reference_id }
   end
-
-  def update_reference_id(reference_id)
-    channel = find_channel(reference_id)
-    return if channel.blank?
-
-    slack_client.conversations_join(channel: channel[:id]) if channel[:is_private] == false
-    @hook.update!(reference_id: channel[:id], settings: { channel_name: channel[:name] }, status: 'enabled')
-    @hook
-  end
 end
diff --git a/lib/vapid_service.rb b/lib/vapid_service.rb
index ea3498658..237e826ea 100644
--- a/lib/vapid_service.rb
+++ b/lib/vapid_service.rb
@@ -17,7 +17,7 @@ class VapidService
     public_key = ENV.fetch('VAPID_PUBLIC_KEY') { keys.public_key }
     private_key = ENV.fetch('VAPID_PRIVATE_KEY') { keys.private_key }
 
-    i = InstallationConfig.where(name: 'VAPID_KEYS').first_or_create(value: { public_key: public_key, private_key: private_key })
+    i = InstallationConfig.where(name: 'VAPID_KEYS').first_or_create!(value: { public_key: public_key, private_key: private_key })
     i.value
   end
 
diff --git a/spec/builders/notification_builder_spec.rb b/spec/builders/notification_builder_spec.rb
index 1b28f6adf..8b3cb3b2a 100644
--- a/spec/builders/notification_builder_spec.rb
+++ b/spec/builders/notification_builder_spec.rb
@@ -73,7 +73,7 @@ describe NotificationBuilder do
     end
 
     it 'will not create a notification if conversation contact is blocked and notification type is not conversation_mention' do
-      primary_actor.contact.update(blocked: true)
+      primary_actor.contact.update!(blocked: true)
 
       expect do
         described_class.new(
@@ -86,7 +86,7 @@ describe NotificationBuilder do
     end
 
     it 'will create a notification if conversation contact is blocked and notification type is conversation_mention' do
-      primary_actor.contact.update(blocked: true)
+      primary_actor.contact.update!(blocked: true)
 
       expect do
         described_class.new(
diff --git a/spec/builders/v2/report_builder_spec.rb b/spec/builders/v2/report_builder_spec.rb
index 2ad62e2d6..1424acfdb 100644
--- a/spec/builders/v2/report_builder_spec.rb
+++ b/spec/builders/v2/report_builder_spec.rb
@@ -173,7 +173,7 @@ describe V2::ReportBuilder do
           conversations = account.conversations.where('created_at < ?', 1.day.ago)
           conversations.each do |conversation|
             conversation.pending!
-            conversation.messages.outgoing.all.update(sender: nil)
+            conversation.messages.outgoing.all.update!(sender: nil)
           end
 
           perform_enqueued_jobs do
@@ -346,7 +346,7 @@ describe V2::ReportBuilder do
       end
 
       it 'returns average first response time' do
-        label_2.reporting_events.update(value: 1.5)
+        label_2.reporting_events.update!(value: 1.5)
 
         params = {
           metric: 'avg_first_response_time',
diff --git a/spec/controllers/api/v1/accounts/agents_controller_spec.rb b/spec/controllers/api/v1/accounts/agents_controller_spec.rb
index a74cbe21e..0429cbb7d 100644
--- a/spec/controllers/api/v1/accounts/agents_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/agents_controller_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe 'Agents API', type: :request do
       end
 
       it 'returns custom fields on agents if present' do
-        agent.update(custom_attributes: { test: 'test' })
+        agent.update!(custom_attributes: { test: 'test' })
 
         get "/api/v1/accounts/#{account.id}/agents",
             headers: agent.create_new_auth_token,
diff --git a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
index ec6af61be..7bccce514 100644
--- a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
@@ -119,8 +119,8 @@ RSpec.describe 'Api::V1::Accounts::BulkActionsController', type: :request do
       end
 
       it 'Bulk remove assignee id from conversations' do
-        Conversation.first.update(assignee_id: agent_1.id)
-        Conversation.second.update(assignee_id: agent_2.id)
+        Conversation.first.update!(assignee_id: agent_1.id)
+        Conversation.second.update!(assignee_id: agent_2.id)
         params = { type: 'Conversation', fields: { assignee_id: nil }, ids: Conversation.first(3).pluck(:display_id) }
 
         expect(Conversation.first.status).to eq('open')
@@ -141,8 +141,8 @@ RSpec.describe 'Api::V1::Accounts::BulkActionsController', type: :request do
       end
 
       it 'Do not bulk update status to nil' do
-        Conversation.first.update(assignee_id: agent_1.id)
-        Conversation.second.update(assignee_id: agent_2.id)
+        Conversation.first.update!(assignee_id: agent_1.id)
+        Conversation.second.update!(assignee_id: agent_2.id)
         params = { type: 'Conversation', fields: { status: nil }, ids: Conversation.first(3).pluck(:display_id) }
 
         expect(Conversation.first.status).to eq('open')
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index c9805003a..2594667f0 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -358,7 +358,7 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'searches contacts using company name' do
-        contact2.update(additional_attributes: { company_name: 'acme.inc' })
+        contact2.update!(additional_attributes: { company_name: 'acme.inc' })
         get "/api/v1/accounts/#{account.id}/contacts/search",
             params: { q: 'acme.inc' },
             headers: admin.create_new_auth_token,
@@ -658,7 +658,7 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'allows unblocking of contact' do
-        contact.update(blocked: true)
+        contact.update!(blocked: true)
         patch "/api/v1/accounts/#{account.id}/contacts/#{contact.id}",
               params: { blocked: false },
               headers: admin.create_new_auth_token,
diff --git a/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb b/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
index 760100cf3..0576b89e8 100644
--- a/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe 'Custom Filters API', type: :request do
         custom_attribute_type: ''
       }
     ] }
-    custom_filter.save
+    custom_filter.save!
   end
 
   describe 'GET /api/v1/accounts/{account.id}/custom_filters' do
diff --git a/spec/controllers/api/v1/accounts/macros_controller_spec.rb b/spec/controllers/api/v1/accounts/macros_controller_spec.rb
index 5fb8fb2b4..d3d8c09a5 100644
--- a/spec/controllers/api/v1/accounts/macros_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/macros_controller_spec.rb
@@ -318,7 +318,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
         end
 
         it 'Assign the agent when he is not inbox member' do
-          InboxMember.last.destroy
+          InboxMember.last.destroy!
 
           expect(conversation.assignee).to be_nil
 
diff --git a/spec/controllers/api/v1/accounts/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
index aeec9cab4..eb251dc0a 100644
--- a/spec/controllers/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
       end
 
       it 'returns portal articles metadata' do
-        portal.update(config: { allowed_locales: %w[en es], default_locale: 'en' })
+        portal.update!(config: { allowed_locales: %w[en es], default_locale: 'en' })
         en_cat = create(:category, locale: :en, portal_id: portal.id, slug: 'en-cat')
         es_cat = create(:category, locale: :es, portal_id: portal.id, slug: 'es-cat')
         create(:article, category_id: en_cat.id, portal_id: portal.id, author_id: agent.id)
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index bd604f650..bb173d006 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -119,7 +119,7 @@ RSpec.describe 'Accounts API', type: :request do
 
     context 'when it is an authenticated user' do
       it 'shows an account' do
-        account.update(auto_resolve_duration: 30)
+        account.update!(auto_resolve_duration: 30)
 
         get "/api/v1/accounts/#{account.id}",
             headers: admin.create_new_auth_token,
@@ -141,7 +141,7 @@ RSpec.describe 'Accounts API', type: :request do
     let(:admin) { create(:user, account: account, role: :administrator) }
 
     it 'returns cache_keys as expected' do
-      account.update(auto_resolve_duration: 30)
+      account.update!(auto_resolve_duration: 30)
 
       get "/api/v1/accounts/#{account.id}/cache_keys",
           headers: admin.create_new_auth_token,
@@ -214,7 +214,7 @@ RSpec.describe 'Accounts API', type: :request do
       end
 
       it 'updates onboarding step to invite_team if onboarding step is present in account custom attributes' do
-        account.update(custom_attributes: { onboarding_step: 'account_update' })
+        account.update!(custom_attributes: { onboarding_step: 'account_update' })
         put "/api/v1/accounts/#{account.id}",
             params: params,
             headers: admin.create_new_auth_token,
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index 6966c87ea..226550fac 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -205,7 +205,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
   describe 'POST /api/v1/widget/conversations/transcript' do
     context 'with a conversation' do
       it 'sends transcript email' do
-        contact.update(email: 'test@test.com')
+        contact.update!(email: 'test@test.com')
         mailer = double
         allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
         allow(mailer).to receive(:conversation_transcript)
@@ -217,7 +217,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
 
         expect(response).to have_http_status(:success)
         expect(mailer).to have_received(:conversation_transcript).with(conversation, 'test@test.com')
-        contact.update(email: nil)
+        contact.update!(email: nil)
       end
     end
   end
diff --git a/spec/controllers/public/api/v1/portals_controller_spec.rb b/spec/controllers/public/api/v1/portals_controller_spec.rb
index 004d013ea..9ee26f2f9 100644
--- a/spec/controllers/public/api/v1/portals_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals_controller_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Public::Api::V1::PortalsController, type: :request do
     end
 
     it 'Throws unauthorised error for unknown domain' do
-      portal.update(custom_domain: 'www.something.com')
+      portal.update!(custom_domain: 'www.something.com')
 
       get "/hc/#{portal.slug}/en"
 
diff --git a/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb
index e5a8a5b7d..8b8e0cf01 100644
--- a/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe 'Agents API', type: :request do
       params = { name: 'NewUser', email: Faker::Internet.email, role: :agent }
 
       before do
-        account.update(limits: { agents: 4 })
+        account.update!(limits: { agents: 4 })
         create_list(:user, 4, account: account, role: :agent)
       end
 
@@ -31,7 +31,7 @@ RSpec.describe 'Agents API', type: :request do
     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 })
+        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
@@ -44,7 +44,7 @@ RSpec.describe 'Agents API', type: :request do
 
     context 'when onboarding step is present in account custom attributes' do
       it 'removes onboarding step from account custom attributes' do
-        account.update(custom_attributes: { onboarding_step: 'completed' })
+        account.update!(custom_attributes: { onboarding_step: 'completed' })
 
         post "/api/v1/accounts/#{account.id}/agents/bulk_create", params: bulk_create_params, headers: admin.create_new_auth_token
 
diff --git a/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb
index 423f65711..13bf6ebc7 100644
--- a/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb
@@ -116,8 +116,8 @@ RSpec.describe 'Applied SLAs API', type: :request do
       it 'returns a CSV file with breached conversations' do
         create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, sla_status: 'missed')
         create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, sla_status: 'missed')
-        conversation1.update(status: 'open')
-        conversation2.update(status: 'resolved')
+        conversation1.update!(status: 'open')
+        conversation2.update!(status: 'resolved')
 
         get "/api/v1/accounts/#{account.id}/applied_slas/download",
             headers: administrator.create_new_auth_token
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb
index fb028b76f..d49f094af 100644
--- a/spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe 'Enterprise Conversations API', type: :request do
       end
 
       it 'throws error if conversation already has a different sla' do
-        conversation.update(sla_policy: create(:sla_policy, account: account))
+        conversation.update!(sla_policy: create(:sla_policy, account: account))
         patch "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
               params: params,
               headers: agent.create_new_auth_token,
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts/portals_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts/portals_controller_spec.rb
index cb296494c..fe66d5f84 100644
--- a/spec/enterprise/controllers/enterprise/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts/portals_controller_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe 'Enterprise Portal API', type: :request do
 
   describe 'POST /api/v1/accounts/:account_id/portals' do
     let(:portal_params) do
-      {  portal: {
+      { portal: {
         name: 'test_portal',
         slug: 'test_kbase',
         custom_domain: 'https://support.chatwoot.dev'
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
index 0bd917c06..47bc64a5e 100644
--- a/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
@@ -122,8 +122,8 @@ RSpec.describe 'Enterprise Billing APIs', type: :request do
 
     context 'when it is an authenticated user' do
       before do
-        InstallationConfig.where(name: 'DEPLOYMENT_ENV').first_or_create(value: 'cloud')
-        InstallationConfig.where(name: 'CHATWOOT_CLOUD_PLANS').first_or_create(value: [{ 'name': 'Hacker' }])
+        InstallationConfig.where(name: 'DEPLOYMENT_ENV').first_or_create!(value: 'cloud')
+        InstallationConfig.where(name: 'CHATWOOT_CLOUD_PLANS').first_or_create!(value: [{ 'name': 'Hacker' }])
       end
 
       context 'when it is an agent' do
@@ -158,8 +158,8 @@ RSpec.describe 'Enterprise Billing APIs', type: :request do
         before do
           create(:conversation, account: account)
           create(:channel_api, account: account)
-          InstallationConfig.where(name: 'DEPLOYMENT_ENV').first_or_create(value: 'cloud')
-          InstallationConfig.where(name: 'CHATWOOT_CLOUD_PLANS').first_or_create(value: [{ 'name': 'Hacker' }])
+          InstallationConfig.where(name: 'DEPLOYMENT_ENV').first_or_create!(value: 'cloud')
+          InstallationConfig.where(name: 'CHATWOOT_CLOUD_PLANS').first_or_create!(value: [{ 'name': 'Hacker' }])
         end
 
         it 'returns the limits if the plan is default' do
diff --git a/spec/enterprise/models/account_spec.rb b/spec/enterprise/models/account_spec.rb
index 4d851d50e..8186167b9 100644
--- a/spec/enterprise/models/account_spec.rb
+++ b/spec/enterprise/models/account_spec.rb
@@ -132,7 +132,7 @@ RSpec.describe Account, type: :model do
     describe 'when limits are configured for an account' do
       before do
         create(:installation_config, name: 'CAPTAIN_CLOUD_PLAN_LIMITS', value: captain_limits.to_json)
-        account.update(limits: { captain_documents: 5555, captain_responses: 9999 })
+        account.update!(limits: { captain_documents: 5555, captain_responses: 9999 })
       end
 
       it 'returns limits based on custom attributes' do
@@ -149,7 +149,7 @@ RSpec.describe Account, type: :model do
       end
 
       it 'creates audit logs when account is updated' do
-        account.update(name: 'New Name')
+        account.update!(name: 'New Name')
         expect(Audited::Audit.where(auditable_type: 'Account', action: 'update').count).to eq 1
       end
     end
@@ -159,23 +159,23 @@ RSpec.describe Account, type: :model do
     end
 
     it 'returns max limits from account when enterprise version' do
-      account.update(limits: { agents: 10 })
+      account.update!(limits: { agents: 10 })
       expect(account.usage_limits[:agents]).to eq(10)
     end
 
     it 'returns limits based on subscription' do
-      account.update(limits: { agents: 10 }, custom_attributes: { subscribed_quantity: 5 })
+      account.update!(limits: { agents: 10 }, custom_attributes: { subscribed_quantity: 5 })
       expect(account.usage_limits[:agents]).to eq(5)
     end
 
     it 'returns max limits from global config if account limit is absent' do
-      account.update(limits: { agents: '' })
+      account.update!(limits: { agents: '' })
       expect(account.usage_limits[:agents]).to eq(20)
     end
 
     it 'returns max limits from app limit if account limit and installation config is absent' do
-      account.update(limits: { agents: '' })
-      InstallationConfig.where(name: 'ACCOUNT_AGENTS_LIMIT').update(value: '')
+      account.update!(limits: { agents: '' })
+      InstallationConfig.where(name: 'ACCOUNT_AGENTS_LIMIT').update!(value: '')
 
       expect(account.usage_limits[:agents]).to eq(ChatwootApp.max_limit)
     end
diff --git a/spec/enterprise/models/automation_rule_spec.rb b/spec/enterprise/models/automation_rule_spec.rb
index e2e929d2c..7f175e225 100644
--- a/spec/enterprise/models/automation_rule_spec.rb
+++ b/spec/enterprise/models/automation_rule_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe AutomationRule do
 
     context 'when automation rule is updated' do
       it 'has associated audit log created' do
-        automation_rule.update(name: 'automation rule 2')
+        automation_rule.update!(name: 'automation rule 2')
         expect(Audited::Audit.where(auditable_type: 'AutomationRule', action: 'update').count).to eq 1
       end
     end
diff --git a/spec/enterprise/models/inbox_member_spec.rb b/spec/enterprise/models/inbox_member_spec.rb
index b4559bfc6..70165be8d 100644
--- a/spec/enterprise/models/inbox_member_spec.rb
+++ b/spec/enterprise/models/inbox_member_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe InboxMember, type: :model do
 
     context 'when inbox member is destroyed' do
       it 'has associated audit log created' do
-        inbox_member.destroy
+        inbox_member.destroy!
         audit_log = Audited::Audit.find_by(auditable: inbox_member, action: 'destroy')
         expect(audit_log).to be_present
         expect(audit_log.audited_changes['inbox_id']).to eq(inbox.id)
diff --git a/spec/enterprise/models/inbox_spec.rb b/spec/enterprise/models/inbox_spec.rb
index 3e3e060d8..1a3705d5e 100644
--- a/spec/enterprise/models/inbox_spec.rb
+++ b/spec/enterprise/models/inbox_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Inbox do
 
     it 'returns member ids with assignment capacity with inbox max_assignment_limit is configured' do
       # agent 1 has 1 conversations, agent 2 has 2 conversations, agent 3 has 3 conversations and agent 4 with none
-      inbox.update(auto_assignment_config: { max_assignment_limit: 2 })
+      inbox.update!(auto_assignment_config: { max_assignment_limit: 2 })
       expect(inbox.member_ids_with_assignment_capacity).to contain_exactly(inbox_member_1.user_id, inbox_member_4.user_id)
     end
 
@@ -46,7 +46,7 @@ RSpec.describe Inbox do
 
     context 'when inbox is updated' do
       it 'has associated audit log created' do
-        inbox.update(name: 'Updated Inbox')
+        inbox.update!(name: 'Updated Inbox')
         expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'update').count).to eq(1)
       end
     end
@@ -55,7 +55,7 @@ RSpec.describe Inbox do
       it 'has associated audit log created' do
         previous_color = inbox.channel.widget_color
         new_color = '#ff0000'
-        inbox.channel.update(widget_color: new_color)
+        inbox.channel.update!(widget_color: new_color)
 
         # check if channel update creates an audit log against inbox
         expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'update').count).to eq(1)
@@ -78,7 +78,7 @@ RSpec.describe Inbox do
 
     context 'when inbox is updated' do
       it 'has associated audit log created' do
-        inbox.update(name: 'Updated Inbox')
+        inbox.update!(name: 'Updated Inbox')
         expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'update').count).to eq(1)
       end
     end
@@ -87,7 +87,7 @@ RSpec.describe Inbox do
       it 'has associated audit log created' do
         previous_webhook = inbox.channel.webhook_url
         new_webhook = 'https://example2.com'
-        inbox.channel.update(webhook_url: new_webhook)
+        inbox.channel.update!(webhook_url: new_webhook)
 
         # check if channel update creates an audit log against inbox
         expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'update').count).to eq(1)
@@ -122,7 +122,7 @@ RSpec.describe Inbox do
 
     context 'when inbox is updated' do
       it 'has associated audit log created' do
-        inbox.update(name: 'Updated Inbox')
+        inbox.update!(name: 'Updated Inbox')
         expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'update').count).to eq(1)
       end
     end
@@ -131,7 +131,7 @@ RSpec.describe Inbox do
       it 'has associated audit log created' do
         previous_phone_number = inbox.channel.phone_number
         new_phone_number = '1234567890'
-        inbox.channel.update(phone_number: new_phone_number)
+        inbox.channel.update!(phone_number: new_phone_number)
 
         # check if channel update creates an audit log against inbox
         expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'update').count).to eq(1)
diff --git a/spec/enterprise/models/macro_spec.rb b/spec/enterprise/models/macro_spec.rb
index ff3368438..c06313893 100644
--- a/spec/enterprise/models/macro_spec.rb
+++ b/spec/enterprise/models/macro_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Macro do
 
     context 'when macro is updated' do
       it 'has associated audit log created' do
-        macro.update(name: 'awesome macro')
+        macro.update!(name: 'awesome macro')
         expect(Audited::Audit.where(auditable_type: 'Macro', action: 'update').count).to eq 1
       end
     end
diff --git a/spec/enterprise/models/team_member_spec.rb b/spec/enterprise/models/team_member_spec.rb
index 9ce2bd90f..3ad9be42b 100644
--- a/spec/enterprise/models/team_member_spec.rb
+++ b/spec/enterprise/models/team_member_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe TeamMember, type: :model do
 
     context 'when team member is destroyed' do
       it 'has associated audit log created' do
-        team_member.destroy
+        team_member.destroy!
         audit_log = Audited::Audit.find_by(auditable: team_member, action: 'destroy')
         expect(audit_log).to be_present
         expect(audit_log.audited_changes['team_id']).to eq(team.id)
diff --git a/spec/enterprise/models/team_spec.rb b/spec/enterprise/models/team_spec.rb
index af8bcdc1b..407f5b033 100644
--- a/spec/enterprise/models/team_spec.rb
+++ b/spec/enterprise/models/team_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Team do
 
     context 'when team is updated' do
       it 'has associated audit log created' do
-        team.update(description: 'awesome team')
+        team.update!(description: 'awesome team')
         expect(Audited::Audit.where(auditable_type: 'Team', action: 'update').count).to eq 1
       end
     end
diff --git a/spec/enterprise/models/user_spec.rb b/spec/enterprise/models/user_spec.rb
index 21e398709..b99e0911e 100644
--- a/spec/enterprise/models/user_spec.rb
+++ b/spec/enterprise/models/user_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe User do
 
         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')
+          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
diff --git a/spec/enterprise/models/webhook_spec.rb b/spec/enterprise/models/webhook_spec.rb
index ac7d23384..242821f19 100644
--- a/spec/enterprise/models/webhook_spec.rb
+++ b/spec/enterprise/models/webhook_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Webhook do
 
     context 'when webhook is updated' do
       it 'has associated audit log created' do
-        webhook.update(url: 'https://example.com')
+        webhook.update!(url: 'https://example.com')
         expect(Audited::Audit.where(auditable_type: 'Webhook', action: 'update').count).to eq 1
       end
     end
diff --git a/spec/enterprise/services/enterprise/conversations/permission_filter_service_spec.rb b/spec/enterprise/services/enterprise/conversations/permission_filter_service_spec.rb
index b26832faf..800d85979 100644
--- a/spec/enterprise/services/enterprise/conversations/permission_filter_service_spec.rb
+++ b/spec/enterprise/services/enterprise/conversations/permission_filter_service_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         # Create custom role with conversation_manage permission
         test_custom_role = create(:custom_role, account: test_account, permissions: ['conversation_manage'])
         account_user = AccountUser.find_by(user: test_agent, account: test_account)
-        account_user.update(role: :agent, custom_role: test_custom_role)
+        account_user.update!(role: :agent, custom_role: test_custom_role)
 
         # Create some conversations
         assigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: test_agent)
@@ -96,7 +96,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         test_custom_role = create(:custom_role, account: test_account, permissions: %w[conversation_participating_manage])
 
         account_user = AccountUser.find_by(user: test_agent, account: test_account)
-        account_user.update(role: :agent, custom_role: test_custom_role)
+        account_user.update!(role: :agent, custom_role: test_custom_role)
 
         # Create some conversations
         other_conversation = create(:conversation, account: test_account, inbox: test_inbox)
@@ -131,7 +131,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         test_custom_role = create(:custom_role, account: test_account, permissions: %w[conversation_unassigned_manage])
 
         account_user = AccountUser.find_by(user: test_agent, account: test_account)
-        account_user.update(role: :agent, custom_role: test_custom_role)
+        account_user.update!(role: :agent, custom_role: test_custom_role)
 
         # Create some conversations
         assigned_conversation = create(:conversation, account: test_account, inbox: test_inbox, assignee: test_agent)
@@ -170,7 +170,7 @@ RSpec.describe Enterprise::Conversations::PermissionFilterService do
         test_custom_role = create(:custom_role, account: test_account, permissions: permissions)
 
         account_user = AccountUser.find_by(user: test_agent, account: test_account)
-        account_user.update(role: :agent, custom_role: test_custom_role)
+        account_user.update!(role: :agent, custom_role: test_custom_role)
 
         # Create some conversations
         assigned_to_agent = create(:conversation, account: test_account, inbox: test_inbox, assignee: test_agent)
diff --git a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
index 71afd2125..cf8a79cc4 100644
--- a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
+++ b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
@@ -42,8 +42,8 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
 
     context 'when next response SLA is missed' do
       before do
-        applied_sla.sla_policy.update(next_response_time_threshold: 1.hour)
-        conversation.update(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
+        applied_sla.sla_policy.update!(next_response_time_threshold: 1.hour)
+        conversation.update!(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
       end
 
       it 'updates the SLA status to missed and logs a warning' do
@@ -89,7 +89,7 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
     context 'when resolved conversation with resolution time SLA is missed' do
       before do
         conversation.resolved!
-        applied_sla.sla_policy.update(resolution_time_threshold: 1.hour)
+        applied_sla.sla_policy.update!(resolution_time_threshold: 1.hour)
       end
 
       it 'does not update the SLA status to missed' do
@@ -100,8 +100,8 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
 
     context 'when multiple SLAs are missed' do
       before do
-        applied_sla.sla_policy.update(first_response_time_threshold: 1.hour, next_response_time_threshold: 1.hour, resolution_time_threshold: 1.hour)
-        conversation.update(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
+        applied_sla.sla_policy.update!(first_response_time_threshold: 1.hour, next_response_time_threshold: 1.hour, resolution_time_threshold: 1.hour)
+        conversation.update!(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
       end
 
       it 'updates the SLA status to missed and logs multiple warnings' do
@@ -119,8 +119,8 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
   describe '#perform - SLA hits' do
     context 'when first response SLA is hit' do
       before do
-        applied_sla.sla_policy.update(first_response_time_threshold: 6.hours)
-        conversation.update(first_reply_created_at: 30.minutes.ago)
+        applied_sla.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
@@ -142,8 +142,8 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
 
     context 'when next response SLA is hit' do
       before do
-        applied_sla.sla_policy.update(next_response_time_threshold: 6.hours)
-        conversation.update(first_reply_created_at: 30.minutes.ago, waiting_since: nil)
+        applied_sla.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
@@ -164,7 +164,7 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
 
     context 'when resolution time SLA is hit' do
       before do
-        applied_sla.sla_policy.update(resolution_time_threshold: 8.hours)
+        applied_sla.sla_policy.update!(resolution_time_threshold: 8.hours)
         conversation.resolved!
       end
 
@@ -182,7 +182,7 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
   describe 'SLA evaluation with frt hit, multiple nrt misses and rt miss' do
     before do
       # Setup SLA Policy thresholds
-      applied_sla.sla_policy.update(
+      applied_sla.sla_policy.update!(
         first_response_time_threshold: 2.hours, # Hit frt
         next_response_time_threshold: 1.hour, # Miss nrt multiple times
         resolution_time_threshold: 4.hours # Miss rt
@@ -204,7 +204,7 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
       described_class.new(applied_sla: applied_sla).perform
 
       # Conversation is resolved missing rt
-      conversation.update(status: 'resolved')
+      conversation.update!(status: 'resolved')
 
       # this will not create a new notification for rt miss as conversation is resolved
       # but we would have already created an rt miss notification during previous evaluation
diff --git a/spec/finders/email_channel_finder_spec.rb b/spec/finders/email_channel_finder_spec.rb
index fe57dec0b..8dc4089a3 100644
--- a/spec/finders/email_channel_finder_spec.rb
+++ b/spec/finders/email_channel_finder_spec.rb
@@ -9,7 +9,7 @@ describe EmailChannelFinder do
       let(:reply_cc_mail) { create_inbound_email_from_fixture('reply_cc.eml') }
 
       it 'return channel with cc email' do
-        channel_email.update(email: 'test@example.com')
+        channel_email.update!(email: 'test@example.com')
         channel = described_class.new(reply_cc_mail.mail).perform
         expect(channel).to eq(channel_email)
       end
@@ -19,21 +19,21 @@ describe EmailChannelFinder do
       let(:reply_mail) { create_inbound_email_from_fixture('reply.eml') }
 
       it 'return channel with to email' do
-        channel_email.update(email: 'test@example.com')
+        channel_email.update!(email: 'test@example.com')
         reply_mail.mail['to'] = 'test@example.com'
         channel = described_class.new(reply_mail.mail).perform
         expect(channel).to eq(channel_email)
       end
 
       it 'return channel with to+extension email' do
-        channel_email.update(email: 'test@example.com')
+        channel_email.update!(email: 'test@example.com')
         reply_mail.mail['to'] = 'test+123@example.com'
         channel = described_class.new(reply_mail.mail).perform
         expect(channel).to eq(channel_email)
       end
 
       it 'return channel with cc email' do
-        channel_email.update(email: 'test@example.com')
+        channel_email.update!(email: 'test@example.com')
         reply_mail.mail['to'] = nil
         reply_mail.mail['cc'] = 'test@example.com'
         channel = described_class.new(reply_mail.mail).perform
@@ -41,7 +41,7 @@ describe EmailChannelFinder do
       end
 
       it 'return channel with bcc email' do
-        channel_email.update(email: 'test@example.com')
+        channel_email.update!(email: 'test@example.com')
         reply_mail.mail['to'] = nil
         reply_mail.mail['bcc'] = 'test@example.com'
         channel = described_class.new(reply_mail.mail).perform
@@ -49,7 +49,7 @@ describe EmailChannelFinder do
       end
 
       it 'return channel with X-Original-To email' do
-        channel_email.update(email: 'test@example.com')
+        channel_email.update!(email: 'test@example.com')
         reply_mail.mail['to'] = nil
         reply_mail.mail['X-Original-To'] = 'test@example.com'
         channel = described_class.new(reply_mail.mail).perform
diff --git a/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb b/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
index 0e4ef3d45..50950726d 100644
--- a/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
+++ b/spec/jobs/account/conversations_resolution_scheduler_job_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Account::ConversationsResolutionSchedulerJob do
   end
 
   it 'enqueues Conversations::ResolutionJob' do
-    account.update(auto_resolve_duration: 10)
+    account.update!(auto_resolve_duration: 10)
     expect(Conversations::ResolutionJob).to receive(:perform_later).with(account: account).once
     described_class.perform_now
   end
diff --git a/spec/jobs/conversations/resolution_job_spec.rb b/spec/jobs/conversations/resolution_job_spec.rb
index 1a812ac86..266156c1f 100644
--- a/spec/jobs/conversations/resolution_job_spec.rb
+++ b/spec/jobs/conversations/resolution_job_spec.rb
@@ -18,15 +18,15 @@ RSpec.describe Conversations::ResolutionJob do
   end
 
   it 'resolves the issue if time of inactivity is more than the auto resolve duration' do
-    account.update(auto_resolve_duration: 10)
-    conversation.update(last_activity_at: 13.days.ago)
+    account.update!(auto_resolve_duration: 10)
+    conversation.update!(last_activity_at: 13.days.ago)
     described_class.perform_now(account: account)
     expect(conversation.reload.status).to eq('resolved')
   end
 
   it 'resolved only a limited number of conversations in a single execution' do
     stub_const('Limits::BULK_ACTIONS_LIMIT', 2)
-    account.update(auto_resolve_duration: 10)
+    account.update!(auto_resolve_duration: 10)
     create_list(:conversation, 3, account: account, last_activity_at: 13.days.ago)
     described_class.perform_now(account: account)
     expect(account.conversations.resolved.count).to eq(Limits::BULK_ACTIONS_LIMIT)
diff --git a/spec/jobs/webhooks/whatsapp_events_job_spec.rb b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
index ba8a19413..2fe314d93 100644
--- a/spec/jobs/webhooks/whatsapp_events_job_spec.rb
+++ b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
@@ -102,7 +102,7 @@ RSpec.describe Webhooks::WhatsappEventsJob do
   context 'when default provider' do
     it 'enqueue Whatsapp::IncomingMessageService' do
       stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
-      channel.update(provider: 'default')
+      channel.update!(provider: 'default')
       allow(Whatsapp::IncomingMessageService).to receive(:new).and_return(process_service)
       expect(Whatsapp::IncomingMessageService).to receive(:new)
       job.perform_now(params)
diff --git a/spec/lib/integrations/dialogflow/processor_service_spec.rb b/spec/lib/integrations/dialogflow/processor_service_spec.rb
index 2b5f36c5a..453191d3b 100644
--- a/spec/lib/integrations/dialogflow/processor_service_spec.rb
+++ b/spec/lib/integrations/dialogflow/processor_service_spec.rb
@@ -157,7 +157,7 @@ describe Integrations::Dialogflow::ProcessorService do
     let(:processor) { described_class.new(event_name: event_name, hook: hook, event_data: event_data) }
 
     before do
-      hook.update(settings: { 'project_id' => 'test', 'credentials' => 'creds' })
+      hook.update(settings: { 'project_id' => 'test', 'credentials' => 'creds' }) # rubocop:disable Rails/SaveBang
       allow(google_dialogflow).to receive(:new).and_return(session_client)
       allow(session_client).to receive(:detect_intent).and_return({ session: session, query_input: query_input })
     end
diff --git a/spec/lib/integrations/facebook/delivery_status_spec.rb b/spec/lib/integrations/facebook/delivery_status_spec.rb
index 28f1fe982..b0a212095 100644
--- a/spec/lib/integrations/facebook/delivery_status_spec.rb
+++ b/spec/lib/integrations/facebook/delivery_status_spec.rb
@@ -46,7 +46,7 @@ describe Integrations::Facebook::DeliveryStatus do
       end
 
       it 'does not update the message status if the message was created after the watermark' do
-        message1.update(created_at: 1.day.from_now)
+        message1.update!(created_at: 1.day.from_now)
         message_deliveries.delivery['watermark'] = 1.day.ago.to_i
         described_class.new(params: message_deliveries).perform
         expect(message1.reload.status).to eq('sent')
@@ -73,7 +73,7 @@ describe Integrations::Facebook::DeliveryStatus do
       end
 
       it 'does not update the message status if the message was created after the watermark' do
-        message1.update(created_at: 1.day.from_now)
+        message1.update!(created_at: 1.day.from_now)
         message_reads.read['watermark'] = 1.day.ago.to_i
         described_class.new(params: message_reads).perform
         expect(message1.reload.status).to eq('sent')
diff --git a/spec/lib/online_status_tracker_spec.rb b/spec/lib/online_status_tracker_spec.rb
index d88298485..f0916a211 100644
--- a/spec/lib/online_status_tracker_spec.rb
+++ b/spec/lib/online_status_tracker_spec.rb
@@ -18,7 +18,7 @@ describe OnlineStatusTracker do
     end
 
     it 'returns agents who have auto offline configured false' do
-      user2.account_users.first.update(auto_offline: false)
+      user2.account_users.first.update!(auto_offline: false)
       expect(described_class.get_available_users(account.id).keys).to contain_exactly(user1.id.to_s, user2.id.to_s)
     end
 
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index 55b74116c..ac590034e 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -38,7 +38,7 @@ describe ActionCableListener do
     it 'sends message to all hmac verified contact inboxes' do
       # HACK: to reload conversation inbox members
       expect(conversation.inbox.reload.inbox_members.count).to eq(1)
-      conversation.contact_inbox.update(hmac_verified: true)
+      conversation.contact_inbox.update!(hmac_verified: true)
       # creating a non verified contact inbox to ensure the events are not sent to it
       create(:contact_inbox, contact: conversation.contact, inbox: inbox)
       verified_contact_inbox = create(:contact_inbox, contact: conversation.contact, inbox: inbox, hmac_verified: true)
diff --git a/spec/listeners/automation_rule_listener_old_spec.rb b/spec/listeners/automation_rule_listener_old_spec.rb
index 5103117cd..91ab09824 100644
--- a/spec/listeners/automation_rule_listener_old_spec.rb
+++ b/spec/listeners/automation_rule_listener_old_spec.rb
@@ -331,7 +331,7 @@ describe AutomationRuleListener do
             }.with_indifferent_access
           ]
         )
-        conversation.update(status: :snoozed)
+        conversation.update!(status: :snoozed)
       end
 
       let!(:event) do
@@ -351,7 +351,7 @@ describe AutomationRuleListener do
         end
 
         it 'triggers automation rule to assign team with OR operator' do
-          conversation.update(status: :open)
+          conversation.update!(status: :open)
           automation_rule.update!(
             conditions: [
               {
@@ -380,7 +380,7 @@ describe AutomationRuleListener do
 
       context 'when rule doesnt match' do
         it 'when automation rule is triggered it will not assign team' do
-          conversation.update(status: :open)
+          conversation.update!(status: :open)
 
           expect(conversation.team_id).not_to eq(team.id)
 
@@ -391,7 +391,7 @@ describe AutomationRuleListener do
         end
 
         it 'when automation rule is triggers, it will not assign team on attribute_changed values' do
-          conversation.update(status: :snoozed)
+          conversation.update!(status: :snoozed)
           event = Events::Base.new('conversation_updated', Time.zone.now, { conversation: conversation,
                                                                             changed_attributes: { company: %w[Marvel DC] } })
 
diff --git a/spec/listeners/notification_listener_spec.rb b/spec/listeners/notification_listener_spec.rb
index 76e458b8e..9661df14f 100644
--- a/spec/listeners/notification_listener_spec.rb
+++ b/spec/listeners/notification_listener_spec.rb
@@ -126,7 +126,7 @@ describe NotificationListener do
 
     it 'will not create duplicate new message notification for the same user for mentions participation & assignment' do
       create(:inbox_member, user: first_agent, inbox: inbox)
-      conversation.update(assignee: first_agent)
+      conversation.update!(assignee: first_agent)
 
       message = build(
         :message,
@@ -144,9 +144,9 @@ describe NotificationListener do
 
     it 'will not create duplicate new message notifications for assignment & participation' do
       create(:inbox_member, user: first_agent, inbox: inbox)
-      conversation.update(assignee: first_agent)
+      conversation.update!(assignee: first_agent)
       # participants is created by async job. so creating it directly for testcase
-      conversation.conversation_participants.first_or_create(user: first_agent)
+      conversation.conversation_participants.first_or_create!(user: first_agent)
 
       message = build(
         :message,
diff --git a/spec/listeners/reporting_event_listener_spec.rb b/spec/listeners/reporting_event_listener_spec.rb
index 9a6b8d123..06bc0e921 100644
--- a/spec/listeners/reporting_event_listener_spec.rb
+++ b/spec/listeners/reporting_event_listener_spec.rb
@@ -50,7 +50,7 @@ describe ReportingEventListener do
       end
 
       it 'does not create a conversation_bot_resolved event if resolved conversation inbox does not have active bot' do
-        bot_resolved_conversation.update(inbox: inbox)
+        bot_resolved_conversation.update!(inbox: inbox)
         event = Events::Base.new('conversation.resolved', Time.zone.now, conversation: bot_resolved_conversation)
         listener.conversation_resolved(event)
         expect(account.reporting_events.where(name: 'conversation_bot_resolved').count).to be 0
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index e33f6684d..1466d28a9 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -166,7 +166,7 @@ describe WebhookListener do
       it 'triggers webhook' do
         webhook = create(:webhook, inbox: inbox, account: account)
 
-        conversation.update(custom_attributes: { test: 'testing custom attri webhook' })
+        conversation.update!(custom_attributes: { test: 'testing custom attri webhook' })
 
         expect(WebhookJob).to receive(:perform_later).with(
           webhook.url,
diff --git a/spec/mailboxes/application_mailbox_spec.rb b/spec/mailboxes/application_mailbox_spec.rb
index f4f28d811..cce26370c 100644
--- a/spec/mailboxes/application_mailbox_spec.rb
+++ b/spec/mailboxes/application_mailbox_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe ApplicationMailbox do
 
       it 'routes support emails to Support Mailbox when mail is to channel email' do
         # this email is hardcoded in the support.eml, that's why we are updating this
-        channel_email.update(email: 'care@example.com')
+        channel_email.update!(email: 'care@example.com')
         dbl = double
         expect(SupportMailbox).to receive(:new).and_return(dbl)
         expect(dbl).to receive(:perform_processing).and_return(true)
@@ -52,7 +52,7 @@ RSpec.describe ApplicationMailbox do
 
       it 'routes support emails to Support Mailbox when mail is to channel forward to email' do
         # this email is hardcoded in the support.eml, that's why we are updating this
-        channel_email.update(forward_to_email: 'care@example.com')
+        channel_email.update!(forward_to_email: 'care@example.com')
         dbl = double
         expect(SupportMailbox).to receive(:new).and_return(dbl)
         expect(dbl).to receive(:perform_processing).and_return(true)
@@ -60,7 +60,7 @@ RSpec.describe ApplicationMailbox do
       end
 
       it 'routes support emails to Support Mailbox with cc email' do
-        channel_email.update(email: 'test@example.com')
+        channel_email.update!(email: 'test@example.com')
         dbl = double
         expect(SupportMailbox).to receive(:new).and_return(dbl)
         expect(dbl).to receive(:perform_processing).and_return(true)
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index b8984e2c2..c07bbe284 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -71,7 +71,7 @@ RSpec.describe ConversationReplyMailer do
 
       it 'will not send email if conversation is already viewed by contact' do
         create(:message, message_type: 'outgoing', account: account, conversation: conversation)
-        conversation.update(contact_last_seen_at: Time.zone.now)
+        conversation.update!(contact_last_seen_at: Time.zone.now)
         expect(mail).to be_nil
       end
 
@@ -132,7 +132,7 @@ RSpec.describe ConversationReplyMailer do
 
       it 'will not send email if conversation is already viewed by contact' do
         create(:message, message_type: 'outgoing', account: account, conversation: conversation)
-        conversation.update(contact_last_seen_at: Time.zone.now)
+        conversation.update!(contact_last_seen_at: Time.zone.now)
         expect(mail).to be_nil
       end
     end
@@ -176,20 +176,20 @@ RSpec.describe ConversationReplyMailer do
       end
 
       it 'renders sender name even when assignee is not present' do
-        conversation.update(assignee_id: nil)
+        conversation.update!(assignee_id: nil)
         mail = described_class.email_reply(message)
         expect(mail['from'].value).to eq "#{message.sender.available_name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
       end
 
       it 'renders assignee name in the from address when sender_name not available' do
-        message.update(sender_id: nil)
+        message.update!(sender_id: nil)
         mail = described_class.email_reply(message)
         expect(mail['from'].value).to eq "#{conversation.assignee.available_name} from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
       end
 
       it 'renders inbox name as sender and assignee or business_name not present' do
-        message.update(sender_id: nil)
-        conversation.update(assignee_id: nil)
+        message.update!(sender_id: nil)
+        conversation.update!(assignee_id: nil)
 
         mail = described_class.email_reply(message)
         expect(mail['from'].value).to eq "Notifications from #{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
@@ -197,14 +197,14 @@ RSpec.describe ConversationReplyMailer do
 
       context 'when friendly name enabled' do
         before do
-          conversation.inbox.update(sender_name_type: 0)
-          conversation.inbox.update(business_name: 'Business Name')
+          conversation.inbox.update!(sender_name_type: 0)
+          conversation.inbox.update!(business_name: 'Business Name')
         end
 
         it 'renders sender name as sender and assignee and business_name not present' do
-          message.update(sender_id: nil)
-          conversation.update(assignee_id: nil)
-          conversation.inbox.update(business_name: nil)
+          message.update!(sender_id: nil)
+          conversation.update!(assignee_id: nil)
+          conversation.inbox.update!(business_name: nil)
 
           mail = described_class.email_reply(message)
 
@@ -212,8 +212,8 @@ RSpec.describe ConversationReplyMailer do
         end
 
         it 'renders sender name as sender and assignee nil and business_name present' do
-          message.update(sender_id: nil)
-          conversation.update(assignee_id: nil)
+          message.update!(sender_id: nil)
+          conversation.update!(assignee_id: nil)
 
           mail = described_class.email_reply(message)
 
@@ -223,8 +223,8 @@ RSpec.describe ConversationReplyMailer do
         end
 
         it 'renders sender name as sender nil and assignee and business_name present' do
-          message.update(sender_id: nil)
-          conversation.update(assignee_id: agent.id)
+          message.update!(sender_id: nil)
+          conversation.update!(assignee_id: agent.id)
 
           mail = described_class.email_reply(message)
           expect(mail['from'].value).to eq "#{agent.available_name} from #{conversation.inbox.business_name} <#{smtp_email_channel.email}>"
@@ -232,8 +232,8 @@ RSpec.describe ConversationReplyMailer do
 
         it 'renders sender name as sender and assignee and business_name present' do
           agent_2 = create(:user, email: 'agent2@example.com', account: account)
-          message.update(sender_id: agent_2.id)
-          conversation.update(assignee_id: agent.id)
+          message.update!(sender_id: agent_2.id)
+          conversation.update!(assignee_id: agent.id)
 
           mail = described_class.email_reply(message)
           expect(mail['from'].value).to eq "#{agent_2.available_name} from #{conversation.inbox.business_name} <#{smtp_email_channel.email}>"
@@ -242,14 +242,14 @@ RSpec.describe ConversationReplyMailer do
 
       context 'when friendly name disabled' do
         before do
-          conversation.inbox.update(sender_name_type: 1)
-          conversation.inbox.update(business_name: 'Business Name')
+          conversation.inbox.update!(sender_name_type: 1)
+          conversation.inbox.update!(business_name: 'Business Name')
         end
 
         it 'renders sender name as business_name not present' do
-          message.update(sender_id: nil)
-          conversation.update(assignee_id: nil)
-          conversation.inbox.update(business_name: nil)
+          message.update!(sender_id: nil)
+          conversation.update!(assignee_id: nil)
+          conversation.inbox.update!(business_name: nil)
 
           mail = described_class.email_reply(message)
 
@@ -257,8 +257,8 @@ RSpec.describe ConversationReplyMailer do
         end
 
         it 'renders sender name as business_name present' do
-          message.update(sender_id: nil)
-          conversation.update(assignee_id: nil)
+          message.update!(sender_id: nil)
+          conversation.update!(assignee_id: nil)
 
           mail = described_class.email_reply(message)
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index e545f8e4a..54a4a144e 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -52,21 +52,21 @@ RSpec.describe Account do
     let(:account) { create(:account) }
 
     it 'returns the domain from inbox if inbox value is present' do
-      account.update(domain: 'test.com')
+      account.update!(domain: 'test.com')
       with_modified_env MAILER_INBOUND_EMAIL_DOMAIN: 'test2.com' do
         expect(account.inbound_email_domain).to eq('test.com')
       end
     end
 
     it 'returns the domain from ENV if inbox value is nil' do
-      account.update(domain: nil)
+      account.update!(domain: nil)
       with_modified_env MAILER_INBOUND_EMAIL_DOMAIN: 'test.com' do
         expect(account.inbound_email_domain).to eq('test.com')
       end
     end
 
     it 'returns the domain from ENV if inbox value is empty string' do
-      account.update(domain: '')
+      account.update!(domain: '')
       with_modified_env MAILER_INBOUND_EMAIL_DOMAIN: 'test.com' do
         expect(account.inbound_email_domain).to eq('test.com')
       end
@@ -77,21 +77,21 @@ RSpec.describe Account do
     let(:account) { create(:account) }
 
     it 'returns the support email from inbox if inbox value is present' do
-      account.update(support_email: 'support@chatwoot.com')
+      account.update!(support_email: 'support@chatwoot.com')
       with_modified_env MAILER_SENDER_EMAIL: 'hello@chatwoot.com' do
         expect(account.support_email).to eq('support@chatwoot.com')
       end
     end
 
     it 'returns the support email from ENV if inbox value is nil' do
-      account.update(support_email: nil)
+      account.update!(support_email: nil)
       with_modified_env MAILER_SENDER_EMAIL: 'hello@chatwoot.com' do
         expect(account.support_email).to eq('hello@chatwoot.com')
       end
     end
 
     it 'returns the support email from ENV if inbox value is empty string' do
-      account.update(support_email: '')
+      account.update!(support_email: '')
       with_modified_env MAILER_SENDER_EMAIL: 'hello@chatwoot.com' do
         expect(account.support_email).to eq('hello@chatwoot.com')
       end
@@ -104,7 +104,7 @@ RSpec.describe Account do
       query = "select * from information_schema.sequences where sequence_name in  ('camp_dpid_seq_#{account.id}', 'conv_dpid_seq_#{account.id}');"
       expect(ActiveRecord::Base.connection.execute(query).count).to eq(2)
       expect(account.locale).to eq('en')
-      account.destroy
+      account.destroy!
       expect(ActiveRecord::Base.connection.execute(query).count).to eq(0)
     end
   end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index efe7fe036..70c7575eb 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Category do
     it 'returns erros when locale is not allowed in the portal' do
       category = create(:category, slug: 'category_1', locale: 'en', portal_id: portal.id)
       expect(category).to be_valid
-      category.update(locale: 'es')
+      expect(category.update(locale: 'es')).to be(false)
       expect(category.errors.full_messages[0]).to eq("Locale es of category is not part of portal's [\"en\"].")
     end
   end
diff --git a/spec/models/channel/twilio_sms_spec.rb b/spec/models/channel/twilio_sms_spec.rb
index 5f26eb706..3da078708 100644
--- a/spec/models/channel/twilio_sms_spec.rb
+++ b/spec/models/channel/twilio_sms_spec.rb
@@ -65,7 +65,7 @@ RSpec.describe Channel::TwilioSms do
     end
 
     it 'sends via twilio client' do
-      expect(twilio_messages).to receive(:create).with(
+      expect(twilio_messages).to receive(:create!).with(
         messaging_service_sid: channel.messaging_service_sid,
         to: '+15555550111',
         body: 'hello world',
@@ -79,7 +79,7 @@ RSpec.describe Channel::TwilioSms do
       let(:channel) { create(:channel_twilio_sms, :with_phone_number) }
 
       it 'sends via twilio client' do
-        expect(twilio_messages).to receive(:create).with(
+        expect(twilio_messages).to receive(:create!).with(
           from: channel.phone_number,
           to: '+15555550111',
           body: 'hello world',
@@ -92,7 +92,7 @@ RSpec.describe Channel::TwilioSms do
 
     context 'with media urls' do
       it 'supplies a media url' do
-        expect(twilio_messages).to receive(:create).with(
+        expect(twilio_messages).to receive(:create!).with(
           messaging_service_sid: channel.messaging_service_sid,
           to: '+15555550111',
           body: 'hello world',
diff --git a/spec/models/concerns/assignment_handler_shared.rb b/spec/models/concerns/assignment_handler_shared.rb
index 8447b8146..80f1b6f48 100644
--- a/spec/models/concerns/assignment_handler_shared.rb
+++ b/spec/models/concerns/assignment_handler_shared.rb
@@ -34,7 +34,7 @@ shared_examples_for 'assignment_handler' do
       it 'changes assignee to nil if they doesnt belong to the team and allow_auto_assign is false' do
         expect(team.allow_auto_assign).to be false
 
-        conversation.update(team: team)
+        conversation.update!(team: team)
 
         expect(conversation.reload.assignee).to be_nil
       end
@@ -42,7 +42,7 @@ shared_examples_for 'assignment_handler' do
       it 'changes assignee to a team member if allow_auto_assign is enabled' do
         team.update!(allow_auto_assign: true)
 
-        conversation.update(team: team)
+        conversation.update!(team: team)
 
         expect(conversation.reload.assignee).to eq agent
         expect(Conversations::ActivityMessageJob).to(have_been_enqueued.at_least(:once)
@@ -55,9 +55,9 @@ shared_examples_for 'assignment_handler' do
         assignee = create(:user, account: conversation.account, role: :agent)
         create(:inbox_member, user: assignee, inbox: conversation.inbox)
         create(:team_member, team: team, user: assignee)
-        conversation.update(assignee: assignee)
+        conversation.update!(assignee: assignee)
 
-        conversation.update(team: team)
+        conversation.update!(team: team)
 
         expect(conversation.reload.assignee).to eq assignee
       end
diff --git a/spec/models/concerns/auto_assignment_handler_shared.rb b/spec/models/concerns/auto_assignment_handler_shared.rb
index 90c9c9d20..5c93c051b 100644
--- a/spec/models/concerns/auto_assignment_handler_shared.rb
+++ b/spec/models/concerns/auto_assignment_handler_shared.rb
@@ -27,7 +27,7 @@ shared_examples_for 'auto_assignment_handler' do
     end
 
     it 'will not auto assign agent if enable_auto_assignment is false' do
-      inbox.update(enable_auto_assignment: false)
+      inbox.update!(enable_auto_assignment: false)
 
       expect(conversation.reload.assignee).to be_nil
     end
diff --git a/spec/models/contact_inbox_spec.rb b/spec/models/contact_inbox_spec.rb
index 23d4b7bc7..f4b50a3db 100644
--- a/spec/models/contact_inbox_spec.rb
+++ b/spec/models/contact_inbox_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe ContactInbox do
     it 'does not get updated on object update' do
       obj = contact_inbox
       old_token = obj.pubsub_token
-      obj.update(source_id: '234234323')
+      obj.update!(source_id: '234234323')
       expect(obj.pubsub_token).to eq(old_token)
     end
 
@@ -32,7 +32,7 @@ RSpec.describe ContactInbox do
       expect(results.first['pubsub_token']).to be_nil
 
       new_token = obj.pubsub_token
-      obj.update(source_id: '234234323')
+      obj.update!(source_id: '234234323')
       # the generated token shoul be persisted in db
       expect(obj.pubsub_token).to eq(new_token)
     end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 1938fb204..77ba4c27c 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -126,7 +126,7 @@ RSpec.describe Conversation do
     end
 
     it 'sends conversation updated event if labels are updated' do
-      conversation.update(label_list: [label.title])
+      conversation.update!(label_list: [label.title])
       changed_attributes = conversation.previous_changes
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(
@@ -140,7 +140,7 @@ RSpec.describe Conversation do
     end
 
     it 'runs after_update callbacks' do
-      conversation.update(
+      conversation.update!(
         status: :resolved,
         contact_last_seen_at: Time.zone.now,
         assignee: new_assignee
@@ -169,7 +169,7 @@ RSpec.describe Conversation do
     end
 
     it 'will not run conversation_updated event for non whitelisted keys' do
-      conversation.update(updated_at: DateTime.now.utc)
+      conversation.update!(updated_at: DateTime.now.utc)
       expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
         .with(described_class::CONVERSATION_UPDATED, kind_of(Time), conversation: conversation, notifiable_assignee_change: true)
     end
@@ -191,7 +191,7 @@ RSpec.describe Conversation do
     end
 
     it 'creates conversation activities' do
-      conversation.update(
+      conversation.update!(
         status: :resolved,
         contact_last_seen_at: Time.zone.now,
         assignee: new_assignee,
@@ -213,7 +213,7 @@ RSpec.describe Conversation do
     end
 
     it 'adds a message for system auto resolution if marked resolved by system' do
-      account.update(auto_resolve_duration: 40)
+      account.update!(auto_resolve_duration: 40)
       conversation2 = create(:conversation, status: 'open', account: account, assignee: old_assignee)
       Current.user = nil
 
@@ -615,9 +615,9 @@ RSpec.describe Conversation do
 
       context 'when instagram channel' do
         it 'return true with HUMAN_AGENT if it is outside of 24 hour window' do
-          InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create(value: true)
+          InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create!(value: true)
 
-          conversation.update(additional_attributes: { type: 'instagram_direct_message' })
+          conversation.update!(additional_attributes: { type: 'instagram_direct_message' })
           create(
             :message,
             account: conversation.account,
@@ -630,9 +630,9 @@ RSpec.describe Conversation do
         end
 
         it 'return false without HUMAN_AGENT if it is outside of 24 hour window' do
-          InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create(value: false)
+          InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create!(value: false)
 
-          conversation.update(additional_attributes: { type: 'instagram_direct_message' })
+          conversation.update!(additional_attributes: { type: 'instagram_direct_message' })
           create(
             :message,
             account: conversation.account,
@@ -878,7 +878,7 @@ RSpec.describe Conversation do
     let(:conversation) { create(:conversation) }
 
     it 'returns the correct list of labels' do
-      conversation.update(label_list: %w[customer-support enterprise paid-customer])
+      conversation.update!(label_list: %w[customer-support enterprise paid-customer])
 
       expect(conversation.cached_label_list_array).to eq %w[customer-support enterprise paid-customer]
     end
diff --git a/spec/models/inbox_spec.rb b/spec/models/inbox_spec.rb
index 02d68d77a..73f40e916 100644
--- a/spec/models/inbox_spec.rb
+++ b/spec/models/inbox_spec.rb
@@ -226,7 +226,7 @@ RSpec.describe Inbox do
 
     it 'set portal id in inbox' do
       inbox.portal_id = portal.id
-      inbox.save
+      inbox.save!
 
       expect(inbox.portal).to eq(portal)
     end
@@ -234,7 +234,7 @@ RSpec.describe Inbox do
     it 'sends the inbox_created event if ENABLE_INBOX_EVENTS is true' do
       with_modified_env ENABLE_INBOX_EVENTS: 'true' do
         channel = inbox.channel
-        channel.update(widget_color: '#fff')
+        channel.update!(widget_color: '#fff')
 
         expect(Rails.configuration.dispatcher).to have_received(:dispatch)
           .with(
@@ -248,7 +248,7 @@ RSpec.describe Inbox do
 
     it 'sends the inbox_created event if ENABLE_INBOX_EVENTS is false' do
       channel = inbox.channel
-      channel.update(widget_color: '#fff')
+      channel.update!(widget_color: '#fff')
 
       expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
         .with(
@@ -261,7 +261,7 @@ RSpec.describe Inbox do
 
     it 'resets cache key if there is an update in the channel' do
       channel = inbox.channel
-      channel.update(widget_color: '#fff')
+      channel.update!(widget_color: '#fff')
 
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(
@@ -274,7 +274,7 @@ RSpec.describe Inbox do
 
     it 'updates the cache key after update' do
       expect(inbox.account).to receive(:update_cache_key).with('inbox')
-      inbox.update(name: 'New Name')
+      inbox.update!(name: 'New Name')
     end
 
     it 'updates the cache key after touch' do
diff --git a/spec/models/label_spec.rb b/spec/models/label_spec.rb
index ee5e7b108..ebe9a89f2 100644
--- a/spec/models/label_spec.rb
+++ b/spec/models/label_spec.rb
@@ -46,13 +46,13 @@ RSpec.describe Label do
     it 'calls update job' do
       expect(Labels::UpdateJob).to receive(:perform_later).with('new-title', label.title, label.account_id)
 
-      label.update(title: 'new-title')
+      label.update!(title: 'new-title')
     end
 
     it 'does not call update job if title is not updated' do
       expect(Labels::UpdateJob).not_to receive(:perform_later)
 
-      label.update(description: 'new-description')
+      label.update!(description: 'new-description')
     end
   end
 end
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 4c66e37ee..fa4aca7fd 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -237,7 +237,7 @@ RSpec.describe Message do
     end
 
     it 'sets the waiting_since if there is an incoming message' do
-      conversation.update(waiting_since: nil)
+      conversation.update!(waiting_since: nil)
       message.message_type = :incoming
       message.save!
 
diff --git a/spec/models/portal_spec.rb b/spec/models/portal_spec.rb
index 1a108bbd6..02b675ef2 100644
--- a/spec/models/portal_spec.rb
+++ b/spec/models/portal_spec.rb
@@ -27,13 +27,13 @@ RSpec.describe Portal do
       end
 
       it 'Does not allow any other config than allowed_locales' do
-        portal.update(config: { 'some_other_key': 'test_value' })
+        expect(portal.update(config: { 'some_other_key': 'test_value' })).to be(false)
         expect(portal).not_to be_valid
-        expect(portal.errors.full_messages[0]).to eq('Cofig in portal on some_other_key is not supported.')
+        expect(portal.errors.full_messages[0]).to eq('Config in portal on some_other_key is not supported.')
       end
 
       it 'converts empty string to nil' do
-        portal.update(custom_domain: '')
+        portal.update!(custom_domain: '')
         expect(portal.custom_domain).to be_nil
       end
     end
diff --git a/spec/models/working_hour_spec.rb b/spec/models/working_hour_spec.rb
index a5018a28e..b15ba71f7 100644
--- a/spec/models/working_hour_spec.rb
+++ b/spec/models/working_hour_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe WorkingHour do
 
     before do
       Time.zone = 'UTC'
-      inbox.working_hours.find_by(day_of_week: 5).update(open_all_day: true)
+      inbox.working_hours.find_by(day_of_week: 5).update!(open_all_day: true)
       travel_to '18.02.2022 11:00'.to_datetime
     end
 
@@ -74,7 +74,7 @@ RSpec.describe WorkingHour do
 
     before do
       Time.zone = 'UTC'
-      inbox.working_hours.find_by(day_of_week: 5).update(open_all_day: true)
+      inbox.working_hours.find_by(day_of_week: 5).update!(open_all_day: true)
       travel_to '18.02.2022 11:00'.to_datetime
     end
 
@@ -94,7 +94,7 @@ RSpec.describe WorkingHour do
 
     before do
       Time.zone = 'Australia/Sydney'
-      inbox.update(timezone: 'Australia/Sydney')
+      inbox.update!(timezone: 'Australia/Sydney')
       travel_to '10.10.2022 9:00 AEDT'
     end
 
diff --git a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
index b3754bd1f..99ad56ab2 100644
--- a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
+++ b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe 'Api::V1::Accounts::Integrations::Slacks' do
     context 'when it is an authenticated user' do
       it 'updates hook if the channel id is correct' do
         channel_builder = double
-        expect(channel_builder).to receive(:update).and_return(hook)
+        expect(channel_builder).to receive(:update_reference_id).and_return(hook)
         expect(Integrations::Slack::ChannelBuilder).to receive(:new).and_return(channel_builder)
 
         put "/api/v1/accounts/#{account.id}/integrations/slack",
@@ -55,7 +55,7 @@ RSpec.describe 'Api::V1::Accounts::Integrations::Slacks' do
 
       it 'does not update the hook if the channel id is not correct' do
         channel_builder = double
-        expect(channel_builder).to receive(:update)
+        expect(channel_builder).to receive(:update_reference_id)
         expect(Integrations::Slack::ChannelBuilder).to receive(:new).and_return(channel_builder)
 
         put "/api/v1/accounts/#{account.id}/integrations/slack",
diff --git a/spec/services/automation_rules/action_service_spec.rb b/spec/services/automation_rules/action_service_spec.rb
index bdfa7af0c..5d7d25a2c 100644
--- a/spec/services/automation_rules/action_service_spec.rb
+++ b/spec/services/automation_rules/action_service_spec.rb
@@ -91,7 +91,7 @@ RSpec.describe AutomationRules::ActionService do
     describe '#perform with send_email_transcript action' do
       before do
         rule.actions << { action_name: 'send_email_transcript', action_params: ['contact@example.com, agent@example.com,agent1@example.com'] }
-        rule.save
+        rule.save!
       end
 
       it 'will send email to transcript to action params emails' do
@@ -107,7 +107,7 @@ RSpec.describe AutomationRules::ActionService do
 
       it 'will send email to transcript to contacts' do
         rule.actions = [{ action_name: 'send_email_transcript', action_params: ['{{contact.email}}'] }]
-        rule.save
+        rule.save!
 
         mailer = double
         allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
diff --git a/spec/services/automation_rules/condition_validation_service_spec.rb b/spec/services/automation_rules/condition_validation_service_spec.rb
index 36387754a..2fa777ed2 100644
--- a/spec/services/automation_rules/condition_validation_service_spec.rb
+++ b/spec/services/automation_rules/condition_validation_service_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe AutomationRules::ConditionValidationService do
           { 'values': ['+918484'], 'attribute_key': 'phone_number', 'query_operator': 'OR', 'filter_operator': 'contains' },
           { 'values': ['test'], 'attribute_key': 'email', 'query_operator': nil, 'filter_operator': 'contains' }
         ]
-        rule.save
+        rule.save # rubocop:disable Rails/SaveBang
       end
 
       it 'returns true' do
@@ -25,7 +25,7 @@ RSpec.describe AutomationRules::ConditionValidationService do
         rule.conditions = [
           { 'values': ['open'], 'attribute_key': 'not-a-standard-attribute-for-sure', 'query_operator': nil, 'filter_operator': 'equal_to' }
         ]
-        rule.save
+        rule.save # rubocop:disable Rails/SaveBang
       end
 
       it 'returns false' do
@@ -38,7 +38,7 @@ RSpec.describe AutomationRules::ConditionValidationService do
         rule.conditions = [
           { 'values': ['open'], 'attribute_key': 'status', 'query_operator': nil, 'filter_operator': 'not-a-filter-operator' }
         ]
-        rule.save
+        rule.save # rubocop:disable Rails/SaveBang
       end
 
       it 'returns false' do
@@ -49,7 +49,7 @@ RSpec.describe AutomationRules::ConditionValidationService do
     context 'with wrong query operator' do
       before do
         rule.conditions = [{ 'values': ['open'], 'attribute_key': 'status', 'query_operator': 'invalid', 'filter_operator': 'attribute_changed' }]
-        rule.save
+        rule.save # rubocop:disable Rails/SaveBang
       end
 
       it 'returns false' do
@@ -62,7 +62,7 @@ RSpec.describe AutomationRules::ConditionValidationService do
         rule.conditions = [
           { 'values': ['open'], 'attribute_key': 'status', 'query_operator': nil, 'filter_operator': 'attribute_changed' }
         ]
-        rule.save
+        rule.save # rubocop:disable Rails/SaveBang
       end
 
       it 'returns true' do
@@ -87,7 +87,7 @@ RSpec.describe AutomationRules::ConditionValidationService do
             'custom_attribute_type': 'conversation_attribute'
           }
         ]
-        rule.save
+        rule.save # rubocop:disable Rails/SaveBang
       end
 
       it 'returns true' do
@@ -105,7 +105,7 @@ RSpec.describe AutomationRules::ConditionValidationService do
             'custom_attribute_type': 'conversation_attribute'
           }
         ]
-        rule.save
+        rule.save # rubocop:disable Rails/SaveBang
       end
 
       it 'returns false for missing custom attribute' do
diff --git a/spec/services/automation_rules/conditions_filter_service_spec.rb b/spec/services/automation_rules/conditions_filter_service_spec.rb
index ec9f52062..29434e3ac 100644
--- a/spec/services/automation_rules/conditions_filter_service_spec.rb
+++ b/spec/services/automation_rules/conditions_filter_service_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe AutomationRules::ConditionsFilterService do
 
   before do
     conversation = create(:conversation, account: account)
-    conversation.contact.update(phone_number: '+918484828282', email: 'test@test.com')
+    conversation.contact.update!(phone_number: '+918484828282', email: 'test@test.com')
     create(:conversation, account: account)
     create(:conversation, account: account)
   end
@@ -21,7 +21,7 @@ RSpec.describe AutomationRules::ConditionsFilterService do
     context 'when conditions based on filter_operator equal_to' do
       before do
         rule.conditions = [{ 'values': ['open'], 'attribute_key': 'status', 'query_operator': nil, 'filter_operator': 'equal_to' }]
-        rule.save
+        rule.save!
       end
 
       context 'when conditions in rule matches with object' do
@@ -32,7 +32,7 @@ RSpec.describe AutomationRules::ConditionsFilterService do
 
       context 'when conditions in rule does not match with object' do
         it 'will return false' do
-          conversation.update(status: 'resolved')
+          conversation.update!(status: 'resolved')
           expect(described_class.new(rule, conversation, { changed_attributes: { status: %w[open resolved] } }).perform).to be(false)
         end
       end
@@ -41,12 +41,12 @@ RSpec.describe AutomationRules::ConditionsFilterService do
     context 'when conditions based on filter_operator start_with' do
       before do
         contact = conversation.contact
-        contact.update(phone_number: '+918484848484')
+        contact.update!(phone_number: '+918484848484')
         rule.conditions = [
           { 'values': ['+918484'], 'attribute_key': 'phone_number', 'query_operator': 'OR', 'filter_operator': 'starts_with' },
           { 'values': ['test'], 'attribute_key': 'email', 'query_operator': nil, 'filter_operator': 'contains' }
         ]
-        rule.save
+        rule.save!
       end
 
       context 'when conditions in rule matches with object' do
@@ -57,7 +57,7 @@ RSpec.describe AutomationRules::ConditionsFilterService do
 
       context 'when conditions in rule does not match with object' do
         it 'will return false' do
-          conversation.contact.update(phone_number: '+918585858585')
+          conversation.contact.update!(phone_number: '+918585858585')
           expect(described_class.new(rule, conversation, { changed_attributes: {} }).perform).to be(false)
         end
       end
@@ -70,7 +70,7 @@ RSpec.describe AutomationRules::ConditionsFilterService do
             { 'values': ['test text'], 'attribute_key': 'content', 'query_operator': 'AND', 'filter_operator': 'equal_to' },
             { 'values': ['incoming'], 'attribute_key': 'message_type', 'query_operator': nil, 'filter_operator': 'equal_to' }
           ]
-          rule.save
+          rule.save!
         end
 
         it 'will return true when conditions matches' do
@@ -89,7 +89,7 @@ RSpec.describe AutomationRules::ConditionsFilterService do
             { 'values': ['help'], 'attribute_key': 'content', 'query_operator': 'AND', 'filter_operator': 'contains' },
             { 'values': ['incoming'], 'attribute_key': 'message_type', 'query_operator': nil, 'filter_operator': 'equal_to' }
           ]
-          rule.save
+          rule.save!
         end
 
         let(:conversation) { create(:conversation, account: account, inbox: email_inbox) }
@@ -105,7 +105,7 @@ RSpec.describe AutomationRules::ConditionsFilterService do
         end
 
         it 'will return false when processed_message_content does no match' do
-          rule.update(conditions: [{ 'values': ['text'], 'attribute_key': 'content', 'query_operator': nil, 'filter_operator': 'contains' }])
+          rule.update!(conditions: [{ 'values': ['text'], 'attribute_key': 'content', 'query_operator': nil, 'filter_operator': 'contains' }])
 
           expect(described_class.new(rule, conversation, { message: message, changed_attributes: {} }).perform).to be(false)
         end
diff --git a/spec/services/contacts/filter_service_spec.rb b/spec/services/contacts/filter_service_spec.rb
index 22882ae81..67c3d0b85 100644
--- a/spec/services/contacts/filter_service_spec.rb
+++ b/spec/services/contacts/filter_service_spec.rb
@@ -164,9 +164,9 @@ describe Contacts::FilterService do
     context 'with standard attributes - last_activity_at' do
       before do
         Time.zone = 'UTC'
-        el_contact.update(last_activity_at: (Time.zone.today - 4.days))
-        cs_contact.update(last_activity_at: (Time.zone.today - 5.days))
-        en_contact.update(last_activity_at: (Time.zone.today - 2.days))
+        el_contact.update!(last_activity_at: (Time.zone.today - 4.days))
+        cs_contact.update!(last_activity_at: (Time.zone.today - 5.days))
+        en_contact.update!(last_activity_at: (Time.zone.today - 2.days))
       end
 
       it 'filter by last_activity_at 3_days_before and custom_attributes' do
diff --git a/spec/services/contacts/sync_attributes_spec.rb b/spec/services/contacts/sync_attributes_spec.rb
index 447bcd740..4589758ec 100644
--- a/spec/services/contacts/sync_attributes_spec.rb
+++ b/spec/services/contacts/sync_attributes_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Contacts::SyncAttributes do
     context 'when contact has email or phone number' do
       it 'sets contact type to lead' do
         contact.email = 'test@test.com'
-        contact.save
+        contact.save!
         described_class.new(contact).perform
 
         expect(contact.reload.contact_type).to eq('lead')
@@ -26,7 +26,7 @@ RSpec.describe Contacts::SyncAttributes do
     context 'when contact has social details' do
       it 'sets contact type to lead' do
         contact.additional_attributes['social_facebook_user_id'] = '123456789'
-        contact.save
+        contact.save!
         described_class.new(contact).perform
 
         expect(contact.reload.contact_type).to eq('lead')
diff --git a/spec/services/google/refresh_oauth_token_service_spec.rb b/spec/services/google/refresh_oauth_token_service_spec.rb
index be36e65a9..0a4487a4b 100644
--- a/spec/services/google/refresh_oauth_token_service_spec.rb
+++ b/spec/services/google/refresh_oauth_token_service_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe Google::RefreshOauthTokenService do
   context 'when refresh token is not present in provider config and access token is expired' do
     it 'throws an error' do
       with_modified_env GOOGLE_OAUTH_CLIENT_ID: SecureRandom.uuid, GOOGLE_OAUTH_CLIENT_SECRET: SecureRandom.hex do
-        google_channel.update(
+        google_channel.update!(
           provider_config: {
             access_token: SecureRandom.hex,
             expires_on: Time.zone.now - 3600
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index 9d9d82922..845d2605e 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -6,7 +6,7 @@ describe MessageTemplates::HookExecutionService do
       contact = create(:contact, email: nil)
       conversation = create(:conversation, contact: contact)
       # ensure greeting hook is enabled
-      conversation.inbox.update(greeting_enabled: true, enable_email_collect: true)
+      conversation.inbox.update!(greeting_enabled: true, enable_email_collect: true)
 
       email_collect_service = double
 
@@ -27,7 +27,7 @@ describe MessageTemplates::HookExecutionService do
       contact = create(:contact, email: nil)
       conversation = create(:conversation, contact: contact)
       # ensure greeting hook is enabled
-      conversation.inbox.update(greeting_enabled: true, enable_email_collect: true)
+      conversation.inbox.update!(greeting_enabled: true, enable_email_collect: true)
 
       email_collect_service = double
 
@@ -47,7 +47,7 @@ describe MessageTemplates::HookExecutionService do
       twitter_channel = create(:channel_twitter_profile)
       twitter_inbox = create(:inbox, channel: twitter_channel)
       # ensure greeting hook is enabled and greeting_message is present
-      twitter_inbox.update(greeting_enabled: true, greeting_message: 'Hi, this is a greeting message')
+      twitter_inbox.update!(greeting_enabled: true, greeting_message: 'Hi, this is a greeting message')
 
       conversation = create(:conversation, inbox: twitter_inbox, additional_attributes: { type: 'tweet' })
       greeting_service = double
@@ -65,7 +65,7 @@ describe MessageTemplates::HookExecutionService do
       conversation = create(:conversation, contact: contact)
 
       # ensure greeting hook is enabled and greeting_message is present
-      conversation.inbox.update(greeting_enabled: true, enable_email_collect: true, greeting_message: 'Hi, this is a greeting message')
+      conversation.inbox.update!(greeting_enabled: true, enable_email_collect: true, greeting_message: 'Hi, this is a greeting message')
 
       email_collect_service = double
       greeting_service = double
@@ -99,9 +99,9 @@ describe MessageTemplates::HookExecutionService do
       contact = create(:contact, email: nil)
       conversation = create(:conversation, contact: contact)
 
-      conversation.inbox.update(enable_email_collect: false)
+      conversation.inbox.update!(enable_email_collect: false)
       # ensure prechat form is enabled
-      conversation.inbox.channel.update(pre_chat_form_enabled: true)
+      conversation.inbox.channel.update!(pre_chat_form_enabled: true)
       allow(MessageTemplates::Template::EmailCollect).to receive(:new).and_return(true)
 
       # described class gets called in message after commit
@@ -122,7 +122,7 @@ describe MessageTemplates::HookExecutionService do
     end
 
     it 'calls ::MessageTemplates::Template::CsatSurvey when a conversation is resolved in an inbox with survey enabled' do
-      conversation.inbox.update(csat_survey_enabled: true)
+      conversation.inbox.update!(csat_survey_enabled: true)
 
       conversation.resolved!
       Conversations::ActivityMessageJob.perform_now(conversation,
@@ -134,7 +134,7 @@ describe MessageTemplates::HookExecutionService do
     end
 
     it 'will not call ::MessageTemplates::Template::CsatSurvey when Csat is not enabled' do
-      conversation.inbox.update(csat_survey_enabled: false)
+      conversation.inbox.update!(csat_survey_enabled: false)
 
       conversation.resolved!
       Conversations::ActivityMessageJob.perform_now(conversation,
@@ -149,7 +149,7 @@ describe MessageTemplates::HookExecutionService do
       twitter_channel = create(:channel_twitter_profile)
       twitter_inbox = create(:inbox, channel: twitter_channel)
       conversation = create(:conversation, inbox: twitter_inbox, additional_attributes: { type: 'tweet' })
-      conversation.inbox.update(csat_survey_enabled: true)
+      conversation.inbox.update!(csat_survey_enabled: true)
 
       conversation.resolved!
       Conversations::ActivityMessageJob.perform_now(conversation,
@@ -161,7 +161,7 @@ describe MessageTemplates::HookExecutionService do
     end
 
     it 'will not call ::MessageTemplates::Template::CsatSurvey if another Csat was already sent' do
-      conversation.inbox.update(csat_survey_enabled: true)
+      conversation.inbox.update!(csat_survey_enabled: true)
       conversation.messages.create!(message_type: 'outgoing', content_type: :input_csat, account: conversation.account, inbox: conversation.inbox)
 
       conversation.resolved!
@@ -179,7 +179,7 @@ describe MessageTemplates::HookExecutionService do
       contact = create(:contact)
       conversation = create(:conversation, contact: contact)
 
-      conversation.inbox.update(working_hours_enabled: true, out_of_office_message: 'We are out of office')
+      conversation.inbox.update!(working_hours_enabled: true, out_of_office_message: 'We are out of office')
       conversation.inbox.working_hours.today.update!(closed_all_day: true)
 
       out_of_office_service = double
@@ -198,7 +198,7 @@ describe MessageTemplates::HookExecutionService do
       contact = create(:contact)
       conversation = create(:conversation, contact: contact)
 
-      conversation.inbox.update(working_hours_enabled: true, out_of_office_message: 'We are out of office')
+      conversation.inbox.update!(working_hours_enabled: true, out_of_office_message: 'We are out of office')
       conversation.inbox.working_hours.today.update!(closed_all_day: true)
 
       create(:message, conversation: conversation, message_type: :outgoing, created_at: 2.minutes.ago)
@@ -217,7 +217,7 @@ describe MessageTemplates::HookExecutionService do
       contact = create(:contact)
       conversation = create(:conversation, contact: contact)
 
-      conversation.inbox.update(working_hours_enabled: true, out_of_office_message: 'We are out of office')
+      conversation.inbox.update!(working_hours_enabled: true, out_of_office_message: 'We are out of office')
       conversation.inbox.working_hours.today.update!(closed_all_day: true)
 
       out_of_office_service = double
@@ -235,7 +235,7 @@ describe MessageTemplates::HookExecutionService do
     it 'will not call ::MessageTemplates::Template::OutOfOffice if its a tweet conversation' do
       twitter_channel = create(:channel_twitter_profile)
       twitter_inbox = create(:inbox, channel: twitter_channel)
-      twitter_inbox.update(working_hours_enabled: true, out_of_office_message: 'We are out of office')
+      twitter_inbox.update!(working_hours_enabled: true, out_of_office_message: 'We are out of office')
 
       conversation = create(:conversation, inbox: twitter_inbox, additional_attributes: { type: 'tweet' })
 
diff --git a/spec/services/microsoft/refresh_oauth_token_service_spec.rb b/spec/services/microsoft/refresh_oauth_token_service_spec.rb
index 346db70d8..917224794 100644
--- a/spec/services/microsoft/refresh_oauth_token_service_spec.rb
+++ b/spec/services/microsoft/refresh_oauth_token_service_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe Microsoft::RefreshOauthTokenService do
   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(
+        microsoft_channel.update!(
           provider_config: {
             access_token: SecureRandom.hex,
             expires_on: Time.zone.now - 3600
diff --git a/spec/services/sms/incoming_message_service_spec.rb b/spec/services/sms/incoming_message_service_spec.rb
index 5da56ff61..79d98c7f5 100644
--- a/spec/services/sms/incoming_message_service_spec.rb
+++ b/spec/services/sms/incoming_message_service_spec.rb
@@ -41,10 +41,10 @@ describe Sms::IncomingMessageService do
       end
 
       it 'reopen last conversation if last conversation is resolved and lock to single conversation is enabled' do
-        sms_channel.inbox.update(lock_to_single_conversation: true)
+        sms_channel.inbox.update!(lock_to_single_conversation: true)
         contact_inbox = create(:contact_inbox, inbox: sms_channel.inbox, source_id: params[:from])
         last_conversation = create(:conversation, inbox: sms_channel.inbox, contact_inbox: contact_inbox)
-        last_conversation.update(status: 'resolved')
+        last_conversation.update!(status: 'resolved')
         described_class.new(inbox: sms_channel.inbox, params: params).perform
         # no new conversation should be created
         expect(sms_channel.inbox.conversations.count).to eq(1)
@@ -53,10 +53,10 @@ describe Sms::IncomingMessageService do
       end
 
       it 'creates a new conversation if last conversation is resolved and lock to single conversation is disabled' do
-        sms_channel.inbox.update(lock_to_single_conversation: false)
+        sms_channel.inbox.update!(lock_to_single_conversation: false)
         contact_inbox = create(:contact_inbox, inbox: sms_channel.inbox, source_id: params[:from])
         last_conversation = create(:conversation, inbox: sms_channel.inbox, contact_inbox: contact_inbox)
-        last_conversation.update(status: 'resolved')
+        last_conversation.update!(status: 'resolved')
         described_class.new(inbox: sms_channel.inbox, params: params).perform
         # new conversation should be created
         expect(sms_channel.inbox.conversations.count).to eq(2)
@@ -65,10 +65,10 @@ describe Sms::IncomingMessageService do
       end
 
       it 'will not create a new conversation if last conversation is not resolved and lock to single conversation is disabled' do
-        sms_channel.inbox.update(lock_to_single_conversation: false)
+        sms_channel.inbox.update!(lock_to_single_conversation: false)
         contact_inbox = create(:contact_inbox, inbox: sms_channel.inbox, source_id: params[:from])
         last_conversation = create(:conversation, inbox: sms_channel.inbox, contact_inbox: contact_inbox)
-        last_conversation.update(status: Conversation.statuses.except('resolved').keys.sample)
+        last_conversation.update!(status: Conversation.statuses.except('resolved').keys.sample)
         described_class.new(inbox: sms_channel.inbox, params: params).perform
         # new conversation should be created
         expect(sms_channel.inbox.conversations.count).to eq(1)
diff --git a/spec/services/twilio/incoming_message_service_spec.rb b/spec/services/twilio/incoming_message_service_spec.rb
index 5f4dcec69..4cc31db1b 100644
--- a/spec/services/twilio/incoming_message_service_spec.rb
+++ b/spec/services/twilio/incoming_message_service_spec.rb
@@ -104,8 +104,8 @@ describe Twilio::IncomingMessageService do
           Body: 'testing3'
         }
 
-        twilio_channel.inbox.update(lock_to_single_conversation: true)
-        conversation.update(status: 'resolved')
+        twilio_channel.inbox.update!(lock_to_single_conversation: true)
+        conversation.update!(status: 'resolved')
         described_class.new(params: params).perform
         # message appended to the last conversation
         expect(conversation.reload.messages.last.content).to eq('testing3')
@@ -121,8 +121,8 @@ describe Twilio::IncomingMessageService do
           Body: 'testing3'
         }
 
-        twilio_channel.inbox.update(lock_to_single_conversation: false)
-        conversation.update(status: 'resolved')
+        twilio_channel.inbox.update!(lock_to_single_conversation: false)
+        conversation.update!(status: 'resolved')
         described_class.new(params: params).perform
         expect(twilio_channel.inbox.conversations.count).to eq(2)
         expect(twilio_channel.inbox.conversations.last.messages.last.content).to eq('testing3')
@@ -137,8 +137,8 @@ describe Twilio::IncomingMessageService do
           Body: 'testing3'
         }
 
-        twilio_channel.inbox.update(lock_to_single_conversation: false)
-        conversation.update(status: Conversation.statuses.except('resolved').keys.sample)
+        twilio_channel.inbox.update!(lock_to_single_conversation: false)
+        conversation.update!(status: Conversation.statuses.except('resolved').keys.sample)
         described_class.new(params: params).perform
         expect(twilio_channel.inbox.conversations.count).to eq(1)
         expect(twilio_channel.inbox.conversations.last.messages.last.content).to eq('testing3')
diff --git a/spec/services/twilio/oneoff_sms_campaign_service_spec.rb b/spec/services/twilio/oneoff_sms_campaign_service_spec.rb
index f8858f174..74c5d1a9d 100644
--- a/spec/services/twilio/oneoff_sms_campaign_service_spec.rb
+++ b/spec/services/twilio/oneoff_sms_campaign_service_spec.rb
@@ -38,19 +38,19 @@ describe Twilio::OneoffSmsCampaignService do
       contact_with_label1.update_labels([label1.title])
       contact_with_label2.update_labels([label2.title])
       contact_with_both_labels.update_labels([label1.title, label2.title])
-      expect(twilio_messages).to receive(:create).with(
+      expect(twilio_messages).to receive(:create!).with(
         body: campaign.message,
         messaging_service_sid: twilio_sms.messaging_service_sid,
         to: contact_with_label1.phone_number,
         status_callback: 'http://localhost:3000/twilio/delivery_status'
       ).once
-      expect(twilio_messages).to receive(:create).with(
+      expect(twilio_messages).to receive(:create!).with(
         body: campaign.message,
         messaging_service_sid: twilio_sms.messaging_service_sid,
         to: contact_with_label2.phone_number,
         status_callback: 'http://localhost:3000/twilio/delivery_status'
       ).once
-      expect(twilio_messages).to receive(:create).with(
+      expect(twilio_messages).to receive(:create!).with(
         body: campaign.message,
         messaging_service_sid: twilio_sms.messaging_service_sid,
         to: contact_with_both_labels.phone_number,
diff --git a/spec/services/twilio/send_on_twilio_service_spec.rb b/spec/services/twilio/send_on_twilio_service_spec.rb
index beae54b57..bbb26c582 100644
--- a/spec/services/twilio/send_on_twilio_service_spec.rb
+++ b/spec/services/twilio/send_on_twilio_service_spec.rb
@@ -53,7 +53,7 @@ describe Twilio::SendOnTwilioService do
 
     context 'with reply' do
       it 'if message is sent from chatwoot and is outgoing' do
-        allow(messages_double).to receive(:create).and_return(message_record_double)
+        allow(messages_double).to receive(:create!).and_return(message_record_double)
         allow(message_record_double).to receive(:sid).and_return('1234')
 
         outgoing_message = create(
@@ -67,7 +67,7 @@ describe Twilio::SendOnTwilioService do
 
     it 'if outgoing message has attachment and is for whatsapp' do
       # check for message attachment url
-      allow(messages_double).to receive(:create).with(hash_including(media_url: [anything])).and_return(message_record_double)
+      allow(messages_double).to receive(:create!).with(hash_including(media_url: [anything])).and_return(message_record_double)
       allow(message_record_double).to receive(:sid).and_return('1234')
 
       message = build(
@@ -78,12 +78,12 @@ describe Twilio::SendOnTwilioService do
       message.save!
 
       described_class.new(message: message).perform
-      expect(messages_double).to have_received(:create).with(hash_including(media_url: [anything]))
+      expect(messages_double).to have_received(:create!)
     end
 
     it 'if outgoing message has attachment and is for sms' do
       # check for message attachment url
-      allow(messages_double).to receive(:create).with(hash_including(media_url: [anything])).and_return(message_record_double)
+      allow(messages_double).to receive(:create!).with(hash_including(media_url: [anything])).and_return(message_record_double)
       allow(message_record_double).to receive(:sid).and_return('1234')
 
       message = build(
@@ -94,11 +94,11 @@ describe Twilio::SendOnTwilioService do
       message.save!
 
       described_class.new(message: message).perform
-      expect(messages_double).to have_received(:create).with(hash_including(media_url: [anything]))
+      expect(messages_double).to have_received(:create!)
     end
 
     it 'if message is sent from chatwoot fails' do
-      allow(messages_double).to receive(:create).and_raise(Twilio::REST::TwilioError)
+      allow(messages_double).to receive(:create!).and_raise(Twilio::REST::TwilioError)
 
       outgoing_message = create(
         :message, message_type: 'outgoing', inbox: twilio_inbox, account: account, conversation: conversation
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index 0bcbf2a3e..e08b4b2dd 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -36,10 +36,10 @@ describe Whatsapp::IncomingMessageService do
       end
 
       it 'reopen last conversation if last conversation is resolved and lock to single conversation is enabled' do
-        whatsapp_channel.inbox.update(lock_to_single_conversation: true)
+        whatsapp_channel.inbox.update!(lock_to_single_conversation: true)
         contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: params[:messages].first[:from])
         last_conversation = create(:conversation, inbox: whatsapp_channel.inbox, contact_inbox: contact_inbox)
-        last_conversation.update(status: 'resolved')
+        last_conversation.update!(status: 'resolved')
         described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
         # no new conversation should be created
         expect(whatsapp_channel.inbox.conversations.count).to eq(1)
@@ -49,10 +49,10 @@ describe Whatsapp::IncomingMessageService do
       end
 
       it 'creates a new conversation if last conversation is resolved and lock to single conversation is disabled' do
-        whatsapp_channel.inbox.update(lock_to_single_conversation: false)
+        whatsapp_channel.inbox.update!(lock_to_single_conversation: false)
         contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: params[:messages].first[:from])
         last_conversation = create(:conversation, inbox: whatsapp_channel.inbox, contact_inbox: contact_inbox)
-        last_conversation.update(status: 'resolved')
+        last_conversation.update!(status: 'resolved')
         described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
         # new conversation should be created
         expect(whatsapp_channel.inbox.conversations.count).to eq(2)
@@ -60,10 +60,10 @@ describe Whatsapp::IncomingMessageService do
       end
 
       it 'will not create a new conversation if last conversation is not resolved and lock to single conversation is disabled' do
-        whatsapp_channel.inbox.update(lock_to_single_conversation: false)
+        whatsapp_channel.inbox.update!(lock_to_single_conversation: false)
         contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: params[:messages].first[:from])
         last_conversation = create(:conversation, inbox: whatsapp_channel.inbox, contact_inbox: contact_inbox)
-        last_conversation.update(status: Conversation.statuses.except('resolved').keys.sample)
+        last_conversation.update!(status: Conversation.statuses.except('resolved').keys.sample)
         described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
         # new conversation should be created
         expect(whatsapp_channel.inbox.conversations.count).to eq(1)

From 22c8ea8265720e798ccea908dbac23ae75890087 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Sun, 6 Apr 2025 13:12:42 -0300
Subject: [PATCH 25/46] refactor: replace woot-button with NextButton in
 various components for consistency (#22)

---
 .../components/widgets/forms/Input.vue        |  1 +
 .../dashboard/settings/inbox/FinishSetup.vue  |  4 +--
 .../inbox/channels/BaileysWhatsapp.vue        | 23 +++++++++-------
 .../WhatsappBaileysLinkDeviceModal.vue        | 26 ++++++++-----------
 .../inbox/settingsPage/ConfigurationPage.vue  | 15 ++++++-----
 5 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/forms/Input.vue b/app/javascript/dashboard/components/widgets/forms/Input.vue
index b6ee69ec8..477aec3dd 100644
--- a/app/javascript/dashboard/components/widgets/forms/Input.vue
+++ b/app/javascript/dashboard/components/widgets/forms/Input.vue
@@ -63,6 +63,7 @@ export default {
   <label class="input-container">
     <span v-if="label">{{ label }}</span>
     <input
+      class="!mb-0"
       :value="modelValue"
       :type="type"
       :placeholder="placeholder"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
index 903ec4669..ce2406142 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
@@ -138,9 +138,9 @@ export default {
           />
         </div>
         <div v-if="isWhatsAppBaileysInbox" class="w-[50%] max-w-[50%] ml-[25%]">
-          <woot-button @click="onOpenBaileysLinkDeviceModal">
+          <NextButton @click="onOpenBaileysLinkDeviceModal">
             {{ $t('INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_BUTTON') }}
-          </woot-button>
+          </NextButton>
         </div>
         <div class="w-[50%] max-w-[50%] ml-[25%]">
           <woot-code
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
index dbfa2d739..72680cb1d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BaileysWhatsapp.vue
@@ -7,7 +7,12 @@ import router from '../../../../index';
 import { isPhoneE164OrEmpty } from 'shared/helpers/Validators';
 import { isValidURL } from '../../../../../helper/URLHelper';
 
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
 export default {
+  components: {
+    NextButton,
+  },
   setup() {
     return { v$: useVuelidate() };
   },
@@ -117,14 +122,9 @@ export default {
       v-if="!showAdvancedOptions"
       class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%] mb-4"
     >
-      <woot-button
-        icon="add"
-        size="small"
-        variant="link"
-        @click="setShowAdvancedOptions"
-      >
+      <NextButton icon="i-lucide-plus" sm link @click="setShowAdvancedOptions">
         {{ $t('INBOX_MGMT.ADD.WHATSAPP.ADVANCED_OPTIONS') }}
-      </woot-button>
+      </NextButton>
     </div>
     <template v-else>
       <div class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%]">
@@ -162,9 +162,12 @@ export default {
     </template>
 
     <div class="w-full">
-      <woot-submit-button
-        :loading="uiFlags.isCreating"
-        :button-text="$t('INBOX_MGMT.ADD.WHATSAPP.SUBMIT_BUTTON')"
+      <NextButton
+        :is-loading="uiFlags.isCreating"
+        type="submit"
+        solid
+        blue
+        :label="$t('INBOX_MGMT.ADD.WHATSAPP.SUBMIT_BUTTON')"
       />
     </div>
   </form>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue
index bf12a8982..29bab95e8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WhatsappBaileysLinkDeviceModal.vue
@@ -4,6 +4,7 @@ import { useStore } from 'vuex';
 import { useAlert } from 'dashboard/composables';
 import InboxName from 'dashboard/components/widgets/InboxName.vue';
 import Spinner from 'shared/components/Spinner.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
 
 const props = defineProps({
   show: { type: Boolean, required: true },
@@ -83,17 +84,13 @@ watchEffect(() => {
             <p v-if="error" class="text-red-500 text-center">
               {{ error }}
             </p>
-            <woot-button
-              class="button clear w-fit"
-              :is-loading="loading"
-              @click="setup"
-            >
+            <Button :is-loading="loading" @click="setup">
               {{
                 $t(
                   'INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.LINK_DEVICE'
                 )
               }}
-            </woot-button>
+            </Button>
           </template>
 
           <template v-else-if="connection === 'connecting'">
@@ -134,27 +131,26 @@ watchEffect(() => {
                 )
               }}
             </p>
-            <div class="flex gap-4">
-              <woot-button
-                class="button clear w-fit"
-                :is-loading="loading"
-                @click="disconnect"
-              >
+            <div class="flex gap-2">
+              <Button ghost :is-loading="loading" @click="disconnect">
                 {{
                   $t(
                     'INBOX_MGMT.ADD.WHATSAPP.BAILEYS.LINK_DEVICE_MODAL.DISCONNECT'
                   )
                 }}
-              </woot-button>
+              </Button>
               <router-link
                 v-if="isSetup"
-                class="rounded button success"
                 :to="{
                   name: 'inbox_dashboard',
                   params: { inboxId: inbox.id },
                 }"
               >
-                {{ $t('INBOX_MGMT.FINISH.BUTTON_TEXT') }}
+                <Button
+                  solid
+                  teal
+                  :label="$t('INBOX_MGMT.FINISH.BUTTON_TEXT')"
+                />
               </router-link>
             </div>
           </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index 792a15299..805b8e458 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -301,13 +301,13 @@ export default {
             with-phone-number
             with-provider-connection-status
           />
-          <woot-button class="w-fit" @click="onOpenBaileysLinkDeviceModal">
+          <NextButton class="w-fit" @click="onOpenBaileysLinkDeviceModal">
             {{
               $t(
                 'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_BUTTON'
               )
             }}
-          </woot-button>
+          </NextButton>
         </div>
       </SettingsSection>
       <SettingsSection
@@ -322,13 +322,13 @@ export default {
           <woot-input
             v-model="whatsAppProviderUrl"
             type="text"
-            class="flex-1 mr-2"
+            class="flex-1 mr-2 items-center"
             :placeholder="
               $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_PLACEHOLDER')
             "
             @keydown="v$.whatsAppProviderUrl.$touch"
           />
-          <woot-button
+          <NextButton
             :disabled="
               v$.whatsAppProviderUrl.$invalid ||
               whatsAppProviderUrl === inbox.provider_config.provider_url
@@ -336,7 +336,7 @@ export default {
             @click="updateWhatsAppProviderUrl"
           >
             {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-          </woot-button>
+          </NextButton>
         </div>
         <span v-if="v$.whatsAppProviderUrl.$error" class="text-red-400">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_ERROR') }}
@@ -371,15 +371,16 @@ export default {
               )
             "
           />
-          <woot-button
+          <NextButton
             :disabled="
               v$.whatsAppInboxAPIKey.$invalid ||
+              (!inbox.provider_config.api_key && !whatsAppInboxAPIKey) ||
               whatsAppInboxAPIKey === inbox.provider_config.api_key
             "
             @click="updateWhatsAppInboxAPIKey"
           >
             {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-          </woot-button>
+          </NextButton>
         </div>
       </SettingsSection>
     </div>

From 25670564eb2999cefebd4f870298183adb870c27 Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayoproliveira@gmail.com>
Date: Wed, 9 Apr 2025 19:14:38 -0300
Subject: [PATCH 26/46] feat: add message update processing in
 IncomingMessageBaileysService (#20)

* feat: add message update processing in IncomingMessageBaileysService

* feat: implement message update handling in IncomingMessageBaileysService

* feat: add MessageNotFoundError for handling invalid update messages in IncomingMessageBaileysService

* chore: specs for message.update events and bug fixes

* chore: refactor message update handling in IncomingMessageBaileysService

* chore: nit remove redundant comment

* chore: enhance logging for unsupported message update statuses in IncomingMessageBaileysService and disabled metrics

* chore: message status update logic with transition checks

* chore: update status mapping for PENDING to sent in status_mapper

* chore: update status_mapper comments and fix case statement for status codes

* fix: logging for unsupported message updates in update_message_content method

* test: add specs for unsupported status transitions in messages.update event

* refactor: ensure message status is reloaded before assertion in messages.update event spec

* refactor: status variable in status_mapper method

* refactor: rename status_transition_allowed method to status_transition_allowed?

* refactor: streamline message creation in specs by using let! for setup

* feat: process webhook whatsapp await response (#21)

* feat: enhance WhatsApp webhook processing and error responses handling

* chore: correct spelling of 'WhatsApp' in webhook controller specs

* refactor: rename webhook processing method and improve error handling

* chore: update error handling in WhatsApp controller specs for specific exceptions

* refactor: remove handling for StandardError in WhatsApp controller specs

* refactor: simplify perform_whatsapp_events_job method

* chore: update response status from not_found to bad_request for invalid message

* refactor: update expectations for job processing in WhatsApp controller specs
---
 .../webhooks/whatsapp_controller.rb           |  17 ++-
 .../incoming_message_baileys_service.rb       |  74 +++++++++++-
 .../webhooks/whatsapp_controller_spec.rb      |  43 ++++++-
 .../incoming_message_baileys_service_spec.rb  | 113 ++++++++++++++++++
 4 files changed, 239 insertions(+), 8 deletions(-)

diff --git a/app/controllers/webhooks/whatsapp_controller.rb b/app/controllers/webhooks/whatsapp_controller.rb
index c4c376e5c..78a5a3bef 100644
--- a/app/controllers/webhooks/whatsapp_controller.rb
+++ b/app/controllers/webhooks/whatsapp_controller.rb
@@ -8,11 +8,26 @@ class Webhooks::WhatsappController < ActionController::API
       return
     end
 
+    perform_whatsapp_events_job
+  end
+
+  private
+
+  def perform_whatsapp_events_job
+    perform_sync if params[:awaitResponse].present?
+    return if performed?
+
     Webhooks::WhatsappEventsJob.perform_later(params.to_unsafe_hash)
     head :ok
   end
 
-  private
+  def perform_sync
+    Webhooks::WhatsappEventsJob.perform_now(params.to_unsafe_hash)
+  rescue Whatsapp::IncomingMessageBaileysService::InvalidWebhookVerifyToken
+    head :unauthorized
+  rescue Whatsapp::IncomingMessageBaileysService::MessageNotFoundError
+    head :bad_request
+  end
 
   def valid_token?(token)
     channel = Channel::Whatsapp.find_by(phone_number: params[:phone_number])
diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index 34a0fc296..a842a09b5 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -1,5 +1,6 @@
-class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseService
+class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseService # rubocop:disable Metrics/ClassLength
   class InvalidWebhookVerifyToken < StandardError; end
+  class MessageNotFoundError < StandardError; end
 
   def perform
     raise InvalidWebhookVerifyToken if processed_params[:webhookVerifyToken] != inbox.channel.provider_config['webhook_verify_token']
@@ -171,4 +172,75 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: message_id)
     ::Redis::Alfred.delete(key)
   end
+
+  def process_messages_update
+    updates = processed_params[:data]
+    updates.each do |update|
+      @message = nil
+      @raw_message = update
+      handle_update
+    end
+  end
+
+  def handle_update
+    raise MessageNotFoundError unless valid_update_message?
+
+    update_status if @raw_message.dig(:update, :status).present?
+    update_message_content if @raw_message.dig(:update, :message).present?
+  end
+
+  def valid_update_message?
+    @message = find_message_by_source_id(message_id)
+    @message.present?
+  end
+
+  def update_status
+    status = status_mapper
+    @message.update!(status: status) if status.present? && status_transition_allowed?(status)
+  end
+
+  def status_mapper
+    # NOTE: Baileys status codes vs. Chatwoot support:
+    #  - (0) ERROR         → (3) failed
+    #  - (1) PENDING       → (0) sent
+    #  - (2) SERVER_ACK    → (0) sent
+    #  - (3) DELIVERY_ACK  → (1) delivered
+    #  - (4) READ          → (2) read
+    #  - (5) PLAYED        → (unsupported: PLAYED)
+    # For details: https://github.com/WhiskeySockets/Baileys/blob/v6.7.16/WAProto/index.d.ts#L36694
+    status = @raw_message.dig(:update, :status)
+    case status
+    when 0
+      'failed'
+    when 1, 2
+      'sent'
+    when 3
+      'delivered'
+    when 4
+      'read'
+    when 5
+      Rails.logger.warn 'Baileys unsupported message update status: PLAYED(5)'
+    else
+      Rails.logger.warn "Baileys unsupported message update status: #{status}"
+    end
+  end
+
+  def status_transition_allowed?(new_status)
+    return false if @message.status == 'read'
+    return false if @message.status == 'delivered' && new_status == 'sent'
+
+    true
+  end
+
+  def update_message_content
+    message = @raw_message.dig(:update, :message, :editedMessage, :message)
+    if message.blank?
+      Rails.logger.warn 'No valid message content found in the update event'
+      return
+    end
+
+    content = message[:conversation] || message.dig(:extendedTextMessage, :text)
+
+    @message.update!(content: content) if content.present?
+  end
 end
diff --git a/spec/controllers/webhooks/whatsapp_controller_spec.rb b/spec/controllers/webhooks/whatsapp_controller_spec.rb
index e5fa392b0..296461df4 100644
--- a/spec/controllers/webhooks/whatsapp_controller_spec.rb
+++ b/spec/controllers/webhooks/whatsapp_controller_spec.rb
@@ -23,11 +23,13 @@ RSpec.describe 'Webhooks::WhatsappController', type: :request do
   end
 
   describe 'POST /webhooks/whatsapp/{:phone_number}' do
-    it 'call the whatsapp events job with the params' do
+    it 'calls the whatsapp events job asynchronously with perform_later when awaitResponse is not present' do
       allow(Webhooks::WhatsappEventsJob).to receive(:perform_later)
-      expect(Webhooks::WhatsappEventsJob).to receive(:perform_later)
+
       post '/webhooks/whatsapp/123221321', params: { content: 'hello' }
-      expect(response).to have_http_status(:success)
+
+      expect(Webhooks::WhatsappEventsJob).to have_received(:perform_later)
+      expect(response).to have_http_status(:ok)
     end
 
     context 'when phone number is in inactive list' do
@@ -37,9 +39,10 @@ RSpec.describe 'Webhooks::WhatsappController', type: :request do
 
       it 'returns service unavailable for inactive phone number in URL params' do
         allow(Rails.logger).to receive(:warn)
-        expect(Rails.logger).to receive(:warn).with('Rejected webhook for inactive WhatsApp number: +1234567890')
 
         post '/webhooks/whatsapp/+1234567890', params: { content: 'hello' }
+
+        expect(Rails.logger).to have_received(:warn).with('Rejected webhook for inactive WhatsApp number: +1234567890')
         expect(response).to have_http_status(:unprocessable_entity)
         expect(response.parsed_body['error']).to eq('Inactive WhatsApp number')
       end
@@ -52,10 +55,38 @@ RSpec.describe 'Webhooks::WhatsappController', type: :request do
 
       it 'processes the webhook normally' do
         allow(Webhooks::WhatsappEventsJob).to receive(:perform_later)
-        expect(Webhooks::WhatsappEventsJob).to receive(:perform_later)
 
         post '/webhooks/whatsapp/+1234567890', params: { content: 'hello' }
-        expect(response).to have_http_status(:success)
+
+        expect(Webhooks::WhatsappEventsJob).to have_received(:perform_later)
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context 'when awaitResponse param is present' do
+      it 'calls the whatsapp events job synchronously' do
+        allow(Webhooks::WhatsappEventsJob).to receive(:perform_now)
+
+        post '/webhooks/whatsapp/123221321', params: { content: 'hello', awaitResponse: true }
+
+        expect(Webhooks::WhatsappEventsJob).to have_received(:perform_now)
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'returns 401 when InvalidWebhookVerifyToken is raised' do
+        allow(Webhooks::WhatsappEventsJob).to receive(:perform_now).and_raise(Whatsapp::IncomingMessageBaileysService::InvalidWebhookVerifyToken)
+
+        post '/webhooks/whatsapp/123221321', params: { content: 'hello', awaitResponse: true }
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns 400 when MessageNotFoundError is raised' do
+        allow(Webhooks::WhatsappEventsJob).to receive(:perform_now).and_raise(Whatsapp::IncomingMessageBaileysService::MessageNotFoundError)
+
+        post '/webhooks/whatsapp/123221321', params: { content: 'hello', awaitResponse: true }
+
+        expect(response).to have_http_status(:bad_request)
       end
     end
   end
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 4bc7ab5bd..3e50371f9 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -320,6 +320,119 @@ describe Whatsapp::IncomingMessageBaileysService do
         end
       end
     end
+
+    context 'when processing messages.update event' do
+      context 'when message is not found' do
+        let(:message_id) { 'msg_123' }
+        let(:update_payload) do
+          {
+            key: { id: message_id },
+            update: {
+              status: 2
+            }
+          }
+        end
+
+        it 'raises MessageNotFoundError' do
+          params = {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.update',
+            data: [update_payload]
+          }
+
+          expect do
+            described_class.new(inbox: inbox, params: params).perform
+          end.to raise_error(Whatsapp::IncomingMessageBaileysService::MessageNotFoundError)
+        end
+      end
+
+      context 'when message is found' do
+        let(:message_id) { 'msg_123' }
+        let!(:message) { create(:message, source_id: message_id, status: 'sent') }
+
+        it 'updates the message status' do
+          update_payload = { key: { id: message_id }, update: { status: 3 } }
+          params = {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.update',
+            data: [update_payload]
+          }
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(message.reload.status).to eq('delivered')
+        end
+
+        it 'updates the message content' do
+          update_payload = {
+            key: { id: message_id },
+            update: {
+              message: { editedMessage: { message: { conversation: 'New message content' } } }
+            }
+          }
+          params = {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.update',
+            data: [update_payload]
+          }
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(message.reload.content).to eq('New message content')
+        end
+      end
+
+      context 'when the status transition is not allowed (message already read)' do
+        let(:message_id) { 'msg_123' }
+        let!(:message) { create(:message, source_id: message_id, status: 'read') }
+
+        it 'does not update the status' do
+          update_payload = { key: { id: message_id }, update: { status: 3 } }
+          params = {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.update',
+            data: [update_payload]
+          }
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(message.reload.status).to eq('read')
+        end
+      end
+
+      context 'when update unsupported status' do
+        let(:message_id) { 'msg_123' }
+        let!(:message) { create(:message, source_id: message_id) } # rubocop:disable RSpec/LetSetup
+
+        it 'logs warning for unsupported played status' do
+          update_payload = { key: { id: message_id }, update: { status: 5 } }
+          params = {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.update',
+            data: [update_payload]
+          }
+          allow(Rails.logger).to receive(:warn).with('Baileys unsupported message update status: PLAYED(5)')
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(Rails.logger).to have_received(:warn)
+        end
+
+        it 'logs warning for unsupported status' do
+          update_payload = { key: { id: message_id }, update: { status: 6 } }
+          params = {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.update',
+            data: [update_payload]
+          }
+          allow(Rails.logger).to receive(:warn).with('Baileys unsupported message update status: 6')
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(Rails.logger).to have_received(:warn)
+        end
+      end
+    end
   end
 
   def format_message_source_key(message_id)

From 17e20290173a0c1788410adbb83f318da8695f09 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Wed, 9 Apr 2025 19:15:22 -0300
Subject: [PATCH 27/46] fix: allow composing message when using baileys inbox
 (#23)

* fix: allow composing message for baileys inbox

* fix: match compose format for phone number as contact name
---
 .../NewConversation/components/ActionButtons.vue         | 3 ++-
 .../components/ComposeNewConversationForm.vue            | 9 ++++++++-
 .../whatsapp/incoming_message_baileys_service.rb         | 7 +++----
 .../whatsapp/incoming_message_baileys_service_spec.rb    | 4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
index 90cb67c4f..1623d4c04 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
@@ -15,6 +15,7 @@ import WhatsAppOptions from './WhatsAppOptions.vue';
 const props = defineProps({
   attachedFiles: { type: Array, default: () => [] },
   isWhatsappInbox: { type: Boolean, default: false },
+  isWhatsappBaileysInbox: { type: Boolean, default: false },
   isEmailOrWebWidgetInbox: { type: Boolean, default: false },
   isTwilioSmsInbox: { type: Boolean, default: false },
   messageTemplates: { type: Array, default: () => [] },
@@ -216,7 +217,7 @@ useKeyboardEvents(keyboardEvents);
         @click="emit('discard')"
       />
       <Button
-        v-if="!isWhatsappInbox"
+        v-if="!isWhatsappInbox || isWhatsappBaileysInbox"
         :label="sendButtonLabel"
         size="sm"
         class="!text-xs font-medium"
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
index 4d44b4d42..68f8f7a15 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
@@ -66,6 +66,9 @@ const inboxTypes = computed(() => ({
   isEmail: props.targetInbox?.channelType === INBOX_TYPES.EMAIL,
   isTwilio: props.targetInbox?.channelType === INBOX_TYPES.TWILIO,
   isWhatsapp: props.targetInbox?.channelType === INBOX_TYPES.WHATSAPP,
+  isWhatsappBaileys:
+    props.targetInbox?.channelType === INBOX_TYPES.WHATSAPP &&
+    props.targetInbox?.provider === 'baileys',
   isWebWidget: props.targetInbox?.channelType === INBOX_TYPES.WEB,
   isApi: props.targetInbox?.channelType === INBOX_TYPES.API,
   isEmailOrWebWidget:
@@ -311,7 +314,10 @@ const handleSendWhatsappMessage = async ({ message, templateParams }) => {
     />
 
     <MessageEditor
-      v-if="!inboxTypes.isWhatsapp && !showNoInboxAlert"
+      v-if="
+        (!inboxTypes.isWhatsapp || inboxTypes.isWhatsappBaileys) &&
+        !showNoInboxAlert
+      "
       v-model="state.message"
       :message-signature="messageSignature"
       :send-with-signature="sendWithSignature"
@@ -329,6 +335,7 @@ const handleSendWhatsappMessage = async ({ message, templateParams }) => {
     <ActionButtons
       :attached-files="state.attachedFiles"
       :is-whatsapp-inbox="inboxTypes.isWhatsapp"
+      :is-whatsapp-baileys-inbox="inboxTypes.isWhatsappBaileys"
       :is-email-or-web-widget-inbox="inboxTypes.isEmailOrWebWidget"
       :is-twilio-sms-inbox="inboxTypes.isTwilioSMS"
       :message-templates="whatsappMessageTemplates"
diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index a842a09b5..007ecb519 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -67,20 +67,19 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     # NOTE: jid shape is `<user>_<agent>:<device>@<server>`
     # https://github.com/WhiskeySockets/Baileys/blob/v6.7.16/src/WABinary/jid-utils.ts#L19
     phone_number_from_jid = @raw_message[:key][:remoteJid].split('@').first.split(':').first.split('_').first
-    phone_number_formatted = "+#{phone_number_from_jid}"
     # NOTE: We're assuming `pushName` will always be present when `fromMe: false`.
     # This assumption might be incorrect, so let's keep an eye out for contacts being created with empty name.
-    push_name = @raw_message[:key][:fromMe] ? phone_number_formatted : @raw_message[:pushName].to_s
+    push_name = @raw_message[:key][:fromMe] ? phone_number_from_jid : @raw_message[:pushName].to_s
     contact_inbox = ::ContactInboxWithContactBuilder.new(
       source_id: phone_number_from_jid,
       inbox: inbox,
-      contact_attributes: { name: push_name, phone_number: phone_number_formatted }
+      contact_attributes: { name: push_name, phone_number: "+#{phone_number_from_jid}" }
     ).perform
 
     @contact_inbox = contact_inbox
     @contact = contact_inbox.contact
 
-    @contact.update!(name: push_name) if @contact.name == phone_number_formatted && !@raw_message[:key][:fromMe]
+    @contact.update!(name: push_name) if @contact.name == phone_number_from_jid && !@raw_message[:key][:fromMe]
   end
 
   def handle_create_message
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 3e50371f9..3207cc7b3 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -246,11 +246,11 @@ describe Whatsapp::IncomingMessageBaileysService do
             expect(message).to be_present
             expect(message.content).to eq('Hello from Baileys')
             expect(message.message_type).to eq('outgoing')
-            expect(conversation.contact.name).to eq("+#{number}")
+            expect(conversation.contact.name).to eq(number)
           end
 
           it 'updates the contact name if the current name is a phone number when a incoming message is received' do
-            create(:contact, account: inbox.account, name: '+5511912345678', phone_number: '+5511912345678')
+            create(:contact, account: inbox.account, name: '5511912345678')
             described_class.new(inbox: inbox, params: params).perform
 
             conversation = inbox.conversations.last

From 4935563b6064b29c1735336d751709a136a3851c Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Wed, 9 Apr 2025 19:25:21 -0300
Subject: [PATCH 28/46] chore: apply rubocop

---
 app/builders/messages/instagram/base_message_builder.rb      | 2 +-
 app/builders/messages/instagram/message_builder.rb           | 2 +-
 app/builders/messages/instagram/messenger/message_builder.rb | 2 +-
 spec/builders/messages/instagram/message_builder_spec.rb     | 4 ++--
 spec/jobs/webhooks/instagram_events_job_spec.rb              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/builders/messages/instagram/base_message_builder.rb b/app/builders/messages/instagram/base_message_builder.rb
index b8f892d97..7767ee1b4 100644
--- a/app/builders/messages/instagram/base_message_builder.rb
+++ b/app/builders/messages/instagram/base_message_builder.rb
@@ -161,7 +161,7 @@ class Messages::Instagram::BaseMessageBuilder < Messages::Messenger::MessageBuil
   end
 
   def all_unsupported_files?
-    return if attachments.empty?
+    return false if attachments.empty?
 
     attachments_type = attachments.pluck(:type).uniq.first
     unsupported_file_type?(attachments_type)
diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index 4e7150894..e306c7b70 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -30,7 +30,7 @@ class Messages::Instagram::MessageBuilder < Messages::Instagram::BaseMessageBuil
     # https://developers.facebook.com/docs/graph-api/guides/error-handling/ search for error code 1609005
     if error_code == 1_609_005
       @message.attachments.destroy_all
-      @message.update(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
+      @message.update!(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
     end
 
     Rails.logger.error("[InstagramStoryFetchError]: #{parsed_response.dig('error', 'message')} #{error_code}")
diff --git a/app/builders/messages/instagram/messenger/message_builder.rb b/app/builders/messages/instagram/messenger/message_builder.rb
index 1263dee90..41ba59f2c 100644
--- a/app/builders/messages/instagram/messenger/message_builder.rb
+++ b/app/builders/messages/instagram/messenger/message_builder.rb
@@ -14,7 +14,7 @@ class Messages::Instagram::Messenger::MessageBuilder < Messages::Instagram::Base
   rescue Koala::Facebook::ClientError => e
     # The exception occurs when we are trying fetch the deleted story or blocked story.
     @message.attachments.destroy_all
-    @message.update(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
+    @message.update!(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
     Rails.logger.error e
     {}
   rescue StandardError => e
diff --git a/spec/builders/messages/instagram/message_builder_spec.rb b/spec/builders/messages/instagram/message_builder_spec.rb
index 0dbe87afa..4928e4d97 100644
--- a/spec/builders/messages/instagram/message_builder_spec.rb
+++ b/spec/builders/messages/instagram/message_builder_spec.rb
@@ -29,7 +29,7 @@ describe Messages::Instagram::MessageBuilder do
 
   describe '#perform' do
     before do
-      instagram_channel.update(access_token: 'valid_instagram_token')
+      instagram_channel.update!(access_token: 'valid_instagram_token')
 
       stub_request(:get, %r{https://graph\.instagram\.com/.*?/Sender-id-1\?.*})
         .to_return(
@@ -175,7 +175,7 @@ describe Messages::Instagram::MessageBuilder do
     end
 
     it 'handles authorization errors' do
-      instagram_channel.update(access_token: 'invalid_token')
+      instagram_channel.update!(access_token: 'invalid_token')
 
       # Stub the request to return authorization error status
       stub_request(:get, %r{https://graph\.instagram\.com/.*?/Sender-id-1\?.*})
diff --git a/spec/jobs/webhooks/instagram_events_job_spec.rb b/spec/jobs/webhooks/instagram_events_job_spec.rb
index 23e7f9e5a..c3bcfadb2 100644
--- a/spec/jobs/webhooks/instagram_events_job_spec.rb
+++ b/spec/jobs/webhooks/instagram_events_job_spec.rb
@@ -182,7 +182,7 @@ describe Webhooks::InstagramEventsJob do
 
     context 'when handling messaging events for Instagram via Instagram login' do
       before do
-        instagram_channel.update(access_token: 'valid_instagram_token')
+        instagram_channel.update!(access_token: 'valid_instagram_token')
 
         stub_request(:get, %r{https://graph\.instagram\.com/v22\.0/Sender-id-1\?.*})
           .to_return(

From 8fc14186e081125c1c029ea952abc63504c7c271 Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayoproliveira@gmail.com>
Date: Fri, 25 Apr 2025 16:39:17 -0300
Subject: [PATCH 29/46] feat: process Baileys attachments, fix contact name
 creation, and handle unsupported messages (#26)

* fix: return not_found status for missing messages in WhatsApp webhook

* feat: enhance message handling to support image attachments

* chore: Handle incoming whatsapp baileys service attachments and implement specs for images and videos

* fix: add file_content_type method to incoming baileys messages

* chore: specs for stickers, audio and files

* fix: handle media attachment errors

* chore: convert file_content_type to string when attaching media

* fix: add handling for attachment not found error in incoming message service

* chore: refactor file_content_type method and simplify filename method

* chore: update media attachment tests

* feat: baileys unsupported message alert (#27)

* feat: create alert message for unsupported message types

* chore: fail message when try send not supported type in baileys

* chore: add tests for unsupported message handling in Baileys service

* chore: correct spelling

* chore: NIT in spec name

* chore: remove unnecessary message reload in unsupported message type test

* feat: baileys support to send attachments (#28)

* feat: enhance message sending logic with support for attachments and interactive messages

* fix: update message format to use messageContent for text messages

* feat: attachment message sending

* fix: use strict encoding for attachment file download

* chore: streamline message sending logic and remove unused error classes

* chore: remove type from message sending logic

* chore: update message sending specs

* chore: raise MessageNotSentError instead of updating message status to failed

* chore: change baileys contact name preferences (#30)

* refactor: improve contact name handling and extraction from JID

* test: enhance message handling to update contact names based on pushName and verifiedBizName

* chore: update contact name condition to match phone number from JID

* chore: correct method name typo

* chore: correct variable names for phone number consistency in tests

* chore: update message payload structure and improve error handling in send_message

* test: re-add testing for error handling

* feat: enhance contact name handling and add self-message detection

* fix: ensure presence check for verified business name in contact name retrieval

* test: improve specs

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
Co-authored-by: Gabriel Jablonski <gabriel@fazer.ai>

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
Co-authored-by: Gabriel Jablonski <gabriel@fazer.ai>

* fix: try to disconnect baileys before destroy inbox (#29)

* fix: ensure proper disconnection of Baileys provider on channel destruction

* test: add callback tests for disconnecting channel provider in Whatsapp spec

* refactor: simplify condition for disconnecting Baileys provider on channel destruction

* refactor: enhance disconnect_channel_provider specs for Baileys provider

* test: verify channel destruction does not call disconnect_channel_provider

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
Co-authored-by: Gabriel Jablonski <gabriel@fazer.ai>
---
 .../webhooks/whatsapp_controller.rb           |   4 +-
 app/models/channel/whatsapp.rb                |   2 +
 .../incoming_message_baileys_service.rb       | 113 ++++++-
 .../providers/whatsapp_baileys_service.rb     |  80 ++++-
 config/locales/en.yml                         |   4 +
 config/locales/pt_BR.yml                      |   8 +-
 spec/models/attachment_spec.rb                |   2 +
 spec/models/channel/whatsapp_spec.rb          |  37 +++
 .../incoming_message_baileys_service_spec.rb  | 306 +++++++++++++++++-
 .../whatsapp_baileys_service_spec.rb          | 133 +++++---
 10 files changed, 595 insertions(+), 94 deletions(-)

diff --git a/app/controllers/webhooks/whatsapp_controller.rb b/app/controllers/webhooks/whatsapp_controller.rb
index 78a5a3bef..709486048 100644
--- a/app/controllers/webhooks/whatsapp_controller.rb
+++ b/app/controllers/webhooks/whatsapp_controller.rb
@@ -26,7 +26,9 @@ class Webhooks::WhatsappController < ActionController::API
   rescue Whatsapp::IncomingMessageBaileysService::InvalidWebhookVerifyToken
     head :unauthorized
   rescue Whatsapp::IncomingMessageBaileysService::MessageNotFoundError
-    head :bad_request
+    head :not_found
+  rescue Whatsapp::IncomingMessageBaileysService::AttachmentNotFoundError
+    head :unprocessable_entity
   end
 
   def valid_token?(token)
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index b8191e17c..ef4364fb7 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -37,6 +37,8 @@ class Channel::Whatsapp < ApplicationRecord
 
   after_create :sync_templates
 
+  before_destroy :disconnect_channel_provider, if: -> { provider == 'baileys' }
+
   def name
     'Whatsapp'
   end
diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index 007ecb519..41300b982 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -1,6 +1,7 @@
 class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseService # rubocop:disable Metrics/ClassLength
   class InvalidWebhookVerifyToken < StandardError; end
   class MessageNotFoundError < StandardError; end
+  class AttachmentNotFoundError < StandardError; end
 
   def perform
     raise InvalidWebhookVerifyToken if processed_params[:webhookVerifyToken] != inbox.channel.provider_config['webhook_verify_token']
@@ -64,12 +65,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
   end
 
   def set_contact
-    # NOTE: jid shape is `<user>_<agent>:<device>@<server>`
-    # https://github.com/WhiskeySockets/Baileys/blob/v6.7.16/src/WABinary/jid-utils.ts#L19
-    phone_number_from_jid = @raw_message[:key][:remoteJid].split('@').first.split(':').first.split('_').first
-    # NOTE: We're assuming `pushName` will always be present when `fromMe: false`.
-    # This assumption might be incorrect, so let's keep an eye out for contacts being created with empty name.
-    push_name = @raw_message[:key][:fromMe] ? phone_number_from_jid : @raw_message[:pushName].to_s
+    push_name = contact_name
     contact_inbox = ::ContactInboxWithContactBuilder.new(
       source_id: phone_number_from_jid,
       inbox: inbox,
@@ -79,14 +75,36 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     @contact_inbox = contact_inbox
     @contact = contact_inbox.contact
 
-    @contact.update!(name: push_name) if @contact.name == phone_number_from_jid && !@raw_message[:key][:fromMe]
+    @contact.update!(name: push_name) if @contact.name == phone_number_from_jid
+  end
+
+  def phone_number_from_jid
+    # NOTE: jid shape is `<user>_<agent>:<device>@<server>`
+    # https://github.com/WhiskeySockets/Baileys/blob/v6.7.16/src/WABinary/jid-utils.ts#L19
+    @phone_number_from_jid ||= @raw_message[:key][:remoteJid].split('@').first.split(':').first.split('_').first
+  end
+
+  def contact_name
+    # NOTE: `verifiedBizName` is only available for business accounts and has a higher priority than `pushName`.
+    name = @raw_message[:verifiedBizName].presence || @raw_message[:pushName]
+    return name if self_message? || incoming?
+
+    phone_number_from_jid
+  end
+
+  def self_message?
+    phone_number_from_jid == inbox.channel.phone_number.delete('+')
   end
 
   def handle_create_message
     case message_type
     when 'text'
-      create_text_message
+      create_message
+    when 'image', 'file', 'video', 'audio', 'sticker'
+      create_message
+      attach_media
     else
+      create_unsupported_message
       Rails.logger.warn "Baileys unsupported message type: #{message_type}"
     end
   end
@@ -126,7 +144,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     return 'video_note' if msg.key?(:ptvMessage)
     return 'location' if msg.key?(:locationMessage)
     return 'live_location' if msg.key?(:liveLocationMessage)
-    return 'document' if msg.key?(:documentMessage)
+    return 'file' if msg.key?(:documentMessage)
     return 'poll' if msg.key?(:pollCreationMessageV3)
     return 'event' if msg.key?(:eventMessage)
     return 'sticker' if msg.key?(:stickerMessage)
@@ -134,15 +152,13 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     'unsupported'
   end
 
-  def create_text_message
-    is_outgoing = @raw_message[:key][:fromMe]
-    sender = is_outgoing ? @inbox.account.account_users.first.user : @contact
-    sender_type = is_outgoing ? 'User' : 'Contact'
-    message_type = is_outgoing ? :outgoing : :incoming
-    content = @raw_message.dig(:message, :conversation) || @raw_message.dig(:message, :extendedTextMessage, :text)
+  def create_message
+    sender = incoming? ? @contact : @inbox.account.account_users.first.user
+    sender_type = incoming? ? 'Contact' : 'User'
+    message_type = incoming? ? :incoming : :outgoing
 
     @message = @conversation.messages.create!(
-      content: content,
+      content: message_content,
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
       source_id: message_id,
@@ -153,6 +169,71 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     )
   end
 
+  def incoming?
+    !@raw_message[:key][:fromMe]
+  end
+
+  def create_unsupported_message
+    create_message
+    @message.update!(
+      content: I18n.t('errors.messages.unsupported'),
+      message_type: 'template',
+      status: 'failed'
+    )
+  end
+
+  def attach_media
+    media = processed_params.dig(:extra, :media)
+    return if media.blank?
+
+    attachment_payload = media[message_id]
+    if attachment_payload.blank?
+      Rails.logger.error "Attachment not found for message: #{message_id}"
+      raise AttachmentNotFoundError
+    end
+
+    begin
+      decoded_data = Base64.decode64(attachment_payload)
+      io = StringIO.new(decoded_data)
+
+      @message.attachments.new(
+        account_id: @message.account_id,
+        file_type: file_content_type.to_s,
+        file: { io: io, filename: filename }
+      )
+
+      @message.save!
+    rescue StandardError => e
+      Rails.logger.error "Failed to attach media for message #{message_id} (#{e.message}) payload: #{attachment_payload}"
+    end
+  end
+
+  def file_content_type
+    return :image if message_type.in?(%w[image sticker])
+    return :video if message_type.in?(%w[video video_note])
+    return :audio if message_type == 'audio'
+
+    :file
+  end
+
+  def filename
+    filename = @raw_message.dig(:message, :documentMessage, :fileName)
+    return filename if filename.present?
+
+    "#{file_content_type}_#{@message[:id]}_#{Time.current.strftime('%Y%m%d')}"
+  end
+
+  def message_content
+    case message_type
+    when 'text'
+      @raw_message.dig(:message, :conversation) || @raw_message.dig(:message, :extendedTextMessage, :text)
+    when 'image'
+      @raw_message.dig(:message, :imageMessage, :caption)
+    when 'video'
+      @raw_message.dig(:message, :videoMessage, :caption)
+    end
+  end
+
   def message_id
     @raw_message[:key][:id]
   end
diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index 006474038..718ac83b4 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -1,5 +1,6 @@
 class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseService
   class MessageContentTypeNotSupported < StandardError; end
+  class MessageNotSentError < StandardError; end
 
   DEFAULT_CLIENT_NAME = ENV.fetch('BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME', nil)
   DEFAULT_URL = ENV.fetch('BAILEYS_PROVIDER_DEFAULT_URL', nil)
@@ -29,21 +30,15 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
   end
 
   def send_message(phone_number, message)
-    raise MessageContentTypeNotSupported unless message.content_type == 'text'
-
-    response = HTTParty.post(
-      "#{provider_url}/connections/#{whatsapp_channel.phone_number}/send-message",
-      headers: api_headers,
-      body: {
-        type: 'text',
-        recipient: phone_number,
-        message: message.content
-      }.to_json
-    )
-
-    return unless process_response(response)
-
-    response.parsed_response.dig('data', 'key', 'id')
+    @message = message
+    @phone_number = phone_number
+    if message.attachments.present?
+      send_attachment_message
+    elsif message.content.present?
+      send_text_message
+    else
+      message.update!(content: I18n.t('errors.messages.send.unsupported'), status: 'failed')
+    end
   end
 
   def send_template(phone_number, template_info); end
@@ -75,6 +70,61 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
     whatsapp_channel.provider_config['api_key'].presence || DEFAULT_API_KEY
   end
 
+  def send_attachment_message
+    @attachment = @message.attachments.first
+
+    response = HTTParty.post(
+      "#{provider_url}/connections/#{whatsapp_channel.phone_number}/send-message",
+      headers: api_headers,
+      body: {
+        recipient: @phone_number,
+        messageContent: message_content
+      }.to_json
+    )
+
+    return response.parsed_response.dig('data', 'key', 'id') if process_response(response)
+
+    raise MessageNotSentError
+  end
+
+  def message_content
+    buffer = Base64.strict_encode64(@attachment.file.download)
+
+    content = {
+      fileName: @attachment.file.filename,
+      caption: @message.content
+    }
+    case @attachment.file_type
+    when 'image'
+      content[:image] = buffer
+    when 'audio'
+      content[:audio] = buffer
+    when 'file'
+      content[:document] = buffer
+    when 'sticker'
+      content[:sticker] = buffer
+    when 'video'
+      content[:video] = buffer
+    end
+
+    content
+  end
+
+  def send_text_message
+    response = HTTParty.post(
+      "#{provider_url}/connections/#{whatsapp_channel.phone_number}/send-message",
+      headers: api_headers,
+      body: {
+        recipient: @phone_number,
+        messageContent: { text: @message.content }
+      }.to_json
+    )
+
+    return response.parsed_response.dig('data', 'key', 'id') if process_response(response)
+
+    raise MessageNotSentError
+  end
+
   def process_response(response)
     Rails.logger.error response.body unless response.success?
     response.success?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 752c43fca..b165f2aa3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -37,6 +37,10 @@ en:
     inbox_deletetion_response: Your inbox deletion request will be processed in some time.
 
   errors:
+    messages:
+      unsupported: ❌ _This message can't be displayed here. Please open WhatsApp on your phone to view the message._
+      send:
+        unsupported: ❌ _This message cannot be sent. Please open WhatsApp on your phone to properly send the message._
     validations:
       presence: must not be blank
     webhook:
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 030d14204..c853ee4e2 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -23,6 +23,10 @@ pt_BR:
     reset_password_failure: Uh ho! Não conseguimos encontrar nenhum usuário com o e-mail especificado.
     inbox_deletetion_response: Seu pedido de exclusão da caixa de entrada será processado dentro de algum tempo.
   errors:
+    messages:
+      unsupported: ❌ _Esta mensagem não pode ser exibida aqui. Por favor, abra o WhatsApp em seu telefone para visualizar a mensagem._
+      send:
+        unsupported: ❌ _Esta mensagem não pode ser enviada. Por favor, abra o WhatsApp em seu telefone para enviar corretamente a mensagem._
     validations:
       presence: não pode ficar em branco
     webhook:
@@ -206,7 +210,7 @@ pt_BR:
       meeting_name: '%{agent_name} começou a reunião'
     slack:
       name: 'Slack'
-      description: "Integre Chatwoot com Slack para manter sua equipe em sincronia. Essa integração permite que você receba notificações de novas conversas e as responda diretamente na interface do Slack."
+      description: 'Integre Chatwoot com Slack para manter sua equipe em sincronia. Essa integração permite que você receba notificações de novas conversas e as responda diretamente na interface do Slack.'
     webhooks:
       name: 'Webhooks'
       description: 'Eventos webhook fornecem atualizações sobre atividades em tempo real na sua conta Chatwoot. Você pode se inscrever em seus eventos preferidos, e o Chatwoot enviará as chamadas HTTP com as atualizações.'
@@ -215,7 +219,7 @@ pt_BR:
       description: 'Construa chatbots com o Dialogflow e integre-os facilmente na sua caixa de entrada. Esses bots podem lidar com as consultas iniciais antes de transferi-las para um agente de atendimento ao cliente.'
     google_translate:
       name: 'Tradutor do Google'
-      description: "Integre o Google Tradutor para ajudar os agentes a traduzir facilmente as mensagens dos clientes. Esta integração detecta automaticamente o idioma e o converte para o idioma preferido do agente ou do administrador."
+      description: 'Integre o Google Tradutor para ajudar os agentes a traduzir facilmente as mensagens dos clientes. Esta integração detecta automaticamente o idioma e o converte para o idioma preferido do agente ou do administrador.'
     openai:
       name: 'OpenAI'
       description: 'Aproveite o poder dos grandes modelos de linguagem do OpenAI com recursos como sugestões de resposta, resumo, reformulação de mensagens, verificação ortográfica e classificação de rótulos.'
diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb
index 241125538..6449bd674 100644
--- a/spec/models/attachment_spec.rb
+++ b/spec/models/attachment_spec.rb
@@ -125,6 +125,8 @@ RSpec.describe Attachment do
 
       it 'preserves meta data with file attachments' do
         expect(image_attachment.meta['description']).to eq('Test image')
+        expect(image_attachment.file.filename.to_s).to eq('avatar.png')
+        expect(image_attachment.file.content_type).to eq('image/png')
       end
     end
   end
diff --git a/spec/models/channel/whatsapp_spec.rb b/spec/models/channel/whatsapp_spec.rb
index 4368807fe..a2767b018 100644
--- a/spec/models/channel/whatsapp_spec.rb
+++ b/spec/models/channel/whatsapp_spec.rb
@@ -61,4 +61,41 @@ RSpec.describe Channel::Whatsapp do
       expect(channel.provider_config['webhook_verify_token']).to eq '123'
     end
   end
+
+  describe 'callbacks' do
+    describe '#disconnect_channel_provider' do
+      context 'when provider is baileys' do
+        let(:channel) { create(:channel_whatsapp, provider: 'baileys', validate_provider_config: false, sync_templates: false) }
+        let(:disconnect_url) { "#{channel.provider_config['provider_url']}/connections/#{channel.phone_number}" }
+
+        it 'destroys the channel on successful disconnect' do
+          stub_request(:delete, disconnect_url).to_return(status: 200)
+
+          channel.destroy!
+
+          expect(channel).to be_destroyed
+        end
+
+        it 'destroys the channel on failure to disconnect' do
+          stub_request(:delete, disconnect_url).to_return(status: 404, body: 'error message')
+
+          channel.destroy!
+
+          expect(channel).to be_destroyed
+        end
+      end
+
+      context 'when provider is not baileys' do
+        let(:channel) { create(:channel_whatsapp, provider: 'whatsapp_cloud', validate_provider_config: false, sync_templates: false) }
+
+        it 'does not invoke callback' do
+          expect(channel).not_to receive(:disconnect_channel_provider)
+
+          channel.destroy!
+
+          expect(channel).to be_destroyed
+        end
+      end
+    end
+  end
 end
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 3207cc7b3..2eac04a17 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -164,6 +164,18 @@ describe Whatsapp::IncomingMessageBaileysService do
           }
         end
 
+        it 'creates an alert of unsupported message' do
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+
+          expect(message).to be_present
+          expect(message.content).to eq(I18n.t('errors.messages.unsupported'))
+          expect(message.message_type).to eq('template')
+          expect(message.status).to eq('failed')
+        end
+
         it 'logs a warning message' do
           allow(Rails.logger).to receive(:warn).with('Baileys unsupported message type: unsupported')
 
@@ -200,11 +212,14 @@ describe Whatsapp::IncomingMessageBaileysService do
       end
 
       context 'when message type is text' do
+        let(:phone_number) { '5511912345678' }
+        let(:jid) { "#{phone_number}@s.whatsapp.net" }
+        let(:content_message) { 'Hello from Baileys' }
         let(:raw_message) do
           {
-            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
-            message: { conversation: 'Hello from Baileys' },
-            pushName: 'John Doe'
+            key: { id: 'msg_123', remoteJid: jid, fromMe: false },
+            pushName: 'John Doe',
+            message: { conversation: content_message }
           }
         end
         let(:params) do
@@ -224,18 +239,16 @@ describe Whatsapp::IncomingMessageBaileysService do
 
             conversation = inbox.conversations.last
             message = conversation.messages.last
+
             expect(message).to be_present
-            expect(message.content).to eq('Hello from Baileys')
-            expect(message.message_type).to eq('incoming')
+            expect(message.content).to eq(content_message)
             expect(message.sender).to be_present
             expect(message.sender.name).to eq('John Doe')
+            expect(message.message_type).to eq('incoming')
           end
 
           it 'creates an outgoing message' do
-            number = '5511912345678'
-            raw_message_outgoing = raw_message.merge(
-              key: { id: 'msg_123', remoteJid: "#{number}@s.whatsapp.net", fromMe: true }
-            )
+            raw_message_outgoing = raw_message.merge(key: { id: 'msg_123', remoteJid: jid, fromMe: true })
             params_outgoing = params.merge(data: { type: 'notify', messages: [raw_message_outgoing] })
             create(:account_user, account: inbox.account)
 
@@ -243,20 +256,60 @@ describe Whatsapp::IncomingMessageBaileysService do
 
             conversation = inbox.conversations.last
             message = conversation.messages.last
+
             expect(message).to be_present
-            expect(message.content).to eq('Hello from Baileys')
+            expect(message.content).to eq(content_message)
+            expect(conversation.contact.name).to eq(phone_number)
             expect(message.message_type).to eq('outgoing')
-            expect(conversation.contact.name).to eq(number)
           end
 
-          it 'updates the contact name if the current name is a phone number when a incoming message is received' do
-            create(:contact, account: inbox.account, name: '5511912345678')
+          it 'creates an outgoing self message' do
+            self_jid = "#{whatsapp_channel.phone_number.delete('+')}@s.whatsapp.net"
+            raw_message_outgoing = raw_message.merge(key: { id: 'msg_123', remoteJid: self_jid, fromMe: true })
+            params_outgoing = params.merge(data: { type: 'notify', messages: [raw_message_outgoing] })
+            create(:account_user, account: inbox.account)
+
+            described_class.new(inbox: inbox, params: params_outgoing).perform
+
+            conversation = inbox.conversations.last
+            message = conversation.messages.last
+
+            expect(message).to be_present
+            expect(message.content).to eq(content_message)
+            expect(conversation.contact.name).to eq('John Doe')
+            expect(message.message_type).to eq('outgoing')
+          end
+
+          it 'updates the contact name when name is the phone number and message has a pushName' do
+            create(:contact, account: inbox.account, name: phone_number)
+
             described_class.new(inbox: inbox, params: params).perform
 
             conversation = inbox.conversations.last
             expect(conversation.contact.name).to eq('John Doe')
           end
 
+          it 'updates the contact name when name is the phone number and message has a verifiedBizName' do
+            raw_message[:verifiedBizName] = 'Verified John'
+            create(:contact, account: inbox.account, name: phone_number)
+
+            described_class.new(inbox: inbox, params: params).perform
+
+            conversation = inbox.conversations.last
+            expect(conversation.contact.name).to eq('Verified John')
+          end
+
+          it 'creates contact with phone number as name on outgoing message' do
+            raw_message_outgoing = raw_message.merge(key: { id: 'msg_123', remoteJid: jid, fromMe: true })
+            params_outgoing = params.merge(data: { type: 'notify', messages: [raw_message_outgoing] })
+            create(:account_user, account: inbox.account)
+
+            described_class.new(inbox: inbox, params: params_outgoing).perform
+
+            conversation = inbox.conversations.last
+            expect(conversation.contact.name).to eq(phone_number)
+          end
+
           it 'creates a message on an existing conversation' do
             contact = create(:contact, account: inbox.account, name: 'John Doe')
             contact_inbox = create(:contact_inbox, inbox: inbox, contact: contact, source_id: '5511912345678')
@@ -319,6 +372,233 @@ describe Whatsapp::IncomingMessageBaileysService do
           end
         end
       end
+
+      context 'when message type is image' do
+        let(:raw_message) do
+          {
+            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { imageMessage: { caption: 'Hello from Baileys' } },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            },
+            extra: {
+              media: {
+                'msg_123' => 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='
+              }
+            }
+          }
+        end
+
+        it 'creates the message with caption' do
+          described_class.new(inbox: inbox, params: params).perform
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+
+          expect(message).to be_present
+          expect(message.content).to eq('Hello from Baileys')
+        end
+
+        it 'creates message attachment' do
+          freeze_time
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+          attachment = message.attachments.last
+
+          expect(attachment).to be_present
+          expect(attachment.file).to be_present
+          expect(attachment.file_type).to eq('image')
+
+          expect(attachment.file.filename.to_s).to eq("image_#{message.id}_#{Time.current.strftime('%Y%m%d')}")
+          expect(attachment.file.content_type).to eq('image/png')
+        end
+      end
+
+      context 'when message type is video' do
+        let(:raw_message) do
+          {
+            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { videoMessage: { caption: 'Hello from Baileys' } },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            },
+            extra: {
+              media: {
+                'msg_123' => 'AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAABL21kYXQAAAGzABAHAAABthGBxgj238bbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G237wAAAbMAEAcAAAG2E4HGCkbckbbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G237AAABswAQBwAAAbYVgcYLltyRtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G238bbfsAAAGzABAHAAABtheBxhPbckbbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G237wAAAbMAEAcAAAG2GYHGJG3JG238bbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt/G238bbfxtt+/AAADHW1vb3YAAABsbXZoZAAAAAAAAAAAAAAAAAAAA+gAAAPoAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAJHdHJhawAAAFx0a2hkAAAAAwAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAABAAAAAQAAAAAAAJGVkdHMAAAAcZWxzdAAAAAAAAAABAAAD6AAAAAAAAQAAAAABv21kaWEAAAAgbWRoZAAAAAAAAAAAAAAAAAAAKAAAACgAVcQAAAAAAC1oZGxyAAAAAAAAAAB2aWRlAAAAAAAAAAAAAAAAVmlkZW9IYW5kbGVyAAAAAWptaW5mAAAAFHZtaGQAAAABAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAAEqc3RibAAAAGJzdHNkAAAAAAAAACVhdmMxAAAAAAAAAAAAAAAAAACFc3R0cwAAAAAAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' # rubocop:disable Layout/LineLength
+              }
+            }
+          }
+        end
+
+        it 'creates the message with caption' do
+          described_class.new(inbox: inbox, params: params).perform
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+
+          expect(message).to be_present
+          expect(message.content).to eq('Hello from Baileys')
+        end
+
+        it 'creates message attachment' do
+          freeze_time
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+          attachment = message.attachments.last
+
+          expect(attachment).to be_present
+          expect(attachment.file).to be_present
+          expect(attachment.file_type).to eq('video')
+
+          expect(attachment.file.filename.to_s).to eq("video_#{message.id}_#{Time.current.strftime('%Y%m%d')}")
+          expect(attachment.file.content_type).to eq('video/mp4')
+        end
+      end
+
+      context 'when message type is file' do
+        let(:filename) { 'file.pdf' }
+        let(:raw_message) do
+          {
+            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { documentMessage: { fileName: filename } },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            },
+            extra: {
+              media: {
+                'msg_123' => 'JVBERi0xLjQKJVRlc3QgUERGCjEgMCBvYmoKPDwgL1R5cGUgL0NhdGFsb2cgL091dGxpbmVzIDIgMCBSIC9QYWdlcyAzIDAgUiA+PgplbmRvYmoKMiAwIG9iago8PCAvVHlwZSAvT3V0bGluZXMgL0NvdW50IDAgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFs0IDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgCiAgIC9QYXJlbnQgMyAwIFIgCiAgIC9NZWRpYUJveCBbMCAwIDMwMCAyMDBdIAogICAvQ29udGVudHMgNSAwIFIgCiAgIC9SZXNvdXJjZXMgPDwgL0ZvbnQgPDwgL0YxIDw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PiA+PiA+PgplbmRvYmoKNSAwIG9iago8PCAvTGVuZ3RoIDUzID4+CnN0cmVhbQpCVAovRjEgMTIgVGYKNzIgMTUwIFRkCihIZWxsbyBQREYhKSBUagpFVAplbmRzdHJlYW0KZW5kb2JqCnhyZWYKMCA2CjAwMDAwMDAwMDAgNjU1MzUgZiAKMDAwMDAwMDAxNyAwMDAwMCBuIAowMDAwMDAwMDg0IDAwMDAwIG4gCjAwMDAwMDAxMzQgMDAwMDAgbiAKMDAwMDAwMDE5MyAwMDAwMCBuIAowMDAwMDAwMzkxIDAwMDAwIG4gCnRyYWlsZXIKPDwgL1NpemUgNiAvUm9vdCAxIDAgUiA+PgpzdGFydHhyZWYKNDk0CiUlRU9GCg==' # rubocop:disable Layout/LineLength
+              }
+            }
+          }
+        end
+
+        it 'creates message attachment' do
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+          attachment = message.attachments.last
+
+          expect(attachment).to be_present
+          expect(attachment.file_type).to eq('file')
+          expect(attachment.file).to be_present
+
+          expect(attachment.file.filename.to_s).to eq(filename)
+          expect(attachment.file.content_type).to eq('application/pdf')
+        end
+      end
+
+      context 'when message type is audio' do
+        let(:raw_message) do
+          {
+            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { audioMessage: {} },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            },
+            extra: {
+              media: {
+                'msg_123' => 'T2dnUwACAAAAAAAAAAAAAAAAAAAAACqCBoIBE09wdXNIZWFkAQFoAIA+AAAAAABPZ2dTAAAAAAAAAAAAAAAAAAABAAAAjzLsvAEYT3B1c1RhZ3MIAAAAV2hhdHNBcHAAAAAAT2dnUwAAqOwAAAAAAAAAAAAAAgAAAJ5agxUOav8T7PLg/wTu9t3/DodLhgcIBwcaC+TBNuzFgAfJcifhROpQB8l5yMlXwAfJecjJUbCAAtRK//E6OBUjAL9sWX+ZId5v5ZPVuy3VNIvDjKNuehMtIhui23+8zF6nYoLkqYj4YaZXn4AigNd5FYRrpMiu/XTgerAwS4YuLSstKYrWH82ADKXlHmIp2IXekQmEI3IMggeTCD0zjPEsIjeqmkVfAP/lesBo7ZRZyGCLBaIvPCArr1eTRWfFCFYEeO+o+RQff9NFmkO6LC3YaJWaZBzcqpkiVSZF9uCK1eJTZkGsApQno7t/iJlJqd1hmGvZzGeg/G1nzB8ps1s9Cb34YpDVU9KAiuJYr1hUxmfxI4KFiX2UtYdxGWNxfGRuwTVTqHmIPie2mdzzibieN1+k/2p0iuOf3GMaWMWtIPc7iARhMUBobiunslmmvirb1LmEx6Y3HbqH2suQoMqK1dzcuF13w1aWz0u+oBY1+tTxacRxmjZG7F3XcO5KaLhjrsYUK8CUnXEe1Zf5gEuGJywoISSK1dzX4aeizrE8N98P1sp6HXFxZNvRhHfXyXbn8zATmP04ts2x34CKYFWmnvrO1ktfF2v9MAFnvuRVZsFSXR9Hk+aYisrdrzcR21sxONbuV+YtS4ph2d9VdNkVZysVa9vLS367WyDKLRFRpxJYpHmRa0EagqNkzyoH8YCBYpnXXDIoSnW++SQs+aRcDrN94k4h1BydvZWT6yHRZEQzCk6563SEL1aa+0XxjdWVM7Udxke5uGW38hTwN59v2YsjzGYzOcNqxLHAh8XEJTZ8Pmlpy+8syby3YVGYDViXZWlkk70CH6F8S4YjJiciKzMjXqKr6GIbeou0Z2zKCclT+8+O5A5ALPLMswUcqkJGyPSoif7hX1AOdSFD+LO+G67VA3stP4FyPxS/DJyhPVKTLxM/oL2BCHSKAGw5BpS4CTxuzlErqMvCx5mDnbPOQtUamiaMu+dEXFLkeL7SXUAy+TMfscZ0qO4p6NCYAKs4tltZPSA0LVmn+Dh/6jxOj4ZwiZWLM95xHaF8CODilYJ+fHMBfu6cQ+xgaw5wBeACJxrXhs97LFaJBrPcMIm2XzjUP0yjCkG5eR2BqOSczSe3XJYYPi07mjVreHddvl+1sJTviKMNahmb8oBLhisgIx8lifjnzQv9W7jolZGOf2l1ndLQ+M3B7RCSidTGpjvfyhtzjZ2V6myBp2X3gDMjLxurEFNSF9pVl2W3ooe08Tnbxq2bQQIjguzU9Q/AgUn5o2rDGKeGdCQSsmlvtHOAvAEvh7wxb2c10bc6GafiQDIE+0MP4cZvqz6hsFQoSRDxO7Rug+EXlQc58Plptx+JMTvG2AbTjVmIMEgYMo07jI5Ipp6wB4L0E3hWDuNir/Q2jDWJQzE6gTLV4xN1TQANxXiE7t3R0ReTRlXLN0iUvaMTn7/F1GUAZSodeEuGLy0pKieJMabgzX2fGflllvjvVX88N22aJYnLzaWHjGOQSVJh10ioHIIOtQG5fgnhxr26MIkoyMZKr/U1MqvWIwdUOmi+ZLGs8bgEMmeFoMUV0gLagpxgeWcX8o5VFajuLy9PtrhU29mheHxO7PHnIn1xsarpbsHLl7n36q3zVB1TFwPWHlDvcFB8LWkJ1JJptzK1O4NTc29JT7WaEGaBVnjX/6eUOddKPqZz/lmOQYD1T1kgL1e0+Zhp3fOmaWb+pSh+HuqPU2wkmgo7imUOQ0mj6wDMbFIeQObwL1HKAZJzCdeBsug573apU5qYuV/ZEqYGJ0hQ74HnQ6ZvwqjwU05LhiEnJiImL1FTafh3rc8Cy7o/1/fyfT503ZbIZ5u62VtXZ4YY6xZWL1cs2qHiYShorlN/L46omeX4MtXZzVW7pKCzQdBhCeIla+dDbUfBL1FPWDH1cDGKCYp+jho2Cl1bL7vlaPsUkGWZ6Hl+bo4fqG9dFNgvUVhK7goJwHOWkY9v9rKLGNlaZ90LoOflGShWQh5lmTmAiSpm7GJTFSCi2hFKwHjEsitafxXWgy5Cw4I/XbPK0qRhJMFlZ3CBEnqAp9a+8ecaIq4fxNaMQNtkQ3N2Ks0C+7NwWXuFKLLyR1PrDg8Koij1IrlngnjAS4YvKCUmJ4m2XO+ECBolT/hH0hBp9oXO+Lr8lxC00+X/WtVnmK1epbZTbxucayw2yIFy012giZJ1UCUkkOlt6j6VRuueVyyAtn2y+8lVoDn0uC4yXFr5D7bqqLZ5gDEhg/rhoxAc/iwGS7DXkmgCE4DCn4rZI+gOYeA4cqDyM3Ry0rAwpQbfmnN4rpT8chKcqdGSFaXArxYaVbiGE4xHzj1m+XohGDcswy6/+NUFh1V3ZNlNL9Z86Ro2Uymmr2II/V1r3jRW47zP9wpk0CiiCC1aitUOTkDxlo4/Tac7mIdUvffnW9PHNp1Nry+nHC4MenwcNBlAS4YlIiMhJi1nFjHrzqG7NcfjjR/pGQ2HYwnigLJnP/8P9H3bDY3XBiURNqAtaIomrMImJrOqzDDvFi7vN2t+kmPIjZUPsQpD9586WfXeLWiTq3EhFDlzQ3vlA9wvo98iUzWXYHbgUCsQLpnWKc5YO8AtaIoD4ebsRtvk2oXKaYjHlDKgBfT745WEq+W6DzJ4gbAtaQG0PqxSKfrdvBbpPPkYL8gV/fwQPR51jvwKWt72JlEms7KbgC1P3UVmRscoNd6wKJQqP0mdrYd6BaXv2Yq1uKW6LhjMXbip6gpLhigpJi0vLWfCbps6OrJt07ZXi+x+IfoTJTfmByn3TbOAjvImlHsFtYH6AON6iC20TbaYXrCU6mMbQ5931swaz0YPEao/mRwbKMjzivLz8iEUVPUOETfYiSrSWWJND57daMlpJoTRZ0/DyBLf/aFV6rph8o7AdeOZo+1lNcCBNMd2BGZ+HSuHZdzV6Tl/VteFnl9Rk5Yz9j9f+H87ODuzHFb2et/nlPjOZDCKYpy8X5WIm4WI/p0O98FNV6Dl6gTPjA1iFlvBRgdmvLatWrk9EokU74otEJAf04qGJ/SMBzLIkfizWs/IdMWnWWJfB4eJcIIBFetNFJsADa1eOurprIiS1UMzm/aa1JmyoEuDLC6LY53aB2ceiPT3EUnJCBYscjp1sKigjAvQRHGd0pLWcsf+Ktf3NKcS2CJnIIqy7J9E0MerTxxbnsqkg2w33fSv92Jepqtp3O+Xv77vv1aVBQReQgXh4DIxUcmJ/xjFW4ARWdxQ9sSyOwGNV0k7LLNflhOPxqJJ7cRUiEXHsKZhYr0rZA==' # rubocop:disable Layout/LineLength
+              }
+            }
+          }
+        end
+
+        it 'creates message attachment' do
+          freeze_time
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+          attachment = message.attachments.last
+
+          expect(attachment).to be_present
+          expect(attachment.file_type).to eq('audio')
+          expect(attachment.file).to be_present
+
+          expect(attachment.file.filename.to_s).to eq("audio_#{message.id}_#{Time.current.strftime('%Y%m%d')}")
+          expect(attachment.file.content_type).to eq('audio/opus')
+        end
+      end
+
+      context 'when message type is sticker' do
+        let(:raw_message) do
+          {
+            key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { stickerMessage: {} },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            },
+            extra: {
+              media: {
+                'msg_123' => 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='
+              }
+            }
+          }
+        end
+
+        it 'creates message attachment' do
+          freeze_time
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+          attachment = message.attachments.last
+
+          expect(attachment).to be_present
+          expect(attachment.file_type).to eq('image')
+          expect(attachment.file).to be_present
+
+          expect(attachment.file.filename.to_s).to eq("image_#{message.id}_#{Time.current.strftime('%Y%m%d')}")
+          expect(attachment.file.content_type).to eq('image/png')
+        end
+      end
     end
 
     context 'when processing messages.update event' do
diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index 859a065a8..59d503f07 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -91,63 +91,103 @@ describe Whatsapp::Providers::WhatsappBaileysService do
   end
 
   describe '#send_message' do
-    context 'when response is successful' do
-      it 'returns true' do
+    context 'when message has attachment' do
+      let(:base64_image) { 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=' }
+
+      before do
+        message.attachments.new(
+          account_id: message.account_id,
+          file_type: 'image',
+          file: {
+            io: StringIO.new(Base64.decode64(base64_image)),
+            filename: 'image.png'
+          }
+        )
+        message.save!
+      end
+
+      it 'sends the attachment message' do
         stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
           .with(
             headers: stub_headers(whatsapp_channel),
             body: {
-              type: 'text',
               recipient: test_send_phone_number,
-              message: message.content
+              messageContent: { fileName: 'image.png', caption: message.content, image: base64_image }
             }.to_json
           )
           .to_return(
             status: 200,
             headers: { 'Content-Type' => 'application/json' },
-            body: { 'data' => { 'key' => { 'id' => message.id } } }.to_json
+            body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
           )
 
         result = service.send_message(test_send_phone_number, message)
 
-        expect(result).to be message.id
+        expect(result).to eq('msg_123')
       end
-    end
 
-    context 'when response is unsuccessful' do
-      it 'logs the error and returns false' do
-        with_modified_env BAILEYS_PROVIDER_DEFAULT_URL: 'http://test.com' do
+      context 'when request is unsuccessful' do
+        it 'raises MessageNotSentError' do
           stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
-            .with(
-              headers: stub_headers(whatsapp_channel),
-              body: {
-                type: 'text',
-                recipient: test_send_phone_number,
-                message: message.content
-              }.to_json
-            )
             .to_return(
               status: 400,
-              body: 'error message',
-              headers: {}
+              headers: { 'Content-Type' => 'application/json' },
+              body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
             )
-          allow(Rails.logger).to receive(:error).with('error message')
 
-          result = service.send_message(test_send_phone_number, message)
-
-          expect(result).to be_nil
-          expect(Rails.logger).to have_received(:error)
+          expect do
+            service.send_message(test_send_phone_number, message)
+          end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageNotSentError)
         end
       end
     end
 
-    context 'when message content type is not supported' do
-      it 'raises an error' do
-        message.update!(content_type: 'sticker')
+    context 'when message does not have content nor attachments' do
+      it 'updates the message status to failed' do
+        message.update!(content: nil)
+
+        service.send_message(test_send_phone_number, message)
+
+        expect(message.status).to eq('failed')
+      end
+    end
+
+    context 'when message is a text' do
+      it 'sends the message' do
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+          .to_return(
+            status: 200,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
+          )
+
+        result = service.send_message(test_send_phone_number, message)
+
+        expect(result).to eq('msg_123')
+      end
+
+      it 'raises MessageNotSentError' do
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+          .to_return(
+            status: 400,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
+          )
 
         expect do
           service.send_message(test_send_phone_number, message)
-        end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageContentTypeNotSupported)
+        end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageNotSentError)
+      end
+    end
+
+    context "when message doesn't have attachment and content" do
+      it 'does not send the message' do
+        message.update!(content: nil)
+
+        service.send_message(test_send_phone_number, message)
+
+        expect(message.status).to eq('failed')
+        expect(message.content).to eq(I18n.t('errors.messages.send.unsupported'))
       end
     end
   end
@@ -181,27 +221,26 @@ describe Whatsapp::Providers::WhatsappBaileysService do
         expect(service.validate_provider_config?).to be false
         expect(Rails.logger).to have_received(:error)
       end
-    end
-  end
 
-  context 'when provider responds with 5XX' do
-    it 'updated provider connection to close' do
-      whatsapp_channel.update!(provider_connection: { 'connection' => 'open' })
-      allow(HTTParty).to receive(:post).with(
-        "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message",
-        headers: stub_headers(whatsapp_channel),
-        body: {
-          type: 'text',
-          recipient: test_send_phone_number,
-          message: message.content
-        }.to_json
-      ).and_raise(HTTParty::ResponseError.new(OpenStruct.new(status_code: 500)))
+      context 'when provider responds with 5XX' do
+        it 'updated provider connection to close' do
+          whatsapp_channel.update!(provider_connection: { 'connection' => 'open' })
+          allow(HTTParty).to receive(:post).with(
+            "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message",
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              recipient: test_send_phone_number,
+              messageContent: { text: message.content }
+            }.to_json
+          ).and_raise(HTTParty::ResponseError.new(OpenStruct.new(status_code: 500)))
 
-      expect do
-        service.send_message(test_send_phone_number, message)
-      end.to raise_error(HTTParty::ResponseError)
+          expect do
+            service.send_message(test_send_phone_number, message)
+          end.to raise_error(HTTParty::ResponseError)
 
-      expect(whatsapp_channel.provider_connection['connection']).to eq('close')
+          expect(whatsapp_channel.provider_connection['connection']).to eq('close')
+        end
+      end
     end
   end
 

From a1d3d6befe41877dfb991b5283d290176b2f39cf Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 25 Apr 2025 17:16:50 -0300
Subject: [PATCH 30/46] test: fix spec

---
 spec/controllers/webhooks/whatsapp_controller_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/webhooks/whatsapp_controller_spec.rb b/spec/controllers/webhooks/whatsapp_controller_spec.rb
index 296461df4..59541dd60 100644
--- a/spec/controllers/webhooks/whatsapp_controller_spec.rb
+++ b/spec/controllers/webhooks/whatsapp_controller_spec.rb
@@ -81,12 +81,12 @@ RSpec.describe 'Webhooks::WhatsappController', type: :request do
         expect(response).to have_http_status(:unauthorized)
       end
 
-      it 'returns 400 when MessageNotFoundError is raised' do
+      it 'returns 404 when MessageNotFoundError is raised' do
         allow(Webhooks::WhatsappEventsJob).to receive(:perform_now).and_raise(Whatsapp::IncomingMessageBaileysService::MessageNotFoundError)
 
         post '/webhooks/whatsapp/123221321', params: { content: 'hello', awaitResponse: true }
 
-        expect(response).to have_http_status(:bad_request)
+        expect(response).to have_http_status(:not_found)
       end
     end
   end

From 34becba25f529ecff7cca8124438f9df360b323d Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 25 Apr 2025 23:18:47 -0300
Subject: [PATCH 31/46] chore: use FRONTEND_URL_EXTERNAL env var as default url
 options host

---
 config/environments/development.rb | 3 ++-
 config/environments/production.rb  | 3 ++-
 config/environments/staging.rb     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 557000065..7a41f426a 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -34,7 +34,8 @@ Rails.application.configure do
 
   config.active_job.queue_adapter = :sidekiq
 
-  Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
+  host = ENV['FRONTEND_URL_EXTERNAL'].presence || ENV['FRONTEND_URL']
+  Rails.application.routes.default_url_options = { host: host }
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a9504fc5c..303a42fa3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -102,5 +102,6 @@ Rails.application.configure do
   # :sendgrid for Sendgrid
   config.action_mailbox.ingress = ENV.fetch('RAILS_INBOUND_EMAIL_SERVICE', 'relay').to_sym
 
-  Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
+  host = ENV['FRONTEND_URL_EXTERNAL'].presence || ENV['FRONTEND_URL']
+  Rails.application.routes.default_url_options = { host: host }
 end
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index ed7cc0e84..df7fcea00 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -50,7 +50,8 @@ Rails.application.configure do
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "chatwoot_#{Rails.env}"
 
-  Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
+  host = ENV['FRONTEND_URL_EXTERNAL'].presence || ENV['FRONTEND_URL']
+  Rails.application.routes.default_url_options = { host: host }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).

From fd8e099f4dc93aaec37925e58025ef96785cc132 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 25 Apr 2025 23:27:08 -0300
Subject: [PATCH 32/46] fix: compact message content in send_message method and
 add test for empty caption

---
 .../providers/whatsapp_baileys_service.rb     |  2 +-
 .../whatsapp_baileys_service_spec.rb          | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index 718ac83b4..5a230374a 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -107,7 +107,7 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
       content[:video] = buffer
     end
 
-    content
+    content.compact
   end
 
   def send_text_message
diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index 59d503f07..1bc5babf0 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -126,6 +126,27 @@ describe Whatsapp::Providers::WhatsappBaileysService do
         expect(result).to eq('msg_123')
       end
 
+      it 'omits caption if message content is empty' do
+        message.update!(content: nil)
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              recipient: test_send_phone_number,
+              messageContent: { fileName: 'image.png', image: base64_image }
+            }.to_json
+          )
+          .to_return(
+            status: 200,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
+          )
+
+        result = service.send_message(test_send_phone_number, message)
+
+        expect(result).to eq('msg_123')
+      end
+
       context 'when request is unsuccessful' do
         it 'raises MessageNotSentError' do
           stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")

From 8dc893d3225cf62d905efdf3616d2d5acd27303a Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayoproliveira@gmail.com>
Date: Tue, 29 Apr 2025 20:52:09 -0300
Subject: [PATCH 33/46] fix: baileys send message with jid (#32)

* fix: update send_message method to handle  baileys-api send-message changes

* chore: simplify update of is_unsupported

* refactor: remove useless helper

* fix: update send_message method to handle unsupported message content

* chore: handle unsupported message content in send_message method and update message status

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
---
 .../providers/whatsapp_baileys_service.rb     | 40 +++++++------------
 .../whatsapp_baileys_service_spec.rb          | 39 +++++++-----------
 2 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index 5a230374a..cb0ac07c7 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -32,13 +32,17 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
   def send_message(phone_number, message)
     @message = message
     @phone_number = phone_number
+
     if message.attachments.present?
-      send_attachment_message
+      @message_content = attachment_message_content
     elsif message.content.present?
-      send_text_message
+      @message_content = { text: @message.content }
     else
       message.update!(content: I18n.t('errors.messages.send.unsupported'), status: 'failed')
+      return
     end
+
+    send_message_request
   end
 
   def send_template(phone_number, template_info); end
@@ -70,31 +74,15 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
     whatsapp_channel.provider_config['api_key'].presence || DEFAULT_API_KEY
   end
 
-  def send_attachment_message
-    @attachment = @message.attachments.first
-
-    response = HTTParty.post(
-      "#{provider_url}/connections/#{whatsapp_channel.phone_number}/send-message",
-      headers: api_headers,
-      body: {
-        recipient: @phone_number,
-        messageContent: message_content
-      }.to_json
-    )
-
-    return response.parsed_response.dig('data', 'key', 'id') if process_response(response)
-
-    raise MessageNotSentError
-  end
-
-  def message_content
-    buffer = Base64.strict_encode64(@attachment.file.download)
+  def attachment_message_content
+    attachment = @message.attachments.first
+    buffer = Base64.strict_encode64(attachment.file.download)
 
     content = {
-      fileName: @attachment.file.filename,
+      fileName: attachment.file.filename,
       caption: @message.content
     }
-    case @attachment.file_type
+    case attachment.file_type
     when 'image'
       content[:image] = buffer
     when 'audio'
@@ -110,13 +98,13 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
     content.compact
   end
 
-  def send_text_message
+  def send_message_request
     response = HTTParty.post(
       "#{provider_url}/connections/#{whatsapp_channel.phone_number}/send-message",
       headers: api_headers,
       body: {
-        recipient: @phone_number,
-        messageContent: { text: @message.content }
+        jid: "#{@phone_number.delete('+')}@s.whatsapp.net",
+        messageContent: @message_content
       }.to_json
     )
 
diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index 1bc5babf0..0bd66641f 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -7,6 +7,7 @@ describe Whatsapp::Providers::WhatsappBaileysService do
   let(:message) { create(:message) }
 
   let(:test_send_phone_number) { '+5511987654321' }
+  let(:test_send_jid) { '5511987654321@s.whatsapp.net' }
 
   before do
     stub_const('Whatsapp::Providers::WhatsappBaileysService::DEFAULT_CLIENT_NAME', 'chatwoot-test')
@@ -91,6 +92,17 @@ describe Whatsapp::Providers::WhatsappBaileysService do
   end
 
   describe '#send_message' do
+    context 'when message does not have content nor attachments' do
+      it 'updates the message with content attribute is_unsupported' do
+        message.update!(content: nil)
+
+        service.send_message(test_send_phone_number, message)
+
+        expect(message.content).to eq(I18n.t('errors.messages.send.unsupported'))
+        expect(message.status).to eq('failed')
+      end
+    end
+
     context 'when message has attachment' do
       let(:base64_image) { 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=' }
 
@@ -111,7 +123,7 @@ describe Whatsapp::Providers::WhatsappBaileysService do
           .with(
             headers: stub_headers(whatsapp_channel),
             body: {
-              recipient: test_send_phone_number,
+              jid: test_send_jid,
               messageContent: { fileName: 'image.png', caption: message.content, image: base64_image }
             }.to_json
           )
@@ -132,7 +144,7 @@ describe Whatsapp::Providers::WhatsappBaileysService do
           .with(
             headers: stub_headers(whatsapp_channel),
             body: {
-              recipient: test_send_phone_number,
+              jid: test_send_jid,
               messageContent: { fileName: 'image.png', image: base64_image }
             }.to_json
           )
@@ -163,16 +175,6 @@ describe Whatsapp::Providers::WhatsappBaileysService do
       end
     end
 
-    context 'when message does not have content nor attachments' do
-      it 'updates the message status to failed' do
-        message.update!(content: nil)
-
-        service.send_message(test_send_phone_number, message)
-
-        expect(message.status).to eq('failed')
-      end
-    end
-
     context 'when message is a text' do
       it 'sends the message' do
         stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
@@ -200,17 +202,6 @@ describe Whatsapp::Providers::WhatsappBaileysService do
         end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageNotSentError)
       end
     end
-
-    context "when message doesn't have attachment and content" do
-      it 'does not send the message' do
-        message.update!(content: nil)
-
-        service.send_message(test_send_phone_number, message)
-
-        expect(message.status).to eq('failed')
-        expect(message.content).to eq(I18n.t('errors.messages.send.unsupported'))
-      end
-    end
   end
 
   describe '#api_headers' do
@@ -250,7 +241,7 @@ describe Whatsapp::Providers::WhatsappBaileysService do
             "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message",
             headers: stub_headers(whatsapp_channel),
             body: {
-              recipient: test_send_phone_number,
+              jid: test_send_jid,
               messageContent: { text: message.content }
             }.to_json
           ).and_raise(HTTParty::ResponseError.new(OpenStruct.new(status_code: 500)))

From 8e913236e5f238f1ba60fae3618284043708f4c9 Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayo@fazer.ai>
Date: Tue, 29 Apr 2025 20:57:36 -0300
Subject: [PATCH 34/46] feat: baileys messages reactions (#33)

* fix: update send_message method to handle  baileys-api send-message changes

* chore: simplify update of is_unsupported

* feat: add support for message reactions in WhatsApp Baileys service

* chore: update context description for unsupported message in send_message spec

* feat: enhance incoming messages Baileys service to support message reactions and external source ID handling

* fix: correct typo in comment for is_reaction attribute in Message model

* chore: simplify message handling by removing external source ID checks and unused methods

* fix: update comment to reflect necessary change for source_id in set_contact method

* fix: refactor message handling for reactions and simplify jid generation

* fix: add comment to clarify behavior of find_message_by_source_id method

* fix: update unsupported message handling

* chore: specs for reaction messages

* fix: simplify message update handling by removing redundant validation method

* fix: update reaction message handling to use in_reply_to_external_id and fix spec

* fix: enhance message handling for unsupported types and update specs

* fix: update reaction message handling to set is_reaction flag and enhance specs

* fix: update specs for send message in reaction

* revert: remove mb0 from input

* fix: streamline jid generation in send_message_request

* refactor: specs

* refactor: move content attributes to helper

* test: spec for empty reaction

* refactor: streamline references to replied message

* test: refactor spec

* test: refactor spec

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
---
 .../components/widgets/forms/Input.vue        |  1 -
 app/models/message.rb                         |  3 +-
 .../incoming_message_baileys_service.rb       | 24 +++++++---
 .../providers/whatsapp_baileys_service.rb     | 19 +++++++-
 .../incoming_message_baileys_service_spec.rb  | 47 ++++++++++++++++++-
 .../whatsapp_baileys_service_spec.rb          | 37 ++++++++++++++-
 6 files changed, 117 insertions(+), 14 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/forms/Input.vue b/app/javascript/dashboard/components/widgets/forms/Input.vue
index 477aec3dd..b6ee69ec8 100644
--- a/app/javascript/dashboard/components/widgets/forms/Input.vue
+++ b/app/javascript/dashboard/components/widgets/forms/Input.vue
@@ -63,7 +63,6 @@ export default {
   <label class="input-container">
     <span v-if="label">{{ label }}</span>
     <input
-      class="!mb-0"
       :value="modelValue"
       :type="type"
       :placeholder="placeholder"
diff --git a/app/models/message.rb b/app/models/message.rb
index 101b0c176..4b33d53c6 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -101,9 +101,10 @@ class Message < ApplicationRecord
   # [:deleted] : Used to denote whether the message was deleted by the agent
   # [:external_created_at] : Can specify if the message was created at a different timestamp externally
   # [:external_error : Can specify if the message creation failed due to an error at external API
+  # [:is_reaction] : Used to denote if the message is a reaction and differentiate it from a simple reply message
   store :content_attributes, accessors: [:submitted_email, :items, :submitted_values, :email, :in_reply_to, :deleted,
                                          :external_created_at, :story_sender, :story_id, :external_error,
-                                         :translations, :in_reply_to_external_id, :is_unsupported], coder: JSON
+                                         :translations, :in_reply_to_external_id, :is_unsupported, :is_reaction], coder: JSON
 
   store :external_source_ids, accessors: [:slack], coder: JSON, prefix: :external_source_id
 
diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index 41300b982..3b466edc6 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -67,6 +67,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
   def set_contact
     push_name = contact_name
     contact_inbox = ::ContactInboxWithContactBuilder.new(
+      # FIXME: update the source_id to complete jid in future
       source_id: phone_number_from_jid,
       inbox: inbox,
       contact_attributes: { name: push_name, phone_number: "+#{phone_number_from_jid}" }
@@ -100,6 +101,8 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     case message_type
     when 'text'
       create_message
+    when 'reaction'
+      create_message if message_content.present?
     when 'image', 'file', 'video', 'audio', 'sticker'
       create_message
       attach_media
@@ -148,6 +151,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     return 'poll' if msg.key?(:pollCreationMessageV3)
     return 'event' if msg.key?(:eventMessage)
     return 'sticker' if msg.key?(:stickerMessage)
+    return 'reaction' if msg.key?(:reactionMessage)
 
     'unsupported'
   end
@@ -165,10 +169,19 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
       sender: sender,
       sender_type: sender_type,
       message_type: message_type,
-      in_reply_to_external_id: nil
+      content_attributes: message_content_attributes
     )
   end
 
+  def message_content_attributes
+    return unless message_type == 'reaction'
+
+    {
+      in_reply_to_external_id: @raw_message.dig(:message, :reactionMessage, :key, :id),
+      is_reaction: true
+    }
+  end
+
   def incoming?
     !@raw_message[:key][:fromMe]
   end
@@ -231,6 +244,8 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
       @raw_message.dig(:message, :imageMessage, :caption)
     when 'video'
       @raw_message.dig(:message, :videoMessage, :caption)
+    when 'reaction'
+      @raw_message.dig(:message, :reactionMessage, :text)
     end
   end
 
@@ -263,17 +278,12 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
   end
 
   def handle_update
-    raise MessageNotFoundError unless valid_update_message?
+    raise MessageNotFoundError unless find_message_by_source_id(message_id)
 
     update_status if @raw_message.dig(:update, :status).present?
     update_message_content if @raw_message.dig(:update, :message).present?
   end
 
-  def valid_update_message?
-    @message = find_message_by_source_id(message_id)
-    @message.present?
-  end
-
   def update_status
     status = status_mapper
     @message.update!(status: status) if status.present? && status_transition_allowed?(status)
diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index cb0ac07c7..6dd459515 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -33,7 +33,9 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
     @message = message
     @phone_number = phone_number
 
-    if message.attachments.present?
+    if message.content_attributes[:is_reaction]
+      @message_content = reaction_message_content
+    elsif message.attachments.present?
       @message_content = attachment_message_content
     elsif message.content.present?
       @message_content = { text: @message.content }
@@ -74,6 +76,15 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
     whatsapp_channel.provider_config['api_key'].presence || DEFAULT_API_KEY
   end
 
+  def reaction_message_content
+    {
+      react: { key: { id: @message.in_reply_to_external_id,
+                      remoteJid: remote_jid,
+                      fromMe: true },
+               text: @message.content }
+    }
+  end
+
   def attachment_message_content
     attachment = @message.attachments.first
     buffer = Base64.strict_encode64(attachment.file.download)
@@ -103,7 +114,7 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
       "#{provider_url}/connections/#{whatsapp_channel.phone_number}/send-message",
       headers: api_headers,
       body: {
-        jid: "#{@phone_number.delete('+')}@s.whatsapp.net",
+        jid: remote_jid,
         messageContent: @message_content
       }.to_json
     )
@@ -118,6 +129,10 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
     response.success?
   end
 
+  def remote_jid
+    "#{@phone_number.delete('+')}@s.whatsapp.net"
+  end
+
   private_class_method def self.with_error_handling(*method_names)
     method_names.each do |method_name|
       original_method = instance_method(method_name)
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 2eac04a17..580523ccd 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -164,7 +164,7 @@ describe Whatsapp::IncomingMessageBaileysService do
           }
         end
 
-        it 'creates an alert of unsupported message' do
+        it 'creates an unsupported message' do
           described_class.new(inbox: inbox, params: params).perform
 
           conversation = inbox.conversations.last
@@ -373,6 +373,51 @@ describe Whatsapp::IncomingMessageBaileysService do
         end
       end
 
+      context 'when message type is reaction' do
+        let(:phone_number) { '5511912345678' }
+        let(:jid) { "#{phone_number}@s.whatsapp.net" }
+        let(:raw_message) do
+          {
+            key: { id: 'reaction_123', remoteJid: jid, fromMe: false },
+            message: { reactionMessage: { key: { remoteJid: jid, fromMe: true, id: 'msg_123' }, text: '👍' } },
+            pushName: 'John Doe'
+          }
+        end
+        let(:params) do
+          {
+            webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            }
+          }
+        end
+        let!(:message) do
+          contact = create(:contact, account: inbox.account, name: phone_number)
+          contact_inbox = create(:contact_inbox, inbox: inbox, contact: contact, source_id: phone_number)
+          conversation = create(:conversation, inbox: inbox, contact_inbox: contact_inbox)
+          create(:message, inbox: inbox, conversation: conversation, source_id: 'msg_123')
+        end
+
+        it 'creates the reaction' do
+          described_class.new(inbox: inbox, params: params).perform
+
+          reaction = message.conversation.messages.last
+          expect(reaction.is_reaction).to be(true)
+          expect(reaction.in_reply_to).to eq(message.id)
+          expect(reaction.in_reply_to_external_id).to eq(message.source_id)
+        end
+
+        it 'does not create the reaction if content is empty' do
+          raw_message[:message][:reactionMessage][:text] = ''
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(message.conversation.messages.count).to eq(1)
+        end
+      end
+
       context 'when message type is image' do
         let(:raw_message) do
           {
diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index 0bd66641f..e42c03d3c 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -6,8 +6,8 @@ describe Whatsapp::Providers::WhatsappBaileysService do
   let(:whatsapp_channel) { create(:channel_whatsapp, provider: 'baileys', validate_provider_config: false) }
   let(:message) { create(:message) }
 
-  let(:test_send_phone_number) { '+5511987654321' }
-  let(:test_send_jid) { '5511987654321@s.whatsapp.net' }
+  let(:test_send_phone_number) { '551187654321' }
+  let(:test_send_jid) { '551187654321@s.whatsapp.net' }
 
   before do
     stub_const('Whatsapp::Providers::WhatsappBaileysService::DEFAULT_CLIENT_NAME', 'chatwoot-test')
@@ -92,6 +92,39 @@ describe Whatsapp::Providers::WhatsappBaileysService do
   end
 
   describe '#send_message' do
+    context 'when message is a reaction' do
+      let(:inbox) { whatsapp_channel.inbox }
+      let(:contact) { create(:contact, account: inbox.account, name: 'John Doe', phone_number: "+#{test_send_phone_number}") }
+      let(:contact_inbox) { create(:contact_inbox, inbox: inbox, contact: contact, source_id: test_send_phone_number) }
+      let(:conversation) { create(:conversation, inbox: inbox, contact_inbox: contact_inbox) }
+      let!(:message) { create(:message, inbox: inbox, conversation: conversation, sender: contact, source_id: 'msg_123') }
+      let(:reaction) do
+        create(:message, inbox: inbox, conversation: conversation, sender: contact, content: '👍',
+                         content_attributes: { is_reaction: true, in_reply_to: message.id })
+      end
+
+      it 'sends the reaction message' do
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              jid: test_send_jid,
+              messageContent: { react: { key: { id: message.source_id,
+                                                remoteJid: test_send_jid,
+                                                fromMe: true },
+                                         text: '👍' } }
+            }.to_json
+          )
+          .to_return(
+            status: 200,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => 'reaction_123' } } }.to_json
+          )
+
+        result = service.send_message(test_send_phone_number, reaction)
+
+        expect(result).to eq('reaction_123')
+
     context 'when message does not have content nor attachments' do
       it 'updates the message with content attribute is_unsupported' do
         message.update!(content: nil)

From 5440ab3f1380b9bbda7d5cb510f33e38aa84915d Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Tue, 29 Apr 2025 21:43:14 -0300
Subject: [PATCH 35/46] test: fix broken spec file

---
 .../whatsapp_baileys_service_spec.rb          | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index e42c03d3c..ec0d1e01f 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -92,39 +92,6 @@ describe Whatsapp::Providers::WhatsappBaileysService do
   end
 
   describe '#send_message' do
-    context 'when message is a reaction' do
-      let(:inbox) { whatsapp_channel.inbox }
-      let(:contact) { create(:contact, account: inbox.account, name: 'John Doe', phone_number: "+#{test_send_phone_number}") }
-      let(:contact_inbox) { create(:contact_inbox, inbox: inbox, contact: contact, source_id: test_send_phone_number) }
-      let(:conversation) { create(:conversation, inbox: inbox, contact_inbox: contact_inbox) }
-      let!(:message) { create(:message, inbox: inbox, conversation: conversation, sender: contact, source_id: 'msg_123') }
-      let(:reaction) do
-        create(:message, inbox: inbox, conversation: conversation, sender: contact, content: '👍',
-                         content_attributes: { is_reaction: true, in_reply_to: message.id })
-      end
-
-      it 'sends the reaction message' do
-        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
-          .with(
-            headers: stub_headers(whatsapp_channel),
-            body: {
-              jid: test_send_jid,
-              messageContent: { react: { key: { id: message.source_id,
-                                                remoteJid: test_send_jid,
-                                                fromMe: true },
-                                         text: '👍' } }
-            }.to_json
-          )
-          .to_return(
-            status: 200,
-            headers: { 'Content-Type' => 'application/json' },
-            body: { 'data' => { 'key' => { 'id' => 'reaction_123' } } }.to_json
-          )
-
-        result = service.send_message(test_send_phone_number, reaction)
-
-        expect(result).to eq('reaction_123')
-
     context 'when message does not have content nor attachments' do
       it 'updates the message with content attribute is_unsupported' do
         message.update!(content: nil)
@@ -235,6 +202,41 @@ describe Whatsapp::Providers::WhatsappBaileysService do
         end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageNotSentError)
       end
     end
+
+    context 'when message is a reaction' do
+      let(:inbox) { whatsapp_channel.inbox }
+      let(:contact) { create(:contact, account: inbox.account, name: 'John Doe', phone_number: "+#{test_send_phone_number}") }
+      let(:contact_inbox) { create(:contact_inbox, inbox: inbox, contact: contact, source_id: test_send_phone_number) }
+      let(:conversation) { create(:conversation, inbox: inbox, contact_inbox: contact_inbox) }
+      let!(:message) { create(:message, inbox: inbox, conversation: conversation, sender: contact, source_id: 'msg_123') }
+      let(:reaction) do
+        create(:message, inbox: inbox, conversation: conversation, sender: contact, content: '👍',
+                         content_attributes: { is_reaction: true, in_reply_to: message.id })
+      end
+
+      it 'sends the reaction message' do
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              jid: test_send_jid,
+              messageContent: { react: { key: { id: message.source_id,
+                                                remoteJid: test_send_jid,
+                                                fromMe: true },
+                                         text: '👍' } }
+            }.to_json
+          )
+          .to_return(
+            status: 200,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => 'reaction_123' } } }.to_json
+          )
+
+        result = service.send_message(test_send_phone_number, reaction)
+
+        expect(result).to eq('reaction_123')
+      end
+    end
   end
 
   describe '#api_headers' do

From 391407eedfab40b8de1361b59f5f1a0f8638ccf8 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Tue, 29 Apr 2025 21:43:30 -0300
Subject: [PATCH 36/46] fix: content attributes handling on message builder

---
 app/builders/messages/message_builder.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index e1087b19f..389cbf089 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -2,7 +2,7 @@ class Messages::MessageBuilder
   include ::FileTypeHelper
   attr_reader :message
 
-  def initialize(user, conversation, params)
+  def initialize(user, conversation, params) # rubocop:disable Metrics/CyclomaticComplexity
     @params = params
     @private = params[:private] || false
     @conversation = conversation
@@ -13,6 +13,7 @@ class Messages::MessageBuilder
     return unless params.instance_of?(ActionController::Parameters)
 
     @in_reply_to = content_attributes&.dig(:in_reply_to)
+    @is_reaction = content_attributes&.dig(:is_reaction)
     @items = content_attributes&.dig(:items)
   end
 
@@ -149,6 +150,7 @@ class Messages::MessageBuilder
       content_type: @params[:content_type],
       items: @items,
       in_reply_to: @in_reply_to,
+      is_reaction: @is_reaction,
       echo_id: @params[:echo_id],
       source_id: @params[:source_id]
     }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id).merge(template_params)

From 1e679146f740b425ed04ae98822046625f763aed Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Tue, 29 Apr 2025 21:57:32 -0300
Subject: [PATCH 37/46] fix: `fromMe` field based on message type

---
 app/services/whatsapp/providers/whatsapp_baileys_service.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index 6dd459515..e4f1ce2cf 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -77,10 +77,11 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
   end
 
   def reaction_message_content
+    reply_to = Message.find(@message.in_reply_to)
     {
-      react: { key: { id: @message.in_reply_to_external_id,
+      react: { key: { id: reply_to.source_id,
                       remoteJid: remote_jid,
-                      fromMe: true },
+                      fromMe: reply_to.message_type == 'outgoing' },
                text: @message.content }
     }
   end

From 669e60d9ca38a95e4d6ac58d4fc151c2f286dc3c Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Tue, 29 Apr 2025 22:18:08 -0300
Subject: [PATCH 38/46] test: improved spec for reaction message building

---
 .../whatsapp_baileys_service_spec.rb          | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index ec0d1e01f..04341f497 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -205,16 +205,17 @@ describe Whatsapp::Providers::WhatsappBaileysService do
 
     context 'when message is a reaction' do
       let(:inbox) { whatsapp_channel.inbox }
+      let(:account_user) { create(:account_user, account: inbox.account) }
       let(:contact) { create(:contact, account: inbox.account, name: 'John Doe', phone_number: "+#{test_send_phone_number}") }
-      let(:contact_inbox) { create(:contact_inbox, inbox: inbox, contact: contact, source_id: test_send_phone_number) }
-      let(:conversation) { create(:conversation, inbox: inbox, contact_inbox: contact_inbox) }
-      let!(:message) { create(:message, inbox: inbox, conversation: conversation, sender: contact, source_id: 'msg_123') }
-      let(:reaction) do
-        create(:message, inbox: inbox, conversation: conversation, sender: contact, content: '👍',
-                         content_attributes: { is_reaction: true, in_reply_to: message.id })
+      let(:conversation) do
+        contact_inbox = create(:contact_inbox, inbox: inbox, contact: contact, source_id: test_send_phone_number)
+        create(:conversation, inbox: inbox, contact_inbox: contact_inbox)
       end
 
-      it 'sends the reaction message' do
+      it 'sends the reaction message for outgoing message' do
+        message = create(:message, inbox: inbox, conversation: conversation, sender: account_user, message_type: 'outgoing', source_id: 'msg_123')
+        reaction = create(:message, inbox: inbox, conversation: conversation, sender: account_user, content: '👍',
+                                    content_attributes: { is_reaction: true, in_reply_to: message.id })
         stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
           .with(
             headers: stub_headers(whatsapp_channel),
@@ -236,6 +237,32 @@ describe Whatsapp::Providers::WhatsappBaileysService do
 
         expect(result).to eq('reaction_123')
       end
+
+      it 'sends the reaction message for incoming message' do
+        message = create(:message, inbox: inbox, conversation: conversation, sender: contact, source_id: 'msg_123')
+        reaction = create(:message, inbox: inbox, conversation: conversation, sender: account_user, content: '👍',
+                                    content_attributes: { is_reaction: true, in_reply_to: message.id })
+        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              jid: test_send_jid,
+              messageContent: { react: { key: { id: message.source_id,
+                                                remoteJid: test_send_jid,
+                                                fromMe: false },
+                                         text: '👍' } }
+            }.to_json
+          )
+          .to_return(
+            status: 200,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => 'reaction_123' } } }.to_json
+          )
+
+        result = service.send_message(test_send_phone_number, reaction)
+
+        expect(result).to eq('reaction_123')
+      end
     end
   end
 

From a52a4cf8cefec88c3060327e9e02ae2060486faf Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayo@fazer.ai>
Date: Wed, 30 Apr 2025 21:33:53 -0300
Subject: [PATCH 39/46] fix: ignore protocolMessages (#34)

* fix: handle protocol messages in IncomingMessageBaileysService and ignore it

* fix: ignore protocol messages before create conversation and contact

* chore: update test description for contact inbox and message creation

* chore: simplify protocol message check in handle_message method
---
 .../incoming_message_baileys_service.rb       | 10 +++-----
 .../incoming_message_baileys_service_spec.rb  | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index 3b466edc6..9b9501024 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -50,6 +50,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
   def handle_message
     return if jid_type != 'user'
     return if find_message_by_source_id(message_id) || message_under_process?
+    return if message_type == 'protocol'
 
     cache_message_source_id_in_redis
     set_contact
@@ -106,7 +107,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     when 'image', 'file', 'video', 'audio', 'sticker'
       create_message
       attach_media
-    else
+    when 'unsupported'
       create_unsupported_message
       Rails.logger.warn "Baileys unsupported message type: #{message_type}"
     end
@@ -140,18 +141,13 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     msg = @raw_message[:message]
 
     return 'text' if msg.key?(:conversation) || msg.dig(:extendedTextMessage, :text).present?
-    return 'contacts' if msg.key?(:contactMessage)
     return 'image' if msg.key?(:imageMessage)
     return 'audio' if msg.key?(:audioMessage)
     return 'video' if msg.key?(:videoMessage)
-    return 'video_note' if msg.key?(:ptvMessage)
-    return 'location' if msg.key?(:locationMessage)
-    return 'live_location' if msg.key?(:liveLocationMessage)
     return 'file' if msg.key?(:documentMessage)
-    return 'poll' if msg.key?(:pollCreationMessageV3)
-    return 'event' if msg.key?(:eventMessage)
     return 'sticker' if msg.key?(:stickerMessage)
     return 'reaction' if msg.key?(:reactionMessage)
+    return 'protocol' if msg.key?(:protocolMessage)
 
     'unsupported'
   end
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 580523ccd..9b7013c16 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -185,6 +185,29 @@ describe Whatsapp::IncomingMessageBaileysService do
         end
       end
 
+      context 'when message is protocol message' do
+        let(:raw_message) do
+          { key: { id: 'msg_123', remoteJid: '5511912345678@s.whatsapp.net', fromMe: false },
+            message: { protocolMessage: { type: 1 } },
+            pushName: 'John Doe' }
+        end
+        let(:params) do
+          { webhookVerifyToken: webhook_verify_token,
+            event: 'messages.upsert',
+            data: {
+              type: 'notify',
+              messages: [raw_message]
+            } }
+        end
+
+        it 'does not create contact inbox nor message' do
+          described_class.new(inbox: inbox, params: params).perform
+
+          expect(inbox.contact_inboxes.count).to be(0)
+          expect(inbox.messages.count).to be(0)
+        end
+      end
+
       context 'when message is not from a user' do
         let(:raw_message) do
           {

From b764f3997d882d3a8032a1c1bd748942b127aed0 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Fri, 2 May 2025 19:51:43 -0300
Subject: [PATCH 40/46] feat: mark recorded audio messages (#36)

* feat: mark recorded audio

* refactor: cleaner logic for message builder metadata

* test: message builder specs

* test: baileys service specs

* fix: correct method call for checking attachment filename in process_metadata
---
 app/builders/messages/message_builder.rb      |   7 +-
 app/javascript/dashboard/api/inbox/message.js |   4 +
 .../widgets/conversation/ReplyBox.vue         |   6 +
 .../providers/whatsapp_baileys_service.rb     |   3 +-
 .../builders/messages/message_builder_spec.rb |   8 ++
 .../whatsapp_baileys_service_spec.rb          | 105 +++++++++++++-----
 6 files changed, 101 insertions(+), 32 deletions(-)

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index 389cbf089..7a8578fdd 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -9,6 +9,7 @@ class Messages::MessageBuilder
     @user = user
     @message_type = params[:message_type] || 'outgoing'
     @attachments = params[:attachments]
+    @is_recorded_audio = params[:is_recorded_audio]
     @automation_rule = content_attributes&.dig(:automation_rule_id)
     return unless params.instance_of?(ActionController::Parameters)
 
@@ -67,7 +68,7 @@ class Messages::MessageBuilder
         account_id: @message.account_id,
         file: uploaded_attachment
       )
-
+      attachment.meta = process_metadata(uploaded_attachment)
       attachment.file_type = if uploaded_attachment.is_a?(String)
                                file_type_by_signed_id(
                                  uploaded_attachment
@@ -78,6 +79,10 @@ class Messages::MessageBuilder
     end
   end
 
+  def process_metadata(attachment)
+    { is_recorded_audio: true } if @is_recorded_audio && attachment.original_filename.in?(@is_recorded_audio)
+  end
+
   def process_emails
     return unless @conversation.inbox&.inbox_type == 'Email'
 
diff --git a/app/javascript/dashboard/api/inbox/message.js b/app/javascript/dashboard/api/inbox/message.js
index 8f294a0ee..80534524e 100644
--- a/app/javascript/dashboard/api/inbox/message.js
+++ b/app/javascript/dashboard/api/inbox/message.js
@@ -8,6 +8,7 @@ export const buildCreatePayload = ({
   contentAttributes,
   echoId,
   files,
+  isRecordedAudio,
   ccEmails = '',
   bccEmails = '',
   toEmails = '',
@@ -22,6 +23,7 @@ export const buildCreatePayload = ({
     files.forEach(file => {
       payload.append('attachments[]', file);
     });
+    payload.append('is_recorded_audio', JSON.stringify(isRecordedAudio));
     payload.append('private', isPrivate);
     payload.append('echo_id', echoId);
     payload.append('cc_emails', ccEmails);
@@ -60,6 +62,7 @@ class MessageApi extends ApiClient {
     contentAttributes,
     echo_id: echoId,
     files,
+    isRecordedAudio,
     ccEmails = '',
     bccEmails = '',
     toEmails = '',
@@ -74,6 +77,7 @@ class MessageApi extends ApiClient {
         contentAttributes,
         echoId,
         files,
+        isRecordedAudio,
         ccEmails,
         bccEmails,
         toEmails,
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 4fa83e029..5323b3e2a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -1012,11 +1012,17 @@ export default {
 
       if (this.attachedFiles && this.attachedFiles.length) {
         messagePayload.files = [];
+        messagePayload.isRecordedAudio = [];
         this.attachedFiles.forEach(attachment => {
           if (this.globalConfig.directUploadsEnabled) {
             messagePayload.files.push(attachment.blobSignedId);
           } else {
             messagePayload.files.push(attachment.resource.file);
+            if (attachment.isRecordedAudio) {
+              messagePayload.isRecordedAudio.push(
+                attachment.resource.file.name
+              );
+            }
           }
         });
       }
diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index e4f1ce2cf..5984dd8b6 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -86,7 +86,7 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
     }
   end
 
-  def attachment_message_content
+  def attachment_message_content # rubocop:disable Metrics/MethodLength
     attachment = @message.attachments.first
     buffer = Base64.strict_encode64(attachment.file.download)
 
@@ -99,6 +99,7 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
       content[:image] = buffer
     when 'audio'
       content[:audio] = buffer
+      content[:ptt] = attachment.meta['is_recorded_audio']
     when 'file'
       content[:document] = buffer
     when 'sticker'
diff --git a/spec/builders/messages/message_builder_spec.rb b/spec/builders/messages/message_builder_spec.rb
index 891f8eb02..aab3e2a09 100644
--- a/spec/builders/messages/message_builder_spec.rb
+++ b/spec/builders/messages/message_builder_spec.rb
@@ -134,6 +134,14 @@ describe Messages::MessageBuilder do
         expect(message.attachments.first.file_type).to eq 'image'
       end
 
+      it 'creates attachment with is_recorded_audio metadata' do
+        params[:is_recorded_audio] = ['avatar.png']
+
+        message = message_builder
+
+        expect(message.attachments.first.meta).to eq({ 'is_recorded_audio' => true })
+      end
+
       context 'when DIRECT_UPLOAD_ENABLED' do
         let(:params) do
           ActionController::Parameters.new({
diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index 04341f497..365998b61 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -92,6 +92,8 @@ describe Whatsapp::Providers::WhatsappBaileysService do
   end
 
   describe '#send_message' do
+    let(:request_path) { "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message" }
+
     context 'when message does not have content nor attachments' do
       it 'updates the message with content attribute is_unsupported' do
         message.update!(content: nil)
@@ -107,7 +109,7 @@ describe Whatsapp::Providers::WhatsappBaileysService do
       let(:base64_image) { 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=' }
 
       before do
-        message.attachments.new(
+        message.attachments.create!(
           account_id: message.account_id,
           file_type: 'image',
           file: {
@@ -115,11 +117,10 @@ describe Whatsapp::Providers::WhatsappBaileysService do
             filename: 'image.png'
           }
         )
-        message.save!
       end
 
       it 'sends the attachment message' do
-        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+        stub_request(:post, request_path)
           .with(
             headers: stub_headers(whatsapp_channel),
             body: {
@@ -140,7 +141,7 @@ describe Whatsapp::Providers::WhatsappBaileysService do
 
       it 'omits caption if message content is empty' do
         message.update!(content: nil)
-        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+        stub_request(:post, request_path)
           .with(
             headers: stub_headers(whatsapp_channel),
             body: {
@@ -158,26 +159,31 @@ describe Whatsapp::Providers::WhatsappBaileysService do
 
         expect(result).to eq('msg_123')
       end
-
-      context 'when request is unsuccessful' do
-        it 'raises MessageNotSentError' do
-          stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
-            .to_return(
-              status: 400,
-              headers: { 'Content-Type' => 'application/json' },
-              body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
-            )
-
-          expect do
-            service.send_message(test_send_phone_number, message)
-          end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageNotSentError)
-        end
-      end
     end
 
-    context 'when message is a text' do
-      it 'sends the message' do
-        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+    context 'when message is an audio file' do
+      let(:base64_audio) { 'UklGRiQAAABXQVZFZm10IBAAAAABAAEAQB8AAEAfAAABAAgAZGF0YQAAAAA=' }
+
+      before do
+        message.attachments.create!(
+          account_id: message.account_id,
+          file_type: 'audio',
+          file: {
+            io: StringIO.new(Base64.decode64(base64_audio)),
+            filename: 'audio.wav'
+          }
+        )
+      end
+
+      it 'sends the audio message' do
+        stub_request(:post, request_path)
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              jid: test_send_jid,
+              messageContent: { fileName: 'audio.wav', caption: message.content, audio: base64_audio }
+            }.to_json
+          )
           .to_return(
             status: 200,
             headers: { 'Content-Type' => 'application/json' },
@@ -189,17 +195,41 @@ describe Whatsapp::Providers::WhatsappBaileysService do
         expect(result).to eq('msg_123')
       end
 
-      it 'raises MessageNotSentError' do
-        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+      it 'sends message with ptt true if message is recorded audio' do
+        message.attachments.first.update!(meta: { is_recorded_audio: true })
+
+        stub_request(:post, request_path)
+          .with(
+            headers: stub_headers(whatsapp_channel),
+            body: {
+              jid: test_send_jid,
+              messageContent: { fileName: 'audio.wav', caption: message.content, audio: base64_audio, ptt: true }
+            }.to_json
+          )
           .to_return(
-            status: 400,
+            status: 200,
             headers: { 'Content-Type' => 'application/json' },
             body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
           )
 
-        expect do
-          service.send_message(test_send_phone_number, message)
-        end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageNotSentError)
+        result = service.send_message(test_send_phone_number, message)
+
+        expect(result).to eq('msg_123')
+      end
+    end
+
+    context 'when message is a text' do
+      it 'sends the message' do
+        stub_request(:post, request_path)
+          .to_return(
+            status: 200,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
+          )
+
+        result = service.send_message(test_send_phone_number, message)
+
+        expect(result).to eq('msg_123')
       end
     end
 
@@ -216,7 +246,7 @@ describe Whatsapp::Providers::WhatsappBaileysService do
         message = create(:message, inbox: inbox, conversation: conversation, sender: account_user, message_type: 'outgoing', source_id: 'msg_123')
         reaction = create(:message, inbox: inbox, conversation: conversation, sender: account_user, content: '👍',
                                     content_attributes: { is_reaction: true, in_reply_to: message.id })
-        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+        stub_request(:post, request_path)
           .with(
             headers: stub_headers(whatsapp_channel),
             body: {
@@ -242,7 +272,7 @@ describe Whatsapp::Providers::WhatsappBaileysService do
         message = create(:message, inbox: inbox, conversation: conversation, sender: contact, source_id: 'msg_123')
         reaction = create(:message, inbox: inbox, conversation: conversation, sender: account_user, content: '👍',
                                     content_attributes: { is_reaction: true, in_reply_to: message.id })
-        stub_request(:post, "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/send-message")
+        stub_request(:post, request_path)
           .with(
             headers: stub_headers(whatsapp_channel),
             body: {
@@ -264,6 +294,21 @@ describe Whatsapp::Providers::WhatsappBaileysService do
         expect(result).to eq('reaction_123')
       end
     end
+
+    context 'when request is unsuccessful' do
+      it 'raises MessageNotSentError' do
+        stub_request(:post, request_path)
+          .to_return(
+            status: 400,
+            headers: { 'Content-Type' => 'application/json' },
+            body: { 'data' => { 'key' => { 'id' => 'msg_123' } } }.to_json
+          )
+
+        expect do
+          service.send_message(test_send_phone_number, message)
+        end.to raise_error(Whatsapp::Providers::WhatsappBaileysService::MessageNotSentError)
+      end
+    end
   end
 
   describe '#api_headers' do

From 413078af195af64105aacce262779ec09d82d699 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 2 May 2025 19:57:19 -0300
Subject: [PATCH 41/46] chore: apply rubocop

---
 .../services/internal/accounts/internal_attributes_service.rb | 2 +-
 .../internal/accounts/internal_attributes_service_spec.rb     | 4 ++--
 .../crm/leadsquared/mappers/conversation_mapper_spec.rb       | 2 +-
 spec/services/crm/leadsquared/processor_service_spec.rb       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/enterprise/app/services/internal/accounts/internal_attributes_service.rb b/enterprise/app/services/internal/accounts/internal_attributes_service.rb
index 7bc69d0a4..b97493dce 100644
--- a/enterprise/app/services/internal/accounts/internal_attributes_service.rb
+++ b/enterprise/app/services/internal/accounts/internal_attributes_service.rb
@@ -26,7 +26,7 @@ class Internal::Accounts::InternalAttributesService
 
     # Update the account
     account.internal_attributes = new_attrs
-    account.save
+    account.save!
   end
 
   # Get manually managed features
diff --git a/spec/enterprise/services/internal/accounts/internal_attributes_service_spec.rb b/spec/enterprise/services/internal/accounts/internal_attributes_service_spec.rb
index 8411bb823..e2ec89342 100644
--- a/spec/enterprise/services/internal/accounts/internal_attributes_service_spec.rb
+++ b/spec/enterprise/services/internal/accounts/internal_attributes_service_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe Internal::Accounts::InternalAttributesService do
     end
 
     it 'creates internal_attributes hash if it is empty' do
-      account.update(internal_attributes: {})
+      account.update!(internal_attributes: {})
 
       # Stub the validation to allow our test key
       allow(service).to receive(:validate_key!).and_return(true)
@@ -60,7 +60,7 @@ RSpec.describe Internal::Accounts::InternalAttributesService do
     end
 
     it 'returns the features when they are set' do
-      account.update(internal_attributes: { 'manually_managed_features' => %w[feature1 feature2] })
+      account.update!(internal_attributes: { 'manually_managed_features' => %w[feature1 feature2] })
 
       expect(service.manually_managed_features).to eq(%w[feature1 feature2])
     end
diff --git a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
index 29f7136f1..85bb08d74 100644
--- a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
+++ b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
@@ -183,7 +183,7 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
         expect(result.length).to be <= described_class::ACTIVITY_NOTE_MAX_SIZE + 100
 
         # Verify that not all messages are included (some were truncated)
-        expect(messages.count).to be > result.scan(/John Doe:/).count
+        expect(messages.count).to be > result.scan('John Doe:').count
       end
 
       it 'respects the ACTIVITY_NOTE_MAX_SIZE constant' do
diff --git a/spec/services/crm/leadsquared/processor_service_spec.rb b/spec/services/crm/leadsquared/processor_service_spec.rb
index efdead00b..d51881fdc 100644
--- a/spec/services/crm/leadsquared/processor_service_spec.rb
+++ b/spec/services/crm/leadsquared/processor_service_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe Crm::Leadsquared::ProcessorService do
 
       context 'when contact has no stored lead ID' do
         before do
-          contact.update(additional_attributes: { 'external' => nil })
+          contact.update!(additional_attributes: { 'external' => nil })
           contact.reload
 
           allow(lead_client).to receive(:create_or_update_lead)

From add11d29c1c195bc63cc0cea6e3ff102d46b1a7b Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 2 May 2025 20:44:10 -0300
Subject: [PATCH 42/46] chore: drop `FRONTEND_URL_EXTERNAL` var

---
 .env.example                              |  3 ---
 app/helpers/frontend_urls_helper.rb       |  2 +-
 app/models/channel/whatsapp.rb            |  4 ++++
 app/models/inbox.rb                       | 10 ++++++----
 config/environments/development.rb        |  3 +--
 config/environments/production.rb         |  3 +--
 config/environments/staging.rb            |  3 +--
 spec/helpers/frontend_urls_helper_spec.rb |  8 --------
 8 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.env.example b/.env.example
index 443baeb57..cd20ca72a 100644
--- a/.env.example
+++ b/.env.example
@@ -258,9 +258,6 @@ AZURE_APP_SECRET=
 # contact_inboxes with no conversation older than 90 days will be removed
 # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
 
-# NOTE: Useful when running inside docker-compose network to link to external domain
-FRONTEND_URL_EXTERNAL=
-
 # Baileys API Whatsapp provider
 BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=Chatwoot
 BAILEYS_PROVIDER_DEFAULT_URL=http://localhost:3025
diff --git a/app/helpers/frontend_urls_helper.rb b/app/helpers/frontend_urls_helper.rb
index 67b117f06..967483c7b 100644
--- a/app/helpers/frontend_urls_helper.rb
+++ b/app/helpers/frontend_urls_helper.rb
@@ -1,7 +1,7 @@
 module FrontendUrlsHelper
   def frontend_url(path, **query_params)
     url_params = query_params.blank? ? '' : "?#{query_params.to_query}"
-    host = ENV.fetch('FRONTEND_URL_EXTERNAL', root_url)
+    host = ENV.fetch('FRONTEND_URL', root_url)
     host = "#{host}/" unless host.end_with?('/')
     "#{host}app/#{path}#{url_params}"
   end
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 849ed1ca8..41d1a5960 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -54,6 +54,10 @@ class Channel::Whatsapp < ApplicationRecord
     end
   end
 
+  def use_internal_host?
+    provider == 'baileys' && ENV.fetch('BAILEYS_PROVIDER_USE_INTERNAL_HOST_URL', false)
+  end
+
   def mark_message_templates_updated
     # rubocop:disable Rails/SkipsModelValidations
     update_column(:message_templates_last_updated, Time.zone.now)
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 20c8dc610..8c4236b2d 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -159,15 +159,17 @@ class Inbox < ApplicationRecord
   end
 
   def callback_webhook_url
+    host = ENV.fetch('FRONTEND_URL', nil)
     case channel_type
     when 'Channel::TwilioSms'
-      "#{ENV.fetch('FRONTEND_URL', nil)}/twilio/callback"
+      "#{host}/twilio/callback"
     when 'Channel::Sms'
-      "#{ENV.fetch('FRONTEND_URL', nil)}/webhooks/sms/#{channel.phone_number.delete_prefix('+')}"
+      "#{host}/webhooks/sms/#{channel.phone_number.delete_prefix('+')}"
     when 'Channel::Line'
-      "#{ENV.fetch('FRONTEND_URL', nil)}/webhooks/line/#{channel.line_channel_id}"
+      "#{host}/webhooks/line/#{channel.line_channel_id}"
     when 'Channel::Whatsapp'
-      "#{ENV.fetch('FRONTEND_URL', nil)}/webhooks/whatsapp/#{channel.phone_number}"
+      host = ENV.fetch('INTERNAL_HOST_URL', nil) if channel.use_internal_host?
+      "#{host}/webhooks/whatsapp/#{channel.phone_number}"
     end
   end
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7a41f426a..557000065 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -34,8 +34,7 @@ Rails.application.configure do
 
   config.active_job.queue_adapter = :sidekiq
 
-  host = ENV['FRONTEND_URL_EXTERNAL'].presence || ENV['FRONTEND_URL']
-  Rails.application.routes.default_url_options = { host: host }
+  Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 303a42fa3..a9504fc5c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -102,6 +102,5 @@ Rails.application.configure do
   # :sendgrid for Sendgrid
   config.action_mailbox.ingress = ENV.fetch('RAILS_INBOUND_EMAIL_SERVICE', 'relay').to_sym
 
-  host = ENV['FRONTEND_URL_EXTERNAL'].presence || ENV['FRONTEND_URL']
-  Rails.application.routes.default_url_options = { host: host }
+  Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
 end
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index df7fcea00..ed7cc0e84 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -50,8 +50,7 @@ Rails.application.configure do
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "chatwoot_#{Rails.env}"
 
-  host = ENV['FRONTEND_URL_EXTERNAL'].presence || ENV['FRONTEND_URL']
-  Rails.application.routes.default_url_options = { host: host }
+  Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
diff --git a/spec/helpers/frontend_urls_helper_spec.rb b/spec/helpers/frontend_urls_helper_spec.rb
index beefd23e6..c522d0ee9 100644
--- a/spec/helpers/frontend_urls_helper_spec.rb
+++ b/spec/helpers/frontend_urls_helper_spec.rb
@@ -13,13 +13,5 @@ describe FrontendUrlsHelper do
         expect(helper.frontend_url('dashboard', p1: 'p1', p2: 'p2')).to eq 'http://test.host/app/dashboard?p1=p1&p2=p2'
       end
     end
-
-    context 'with set FRONTEND_URL_EXTERNAL' do
-      it 'creates path correctly' do
-        with_modified_env 'FRONTEND_URL_EXTERNAL' => 'http://external.url/' do
-          expect(helper.frontend_url('dashboard')).to eq 'http://external.url/app/dashboard'
-        end
-      end
-    end
   end
 end

From 312c35fe9a68188af04e7207aca3b31bf15f3df1 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 2 May 2025 22:09:53 -0300
Subject: [PATCH 43/46] chore: update compose file

---
 docker-compose.coolify.yaml | 40 +++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/docker-compose.coolify.yaml b/docker-compose.coolify.yaml
index 3ce039a5a..f0dfd9b82 100644
--- a/docker-compose.coolify.yaml
+++ b/docker-compose.coolify.yaml
@@ -14,14 +14,19 @@ services:
       - RAILS_ENV=production
       - INSTALLATION_ENV=docker
       - FRONTEND_URL=${FRONTEND_URL}
-      - FRONTEND_URL_EXTERNAL=${FRONTEND_URL_EXTERNAL}
+      - INTERNAL_HOST_URL=${INTERNAL_HOST_URL}
+      - POSTGRES_HOST=postgres
+      - POSTGRES_PORT=5432
+      - POSTGRES_USERNAME=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DATABASE=${POSTGRES_DB:-chatwoot_production}
+      - SECRET_KEY_BASE=${SERVICE_PASSWORD_64_SECRETKEYBASE}
       - REDIS_URL=redis://redis:6379
-      - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/chatwoot_production
-      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
-      - REDIS_PASSWORD=${REDIS_PASSWORD}
+      - REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}
       - BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=${BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME}
       - BAILEYS_PROVIDER_DEFAULT_URL=${BAILEYS_PROVIDER_DEFAULT_URL}
       - BAILEYS_PROVIDER_DEFAULT_API_KEY=${BAILEYS_PROVIDER_DEFAULT_API_KEY}
+      - BAILEYS_PROVIDER_USE_INTERNAL_HOST_URL=true
       - MAILER_SENDER_EMAIL=${MAILER_SENDER_EMAIL}
       - RESEND_API_KEY=${RESEND_API_KEY}
     entrypoint: docker/entrypoints/rails.sh
@@ -62,14 +67,19 @@ services:
       - RAILS_ENV=production
       - INSTALLATION_ENV=docker
       - FRONTEND_URL=${FRONTEND_URL}
-      - FRONTEND_URL_EXTERNAL=${FRONTEND_URL_EXTERNAL}
+      - INTERNAL_HOST_URL=${INTERNAL_HOST_URL}
+      - POSTGRES_HOST=postgres
+      - POSTGRES_PORT=5432
+      - POSTGRES_USERNAME=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DATABASE=${POSTGRES_DB:-chatwoot_production}
+      - SECRET_KEY_BASE=${SERVICE_PASSWORD_64_SECRETKEYBASE}
       - REDIS_URL=redis://redis:6379
-      - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/chatwoot_production
-      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
-      - REDIS_PASSWORD=${REDIS_PASSWORD}
+      - REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}
       - BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=${BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME}
       - BAILEYS_PROVIDER_DEFAULT_URL=${BAILEYS_PROVIDER_DEFAULT_URL}
       - BAILEYS_PROVIDER_DEFAULT_API_KEY=${BAILEYS_PROVIDER_DEFAULT_API_KEY}
+      - BAILEYS_PROVIDER_USE_INTERNAL_HOST_URL=true
       - MAILER_SENDER_EMAIL=${MAILER_SENDER_EMAIL}
       - RESEND_API_KEY=${RESEND_API_KEY}
     command:
@@ -93,13 +103,13 @@ services:
     volumes:
       - 'postgres:/var/lib/postgresql/data'
     environment:
-      - POSTGRES_DB=chatwoot_production
-      - POSTGRES_USERNAME=postgres
-      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=${POSTGRES_DB:-chatwoot_production}
+      - POSTGRES_USERNAME=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
     healthcheck:
       test:
         - CMD-SHELL
-        - 'pg_isready -h localhost -p 5432 -U postgres'
+        - 'pg_isready -h localhost -p 5432 -U $${POSTGRES_USERNAME} -d $${POSTGRES_DB}'
       interval: 20s
       timeout: 20s
       retries: 10
@@ -110,15 +120,15 @@ services:
     command:
       - sh
       - '-c'
-      - 'redis-server --requirepass "$REDIS_PASSWORD"'
+      - 'redis-server --requirepass "${SERVICE_PASSWORD_REDIS}"'
     volumes:
       - 'redis:/data'
     environment:
-      - REDIS_PASSWORD=${REDIS_PASSWORD}
+      - REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}
     healthcheck:
       test:
         - CMD-SHELL
-        - 'redis-cli -h localhost -p 6379 -a $REDIS_PASSWORD ping'
+        - 'redis-cli -h localhost -p 6379 -a $${REDIS_PASSWORD} ping'
       interval: 20s
       timeout: 20s
       retries: 10

From 81d62d94f1b30dfb46f22fa9b3f668d59920fc27 Mon Sep 17 00:00:00 2001
From: gabrieljablonski <contact@gabrieljablonski.com>
Date: Fri, 2 May 2025 22:19:20 -0300
Subject: [PATCH 44/46] fix: nil reference to metadata

---
 app/services/whatsapp/providers/whatsapp_baileys_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index 5984dd8b6..dc0702a90 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -99,7 +99,7 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
       content[:image] = buffer
     when 'audio'
       content[:audio] = buffer
-      content[:ptt] = attachment.meta['is_recorded_audio']
+      content[:ptt] = attachment.meta&.dig('is_recorded_audio')
     when 'file'
       content[:document] = buffer
     when 'sticker'

From 62ef2113d5645a278678b28081f54ae8f5f62dcd Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Sat, 3 May 2025 00:39:39 -0300
Subject: [PATCH 45/46] feat: toggle typing status on channel provider (#39)

* feat: toggle typing status on channel provider

* refactor: general refactorings

* fix: check if channel implements method

* test: channel listener specs

* test: channel spec

* test: baileys service spec
---
 .../api/v1/widget/conversations_controller.rb |  2 +
 .../v1/inboxes/conversations_controller.rb    |  2 +
 app/dispatchers/async_dispatcher.rb           |  3 +-
 .../components/widgets/WootWriter/Editor.vue  |  6 +-
 .../widgets/conversation/ReplyBox.vue         |  7 ++
 .../shared/components/ResizableTextArea.vue   |  6 +-
 app/listeners/channel_listener.rb             | 25 +++++++
 app/models/channel/whatsapp.rb                |  6 ++
 .../conversations/typing_status_manager.rb    |  2 +
 .../providers/whatsapp_baileys_service.rb     | 20 +++++
 lib/events/types.rb                           |  1 +
 spec/listeners/channel_listener_spec.rb       | 66 +++++++++++++++++
 spec/models/channel/whatsapp_spec.rb          | 29 ++++++++
 .../whatsapp_baileys_service_spec.rb          | 74 +++++++++++++++++++
 .../inboxes/conversations/toggle_typing.yml   |  6 +-
 swagger/swagger.json                          |  7 +-
 16 files changed, 257 insertions(+), 5 deletions(-)
 create mode 100644 app/listeners/channel_listener.rb
 create mode 100644 spec/listeners/channel_listener_spec.rb

diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index 64b32db3c..62a7dafd9 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -48,6 +48,8 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
     case permitted_params[:typing_status]
     when 'on'
       trigger_typing_event(CONVERSATION_TYPING_ON)
+    when 'recording'
+      trigger_typing_event(CONVERSATION_RECORDING)
     when 'off'
       trigger_typing_event(CONVERSATION_TYPING_OFF)
     end
diff --git a/app/controllers/public/api/v1/inboxes/conversations_controller.rb b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
index 4e3b5dca9..b0b67c337 100644
--- a/app/controllers/public/api/v1/inboxes/conversations_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
@@ -30,6 +30,8 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
     case params[:typing_status]
     when 'on'
       trigger_typing_event(CONVERSATION_TYPING_ON)
+    when 'recording'
+      trigger_typing_event(CONVERSATION_RECORDING)
     when 'off'
       trigger_typing_event(CONVERSATION_TYPING_OFF)
     end
diff --git a/app/dispatchers/async_dispatcher.rb b/app/dispatchers/async_dispatcher.rb
index 7416b7861..f46928d4e 100644
--- a/app/dispatchers/async_dispatcher.rb
+++ b/app/dispatchers/async_dispatcher.rb
@@ -18,7 +18,8 @@ class AsyncDispatcher < BaseDispatcher
       NotificationListener.instance,
       ParticipationListener.instance,
       ReportingEventListener.instance,
-      WebhookListener.instance
+      WebhookListener.instance,
+      ChannelListener.instance
     ]
   end
 end
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 628c88ad3..ef365d95a 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -576,7 +576,11 @@ function createEditorView() {
     handleDOMEvents: {
       keyup: () => {
         if (!props.disabled) {
-          typingIndicator.start();
+          if (props.modelValue.length) {
+            typingIndicator.start();
+          } else {
+            typingIndicator.stop();
+          }
           updateImgToolbarOnDelete();
         }
       },
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 5323b3e2a..f5daddb89 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -863,6 +863,9 @@ export default {
       this.isRecorderAudioStopped = !this.isRecordingAudio;
       if (!this.isRecordingAudio) {
         this.resetAudioRecorderInput();
+        this.onTypingOff();
+      } else {
+        this.onRecording();
       }
     },
     toggleAudioRecorderPlayPause() {
@@ -872,6 +875,7 @@ export default {
       if (!this.isRecorderAudioStopped) {
         this.isRecorderAudioStopped = true;
         this.$refs.audioRecorderInput.stopRecording();
+        this.onTypingOff();
       } else if (this.isRecorderAudioStopped) {
         this.$refs.audioRecorderInput.playPause();
       }
@@ -887,6 +891,9 @@ export default {
     onTypingOn() {
       this.toggleTyping('on');
     },
+    onRecording() {
+      this.toggleTyping('recording');
+    },
     onTypingOff() {
       this.toggleTyping('off');
     },
diff --git a/app/javascript/shared/components/ResizableTextArea.vue b/app/javascript/shared/components/ResizableTextArea.vue
index 088753a23..6c7d4321b 100644
--- a/app/javascript/shared/components/ResizableTextArea.vue
+++ b/app/javascript/shared/components/ResizableTextArea.vue
@@ -144,7 +144,11 @@ export default {
       this.resizeTextarea();
     },
     onKeyup() {
-      this.typingIndicator.start();
+      if (this.modelValue.length) {
+        this.typingIndicator.start();
+      } else {
+        this.typingIndicator.stop();
+      }
     },
     onBlur() {
       this.typingIndicator.stop();
diff --git a/app/listeners/channel_listener.rb b/app/listeners/channel_listener.rb
new file mode 100644
index 000000000..0365454f2
--- /dev/null
+++ b/app/listeners/channel_listener.rb
@@ -0,0 +1,25 @@
+class ChannelListener < BaseListener
+  def conversation_typing_on(event)
+    handle_typing_event(event)
+  end
+
+  def conversation_recording(event)
+    handle_typing_event(event)
+  end
+
+  def conversation_typing_off(event)
+    handle_typing_event(event)
+  end
+
+  private
+
+  def handle_typing_event(event)
+    is_private, conversation = event.data.values_at(:is_private, :conversation)
+    return if is_private
+
+    channel = conversation.inbox.channel
+    return unless channel.respond_to?(:toggle_typing_status)
+
+    channel.toggle_typing_status(event.name, conversation: conversation)
+  end
+end
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 41d1a5960..5fc69c281 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -79,6 +79,12 @@ class Channel::Whatsapp < ApplicationRecord
     data
   end
 
+  def toggle_typing_status(typing_status, conversation:)
+    return unless provider_service.respond_to?(:toggle_typing_status)
+
+    provider_service.toggle_typing_status(conversation.contact.phone_number, typing_status)
+  end
+
   delegate :setup_channel_provider, to: :provider_service
   delegate :disconnect_channel_provider, to: :provider_service
   delegate :send_message, to: :provider_service
diff --git a/app/services/conversations/typing_status_manager.rb b/app/services/conversations/typing_status_manager.rb
index e3e9cebc6..2eb38e360 100644
--- a/app/services/conversations/typing_status_manager.rb
+++ b/app/services/conversations/typing_status_manager.rb
@@ -18,6 +18,8 @@ class Conversations::TypingStatusManager
     case params[:typing_status]
     when 'on'
       trigger_typing_event(CONVERSATION_TYPING_ON, params[:is_private])
+    when 'recording'
+      trigger_typing_event(CONVERSATION_RECORDING, params[:is_private])
     when 'off'
       trigger_typing_event(CONVERSATION_TYPING_OFF, params[:is_private])
     end
diff --git a/app/services/whatsapp/providers/whatsapp_baileys_service.rb b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
index dc0702a90..1189ec291 100644
--- a/app/services/whatsapp/providers/whatsapp_baileys_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_baileys_service.rb
@@ -66,6 +66,26 @@ class Whatsapp::Providers::WhatsappBaileysService < Whatsapp::Providers::BaseSer
     process_response(response)
   end
 
+  def toggle_typing_status(phone_number, typing_status)
+    @phone_number = phone_number
+    status_map = {
+      Events::Types::CONVERSATION_TYPING_ON => 'composing',
+      Events::Types::CONVERSATION_RECORDING => 'recording',
+      Events::Types::CONVERSATION_TYPING_OFF => 'paused'
+    }
+
+    response = HTTParty.patch(
+      "#{provider_url}/connections/#{whatsapp_channel.phone_number}/presence",
+      headers: api_headers,
+      body: {
+        toJid: remote_jid,
+        type: status_map[typing_status]
+      }.to_json
+    )
+
+    process_response(response)
+  end
+
   private
 
   def provider_url
diff --git a/lib/events/types.rb b/lib/events/types.rb
index ff7eaf778..e1ebafd2a 100644
--- a/lib/events/types.rb
+++ b/lib/events/types.rb
@@ -27,6 +27,7 @@ module Events::Types
   ASSIGNEE_CHANGED = 'assignee.changed'
   TEAM_CHANGED = 'team.changed'
   CONVERSATION_TYPING_ON = 'conversation.typing_on'
+  CONVERSATION_RECORDING = 'conversation.recording'
   CONVERSATION_TYPING_OFF = 'conversation.typing_off'
   CONVERSATION_MENTIONED = 'conversation.mentioned'
 
diff --git a/spec/listeners/channel_listener_spec.rb b/spec/listeners/channel_listener_spec.rb
new file mode 100644
index 000000000..0df8d486e
--- /dev/null
+++ b/spec/listeners/channel_listener_spec.rb
@@ -0,0 +1,66 @@
+require 'rails_helper'
+describe ChannelListener do
+  let(:listener) { described_class.instance }
+
+  context 'when handling typing events' do
+    let(:channel) { create(:channel_whatsapp, sync_templates: false, validate_provider_config: false) }
+    let(:conversation) { create(:conversation, inbox: create(:inbox, channel: channel)) }
+
+    it 'skips the event if is_private is true' do
+      allow(channel).to receive(:toggle_typing_status)
+
+      listener.conversation_typing_on(build_typing_event(Events::Types::CONVERSATION_TYPING_ON, conversation: conversation, is_private: true))
+
+      expect(channel).not_to have_received(:toggle_typing_status)
+    end
+
+    it 'skips the event if channel does not respond to toggle_typing_status' do
+      channel = create(:channel_api)
+      conversation = create(:conversation, inbox: create(:inbox, channel: channel))
+
+      expect do
+        listener.conversation_typing_on(build_typing_event(Events::Types::CONVERSATION_TYPING_ON, conversation: conversation))
+      end.not_to raise_error
+    end
+
+    describe '#conversation_typing_on' do
+      let(:event_name) { Events::Types::CONVERSATION_TYPING_ON }
+
+      it 'calls toggle_typing_status on the channel' do
+        allow(channel).to receive(:toggle_typing_status).with(event_name, conversation: conversation)
+
+        listener.conversation_typing_on(build_typing_event(event_name, conversation: conversation))
+
+        expect(channel).to have_received(:toggle_typing_status)
+      end
+    end
+
+    describe '#conversation_recording' do
+      let(:event_name) { Events::Types::CONVERSATION_RECORDING }
+
+      it 'calls toggle_typing_status on the channel' do
+        allow(channel).to receive(:toggle_typing_status).with(event_name, conversation: conversation)
+
+        listener.conversation_recording(build_typing_event(event_name, conversation: conversation))
+
+        expect(channel).to have_received(:toggle_typing_status)
+      end
+    end
+
+    describe '#conversation_typing_off' do
+      let(:event_name) { Events::Types::CONVERSATION_TYPING_OFF }
+
+      it 'calls toggle_typing_status on the channel' do
+        allow(channel).to receive(:toggle_typing_status).with(event_name, conversation: conversation)
+
+        listener.conversation_typing_off(build_typing_event(event_name, conversation: conversation))
+
+        expect(channel).to have_received(:toggle_typing_status)
+      end
+    end
+  end
+
+  def build_typing_event(event_name, conversation:, is_private: false)
+    Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: create(:user), is_private: is_private)
+  end
+end
diff --git a/spec/models/channel/whatsapp_spec.rb b/spec/models/channel/whatsapp_spec.rb
index a2767b018..c6608c3c9 100644
--- a/spec/models/channel/whatsapp_spec.rb
+++ b/spec/models/channel/whatsapp_spec.rb
@@ -62,6 +62,35 @@ RSpec.describe Channel::Whatsapp do
     end
   end
 
+  describe '#toggle_typing_status' do
+    let(:channel) { create(:channel_whatsapp, provider: 'baileys', validate_provider_config: false, sync_templates: false) }
+    let(:conversation) { create(:conversation) }
+
+    it 'calls provider service method' do
+      provider_double = instance_double(Whatsapp::Providers::WhatsappBaileysService, toggle_typing_status: nil)
+      allow(Whatsapp::Providers::WhatsappBaileysService).to receive(:new)
+        .with(whatsapp_channel: channel)
+        .and_return(provider_double)
+
+      channel.toggle_typing_status(Events::Types::CONVERSATION_TYPING_ON, conversation: conversation)
+
+      expect(provider_double).to have_received(:toggle_typing_status)
+        .with(conversation.contact.phone_number, Events::Types::CONVERSATION_TYPING_ON)
+    end
+
+    it 'does not call method if provider service does not implement it' do
+      channel = create(:channel_whatsapp, provider: 'whatsapp_cloud', validate_provider_config: false, sync_templates: false)
+      provider_double = instance_double(Whatsapp::Providers::WhatsappCloudService)
+      allow(Whatsapp::Providers::WhatsappCloudService).to receive(:new)
+        .with(whatsapp_channel: channel)
+        .and_return(provider_double)
+
+      expect do
+        channel.toggle_typing_status(Events::Types::CONVERSATION_TYPING_ON, conversation: conversation)
+      end.not_to raise_error
+    end
+  end
+
   describe 'callbacks' do
     describe '#disconnect_channel_provider' do
       context 'when provider is baileys' do
diff --git a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
index 365998b61..de92e3a09 100644
--- a/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_baileys_service_spec.rb
@@ -363,6 +363,80 @@ describe Whatsapp::Providers::WhatsappBaileysService do
     end
   end
 
+  describe '#toggle_typing_status' do
+    let(:request_path) { "#{whatsapp_channel.provider_config['provider_url']}/connections/#{whatsapp_channel.phone_number}/presence" }
+
+    it 'calls presence endpoint for typing on' do
+      request = stub_request(:patch, request_path)
+                .with(
+                  headers: stub_headers(whatsapp_channel),
+                  body: {
+                    toJid: test_send_jid,
+                    type: 'composing'
+                  }.to_json
+                )
+                .to_return(status: 200)
+
+      service.toggle_typing_status(test_send_phone_number, Events::Types::CONVERSATION_TYPING_ON)
+
+      expect(request).to have_been_requested
+    end
+
+    it 'calls presence endpoint for recording' do
+      request = stub_request(:patch, request_path)
+                .with(
+                  headers: stub_headers(whatsapp_channel),
+                  body: {
+                    toJid: test_send_jid,
+                    type: 'recording'
+                  }.to_json
+                )
+                .to_return(status: 200)
+
+      service.toggle_typing_status(test_send_phone_number, Events::Types::CONVERSATION_RECORDING)
+
+      expect(request).to have_been_requested
+    end
+
+    it 'calls presence endpoint for typing off' do
+      request = stub_request(:patch, request_path)
+                .with(
+                  headers: stub_headers(whatsapp_channel),
+                  body: {
+                    toJid: test_send_jid,
+                    type: 'paused'
+                  }.to_json
+                )
+                .to_return(status: 200)
+
+      service.toggle_typing_status(test_send_phone_number, Events::Types::CONVERSATION_TYPING_OFF)
+
+      expect(request).to have_been_requested
+    end
+
+    it 'logs the error and returns false' do
+      stub_request(:patch, request_path)
+        .with(
+          headers: stub_headers(whatsapp_channel),
+          body: {
+            toJid: test_send_jid,
+            type: 'composing'
+          }.to_json
+        )
+        .to_return(
+          status: 400,
+          body: 'error message',
+          headers: {}
+        )
+      allow(Rails.logger).to receive(:error).with('error message')
+
+      response = service.toggle_typing_status(test_send_phone_number, Events::Types::CONVERSATION_TYPING_ON)
+
+      expect(response).to be(false)
+      expect(Rails.logger).to have_received(:error)
+    end
+  end
+
   context 'when environment variable BAILEYS_PROVIDER_DEFAULT_URL is set' do
     it 'uses the base url from the environment variable' do
       stub_const('Whatsapp::Providers::WhatsappBaileysService::DEFAULT_URL', 'http://test.com')
diff --git a/swagger/paths/public/inboxes/conversations/toggle_typing.yml b/swagger/paths/public/inboxes/conversations/toggle_typing.yml
index af01c77f6..797c75334 100644
--- a/swagger/paths/public/inboxes/conversations/toggle_typing.yml
+++ b/swagger/paths/public/inboxes/conversations/toggle_typing.yml
@@ -8,7 +8,11 @@ parameters:
     in: query
     required: true
     type: string
-    description: Typing status, either 'on' or 'off'
+    enum:
+      - 'on'
+      - 'recording'
+      - 'off'
+    description: Typing status.
 responses:
   200:
     description: Typing status toggled successfully
diff --git a/swagger/swagger.json b/swagger/swagger.json
index d2b699e44..56aef1499 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -989,7 +989,12 @@
             "in": "query",
             "required": true,
             "type": "string",
-            "description": "Typing status, either 'on' or 'off'"
+            "enum": [
+              "on",
+              "recording",
+              "off"
+            ],
+            "description": "Typing status."
           }
         ],
         "responses": {

From 8d5a6bc4b5b00ac6d9094eb569e94ada9735633b Mon Sep 17 00:00:00 2001
From: "Cayo P. R. Oliveira" <cayo@fazer.ai>
Date: Tue, 6 May 2025 16:40:09 -0300
Subject: [PATCH 46/46] feat: add flag to edited messages and content history
 tracking (#35)

* fix: handle protocol messages in IncomingMessageBaileysService and ignore it

* fix: ignore protocol messages before create conversation and contact

* feat: add flag to edited messages and content history tracking

* refactor: update message model to use edit_history instead of content_history for tracking edits

* refactor: update message model to track previous content instead of edit history

* test: fix message content update test to correctly track original content

---------

Co-authored-by: gabrieljablonski <contact@gabrieljablonski.com>
---
 app/models/message.rb                            |  5 ++++-
 .../whatsapp/incoming_message_baileys_service.rb | 16 ++++++++--------
 .../incoming_message_baileys_service_spec.rb     |  3 +++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index 4b33d53c6..91901d026 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -102,9 +102,12 @@ class Message < ApplicationRecord
   # [:external_created_at] : Can specify if the message was created at a different timestamp externally
   # [:external_error : Can specify if the message creation failed due to an error at external API
   # [:is_reaction] : Used to denote if the message is a reaction and differentiate it from a simple reply message
+  # [:is_edited, :previous_content] : Used to indicated edited message and previous content (before edit)
+
   store :content_attributes, accessors: [:submitted_email, :items, :submitted_values, :email, :in_reply_to, :deleted,
                                          :external_created_at, :story_sender, :story_id, :external_error,
-                                         :translations, :in_reply_to_external_id, :is_unsupported, :is_reaction], coder: JSON
+                                         :translations, :in_reply_to_external_id, :is_unsupported,
+                                         :is_reaction, :is_edited, :previous_content], coder: JSON
 
   store :external_source_ids, accessors: [:slack], coder: JSON, prefix: :external_source_id
 
diff --git a/app/services/whatsapp/incoming_message_baileys_service.rb b/app/services/whatsapp/incoming_message_baileys_service.rb
index 9b9501024..e18139002 100644
--- a/app/services/whatsapp/incoming_message_baileys_service.rb
+++ b/app/services/whatsapp/incoming_message_baileys_service.rb
@@ -277,7 +277,7 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     raise MessageNotFoundError unless find_message_by_source_id(message_id)
 
     update_status if @raw_message.dig(:update, :status).present?
-    update_message_content if @raw_message.dig(:update, :message).present?
+    handle_edited_content if @raw_message.dig(:update, :message).present?
   end
 
   def update_status
@@ -318,15 +318,15 @@ class Whatsapp::IncomingMessageBaileysService < Whatsapp::IncomingMessageBaseSer
     true
   end
 
-  def update_message_content
-    message = @raw_message.dig(:update, :message, :editedMessage, :message)
-    if message.blank?
-      Rails.logger.warn 'No valid message content found in the update event'
+  def handle_edited_content
+    @raw_message = @raw_message.dig(:update, :message, :editedMessage)
+    content = message_content
+
+    unless content
+      Rails.logger.warn 'No valid message content found in the edit event'
       return
     end
 
-    content = message[:conversation] || message.dig(:extendedTextMessage, :text)
-
-    @message.update!(content: content) if content.present?
+    @message.update!(content: content, is_edited: true, previous_content: @message.content)
   end
 end
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index 9b7013c16..ff7ea92db 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -726,7 +726,10 @@ describe Whatsapp::IncomingMessageBaileysService do
 
           described_class.new(inbox: inbox, params: params).perform
 
+          original_content = message.content
           expect(message.reload.content).to eq('New message content')
+          expect(message.is_edited).to be(true)
+          expect(message.previous_content).to eq(original_content)
         end
       end