-
+
{{ $t('INBOX_MGMT.ADD.WHATSAPP.SELECT_PROVIDER.TITLE') }}
-
+
{{ $t('INBOX_MGMT.ADD.WHATSAPP.SELECT_PROVIDER.DESCRIPTION') }}
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 186fcc48e..578a788cd 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -322,7 +322,7 @@ export default {
"
>
-
+
{{
$t(
'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_EMBEDDED_SIGNUP_DESCRIPTION'
From eed1825d5a3b21d9a2e1b0e829a93a10e2d974e0 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 13 Nov 2025 22:16:25 +0530
Subject: [PATCH 2/3] fix: Brand installation name not showing (#12861)
# Pull Request Template
## Description
Fixes
https://linear.app/chatwoot/issue/CW-5946/fix-brand-installation-name-issue-in-dyte
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
.../routes/dashboard/settings/integrations/NewHook.vue | 6 ++++--
.../settings/integrations/SingleIntegrationHooks.vue | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/NewHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/NewHook.vue
index 5fe350215..1a4d36fee 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/NewHook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/NewHook.vue
@@ -4,6 +4,7 @@ import { mapGetters } from 'vuex';
import { useAlert } from 'dashboard/composables';
import { useIntegrationHook } from 'dashboard/composables/useIntegrationHook';
import { FormKit } from '@formkit/vue';
+import { useBranding } from 'shared/composables/useBranding';
import NextButton from 'dashboard/components-next/button/Button.vue';
@@ -23,8 +24,9 @@ export default {
const { integration, isHookTypeInbox } = useIntegrationHook(
props.integrationId
);
+ const { replaceInstallationName } = useBranding();
- return { integration, isHookTypeInbox };
+ return { integration, isHookTypeInbox, replaceInstallationName };
},
data() {
return {
@@ -117,7 +119,7 @@ export default {
import { defineProps, defineEmits } from 'vue';
import { useIntegrationHook } from 'dashboard/composables/useIntegrationHook';
+import { useBranding } from 'shared/composables/useBranding';
import Button from 'dashboard/components-next/button/Button.vue';
const props = defineProps({
@@ -15,6 +16,8 @@ defineEmits(['add', 'delete']);
const { integration, hasConnectedHooks } = useIntegrationHook(
props.integrationId
);
+
+const { replaceInstallationName } = useBranding();
@@ -37,7 +40,7 @@ const { integration, hasConnectedHooks } = useIntegrationHook(
{{ integration.name }}
- {{ integration.description }}
+ {{ replaceInstallationName(integration.description) }}
From 559d1b65768e131853ce00a15aea1a12d8359352 Mon Sep 17 00:00:00 2001
From: Vinay Keerthi <11478411+stonecharioteer@users.noreply.github.com>
Date: Fri, 14 Nov 2025 12:35:38 +0530
Subject: [PATCH 3/3] fix: migrate from deprecated annotate gem to annotaterb
(#12845)
## Description
The `annotate` gem has been deprecated and users are experiencing
annotation errors with the new Rails 7 `serialize` syntax. This PR
migrates to `annotaterb`, the actively maintained fork.
Users reported errors when running `make db`:
```
Unable to annotate app/models/installation_config.rb: no implicit conversion of Hash into String
Unable to annotate app/models/installation_config.rb: no implicit conversion of nil into Array
```
This PR updates the Gemfile and rake configuration to use `annotaterb`
instead.
Fixes #11673
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
Tested locally with the following steps:
1. Run `bundle install` - successfully installed annotaterb 4.20.0
2. Run `RAILS_ENV=development bundle exec rails db:chatwoot_prepare` -
completed without annotation errors
3. Run `RAILS_ENV=development bundle exec rails annotate_rb:models` -
successfully annotated all models including InstallationConfig
4. Verified InstallationConfig model annotations are present and correct
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] My changes generate no new warnings
- [x] New and existing unit tests pass locally with my changes
---
Gemfile | 2 +-
Gemfile.lock | 8 ++++----
lib/tasks/auto_annotate_models.rake | 9 +++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index abbd3332f..4b9d978d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -207,7 +207,7 @@ group :production do
end
group :development do
- gem 'annotate'
+ gem 'annotaterb'
gem 'bullet'
gem 'letter_opener'
gem 'scss_lint', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 99e75b33c..fa3a5e788 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -128,9 +128,9 @@ GEM
selectize-rails (~> 0.6)
ai-agents (0.4.3)
ruby_llm (~> 1.3)
- annotate (3.2.0)
- activerecord (>= 3.2, < 8.0)
- rake (>= 10.4, < 14.0)
+ annotaterb (4.20.0)
+ activerecord (>= 6.0.0)
+ activesupport (>= 6.0.0)
ast (2.4.3)
attr_extras (7.1.0)
audited (5.4.1)
@@ -992,7 +992,7 @@ DEPENDENCIES
administrate-field-active_storage (>= 1.0.3)
administrate-field-belongs_to_search (>= 0.9.0)
ai-agents (>= 0.4.3)
- annotate
+ annotaterb
attr_extras
audited (~> 5.4, >= 5.4.1)
aws-sdk-s3
diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake
index 8a89739b6..9dcd13126 100644
--- a/lib/tasks/auto_annotate_models.rake
+++ b/lib/tasks/auto_annotate_models.rake
@@ -2,11 +2,14 @@
# NOTE: are sensitive to local FS writes, and besides -- it's just not proper
# NOTE: to have a dev-mode tool do its thing in production.
if Rails.env.development?
- require 'annotate'
+ require 'annotate_rb'
+
+ AnnotateRb::Core.load_rake_tasks
+
task :set_annotation_options do
# You can override any of these by setting an environment variable of the
# same name.
- Annotate.set_defaults(
+ AnnotateRb::Options.set_defaults(
'additional_file_patterns' => [],
'routes' => 'false',
'models' => 'true',
@@ -55,6 +58,4 @@ if Rails.env.development?
'with_comment' => 'true'
)
end
-
- Annotate.load_tasks
end