Merge branch 'develop' into fix/widget-bubble

app/builders/campaigns/campaign_conversation_builder.rb

@@ -9,7 +9,7 @@ class Campaigns::CampaignConversationBuilder
       @contact_inbox.lock!
 
       # We won't send campaigns if a conversation is already present
-      raise 'Conversation already present' if @contact_inbox.reload.conversations.present?
+      raise 'Conversation alread present' if @contact_inbox.reload.conversations.present?
 
       @conversation = ::Conversation.create!(conversation_params)
       Messages::MessageBuilder.new(@campaign.sender, @conversation, message_params).perform

app/builders/messages/instagram/base_message_builder.rb

@@ -94,10 +94,11 @@ class Messages::Instagram::BaseMessageBuilder < Messages::Messenger::MessageBuil
   def build_message
     # Duplicate webhook events may be sent for the same message
     # when a user is connected to the Instagram account through both Messenger and Instagram login.
-    # There is chance for echo events to be sent for the same message.
     # Therefore, we need to check if the message already exists before creating it.
     return if message_already_exists?
 
+    return if @outgoing_echo
+
     return if message_content.blank? && all_unsupported_files?
 
     @message = conversation.messages.create!(message_params)

app/controllers/api/v1/accounts/agent_bots_controller.rb

@@ -37,7 +37,7 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
   end
 
   def permitted_params
-    params.permit(:name, :description, :outgoing_url, :avatar, :avatar_url, :bot_type, bot_config: {})
+    params.permit(:name, :description, :outgoing_url, :avatar, :avatar_url, :bot_type, bot_config: [:csml_content])
   end
 
   def process_avatar_from_url

app/controllers/dashboard_controller.rb

@@ -36,7 +36,7 @@ class DashboardController < ActionController::Base
       'LOGOUT_REDIRECT_LINK',
       'DISABLE_USER_PROFILE_UPDATE',
       'DEPLOYMENT_ENV',
-      'INSTALLATION_PRICING_PLAN'
+      'CSML_EDITOR_HOST', 'INSTALLATION_PRICING_PLAN'
     ).merge(app_config)
   end
 
@@ -65,7 +65,6 @@ class DashboardController < ActionController::Base
       VAPID_PUBLIC_KEY: VapidService.public_key,
       ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
       FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
-      INSTAGRAM_APP_ID: GlobalConfigService.load('INSTAGRAM_APP_ID', ''),
       FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
       IS_ENTERPRISE: ChatwootApp.enterprise?,
       AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),

app/controllers/devise_overrides/omniauth_callbacks_controller.rb

@@ -55,7 +55,7 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
 
   def validate_business_account?
     # return true if the user is a business account, false if it is a gmail account
-    auth_hash['info']['email'].downcase.exclude?('@gmail.com')
+    auth_hash['info']['email'].exclude?('@gmail.com')
   end
 
   def create_account_for_user

app/javascript/dashboard/api/agentBots.js

@@ -1,26 +1,9 @@
-/* global axios */
 import ApiClient from './ApiClient';
 
 class AgentBotsAPI extends ApiClient {
   constructor() {
     super('agent_bots', { accountScoped: true });
   }
-
-  create(data) {
-    return axios.post(this.url, data, {
-      headers: { 'Content-Type': 'multipart/form-data' },
-    });
-  }
-
-  update(id, data) {
-    return axios.patch(`${this.url}/${id}`, data, {
-      headers: { 'Content-Type': 'multipart/form-data' },
-    });
-  }
-
-  deleteAgentBotAvatar(botId) {
-    return axios.delete(`${this.url}/${botId}/avatar`);
-  }
 }
 
 export default new AgentBotsAPI();

app/javascript/dashboard/assets/scss/_next-colors.scss

@@ -29,19 +29,6 @@
     --iris-11: 87 83 198;
     --iris-12: 39 41 98;
 
-    --blue-1: 251 253 255;
-    --blue-2: 245 249 255;
-    --blue-3: 233 243 255;
-    --blue-4: 218 236 255;
-    --blue-5: 201 226 255;
-    --blue-6: 181 213 255;
-    --blue-7: 155 195 252;
-    --blue-8: 117 171 247;
-    --blue-9: 39 129 246;
-    --blue-10: 16 115 233;
-    --blue-11: 8 109 224;
-    --blue-12: 11 50 101;
-
     --ruby-1: 255 252 253;
     --ruby-2: 255 247 248;
     --ruby-3: 254 234 237;
@@ -144,19 +131,6 @@
     --iris-11: 158 177 255;
     --iris-12: 224 223 254;
 
-    --blue-1: 10 17 28;
-    --blue-2: 15 24 38;
-    --blue-3: 15 39 72;
-    --blue-4: 10 49 99;
-    --blue-5: 18 61 117;
-    --blue-6: 29 84 134;
-    --blue-7: 40 89 156;
-    --blue-8: 48 106 186;
-    --blue-9: 39 129 246;
-    --blue-10: 21 116 231;
-    --blue-11: 126 182 255;
-    --blue-12: 205 227 255;
-
     --ruby-1: 25 17 19;
     --ruby-2: 30 21 23;
     --ruby-3: 58 20 30;

app/javascript/dashboard/components-next/Contacts/ContactsForm/CreateNewContactDialog.vue

@@ -51,7 +51,6 @@ defineExpose({ dialogRef, contactsFormRef, onSuccess });
         <Button
           :label="t('DIALOG.BUTTONS.CANCEL')"
           variant="link"
-          type="reset"
           class="h-10 hover:!no-underline hover:text-n-brand"
           @click="closeDialog"
         />

app/javascript/dashboard/components-next/Contacts/ContactsHeader/components/ContactSortMenu.vue

@@ -31,6 +31,10 @@ const sortMenus = [
     label: t('CONTACTS_LAYOUT.HEADER.ACTIONS.SORT_BY.OPTIONS.EMAIL'),
     value: 'email',
   },
+  {
+    label: t('CONTACTS_LAYOUT.HEADER.ACTIONS.SORT_BY.OPTIONS.PHONE_NUMBER'),
+    value: 'phone_number',
+  },
   {
     label: t('CONTACTS_LAYOUT.HEADER.ACTIONS.SORT_BY.OPTIONS.COMPANY'),
     value: 'company_name',

app/javascript/dashboard/components-next/copilot/CopilotAssistantMessage.vue

@@ -33,8 +33,6 @@ const insertIntoRichEditor = computed(() => {
   );
 });
 
-const hasEmptyMessageContent = computed(() => !props.message?.content);
-
 const useCopilotResponse = () => {
   if (insertIntoRichEditor.value) {
     emitter.emit(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, props.message?.content);
@@ -55,17 +53,9 @@ const useCopilotResponse = () => {
     />
     <div class="flex flex-col gap-1 text-n-slate-12">
       <div class="font-medium">{{ $t('CAPTAIN.NAME') }}</div>
-      <span v-if="hasEmptyMessageContent" class="text-n-ruby-11">
-        {{ $t('CAPTAIN.COPILOT.EMPTY_MESSAGE') }}
-      </span>
-      <div
-        v-else
-        v-dompurify-html="messageContent"
-        class="prose-sm break-words"
-      />
+      <div v-dompurify-html="messageContent" class="prose-sm break-words" />
       <div class="flex flex-row mt-1">
         <Button
-          v-if="!hasEmptyMessageContent"
           :label="$t('CAPTAIN.COPILOT.USE')"
           faded
           sm

app/javascript/dashboard/components-next/dialog/Dialog.vue

@@ -125,10 +125,7 @@ defineExpose({ open, close });
           <slot />
           <!-- Dialog content will be injected here -->
           <slot name="footer">
-            <div
-              v-if="showCancelButton || showConfirmButton"
-              class="flex items-center justify-between w-full gap-3"
-            >
+            <div class="flex items-center justify-between w-full gap-3">
               <Button
                 v-if="showCancelButton"
                 variant="faded"

app/javascript/dashboard/components-next/message/MessageMeta.vue

@@ -19,17 +19,11 @@ const {
   isAWebWidgetInbox,
   isAWhatsAppChannel,
   isAnEmailChannel,
-  isAnInstagramChannel,
+  isAInstagramChannel,
 } = useInbox();
 
-const {
-  status,
-  isPrivate,
-  createdAt,
-  sourceId,
-  messageType,
-  contentAttributes,
-} = useMessageContext();
+const { status, isPrivate, createdAt, sourceId, messageType } =
+  useMessageContext();
 
 const readableTime = computed(() =>
   messageTimestamp(createdAt.value, 'LLL d, h:mm a')
@@ -37,11 +31,6 @@ const readableTime = computed(() =>
 
 const showStatusIndicator = computed(() => {
   if (isPrivate.value) return false;
-  // Don't show status for failed messages, we already show error message
-  if (status.value === MESSAGE_STATUS.FAILED) return false;
-  // Don't show status for deleted messages
-  if (contentAttributes.value?.deleted) return false;
-
   if (messageType.value === MESSAGE_TYPES.OUTGOING) return true;
   if (messageType.value === MESSAGE_TYPES.TEMPLATE) return true;
 
@@ -60,7 +49,7 @@ const isSent = computed(() => {
     isAFacebookInbox.value ||
     isASmsInbox.value ||
     isATelegramChannel.value ||
-    isAnInstagramChannel.value
+    isAInstagramChannel.value
   ) {
     return sourceId.value && status.value === MESSAGE_STATUS.SENT;
   }
@@ -100,7 +89,7 @@ const isRead = computed(() => {
     isAWhatsAppChannel.value ||
     isATwilioChannel.value ||
     isAFacebookInbox.value ||
-    isAnInstagramChannel.value
+    isAInstagramChannel.value
   ) {
     return sourceId.value && status.value === MESSAGE_STATUS.READ;
   }

app/javascript/dashboard/components-next/message/TranslationToggle.vue

@@ -1,24 +0,0 @@
-<script setup>
-import { defineProps, defineEmits } from 'vue';
-
-defineProps({
-  showingOriginal: Boolean,
-});
-
-defineEmits(['toggle']);
-</script>
-
-<template>
-  <span>
-    <span
-      class="text-xs text-n-slate-11 cursor-pointer hover:underline select-none"
-      @click="$emit('toggle')"
-    >
-      {{
-        showingOriginal
-          ? $t('CONVERSATION.VIEW_TRANSLATED')
-          : $t('CONVERSATION.VIEW_ORIGINAL')
-      }}
-    </span>
-  </span>
-</template>

app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue

@@ -9,11 +9,9 @@ import BaseBubble from 'next/message/bubbles/Base.vue';
 import FormattedContent from 'next/message/bubbles/Text/FormattedContent.vue';
 import AttachmentChips from 'next/message/chips/AttachmentChips.vue';
 import EmailMeta from './EmailMeta.vue';
-import TranslationToggle from 'dashboard/components-next/message/TranslationToggle.vue';
 
 import { useMessageContext } from '../../provider.js';
 import { MESSAGE_TYPES } from 'next/message/constants.js';
-import { useTranslations } from 'dashboard/composables/useTranslations';
 
 const { content, contentAttributes, attachments, messageType } =
   useMessageContext();
@@ -21,77 +19,35 @@ const { content, contentAttributes, attachments, messageType } =
 const isExpandable = ref(false);
 const isExpanded = ref(false);
 const showQuotedMessage = ref(false);
-const renderOriginal = ref(false);
 const contentContainer = useTemplateRef('contentContainer');
 
 onMounted(() => {
   isExpandable.value = contentContainer.value?.scrollHeight > 400;
 });
 
-const isOutgoing = computed(() => messageType.value === MESSAGE_TYPES.OUTGOING);
+const isOutgoing = computed(() => {
+  return messageType.value === MESSAGE_TYPES.OUTGOING;
+});
 const isIncoming = computed(() => !isOutgoing.value);
 
-const { hasTranslations, translationContent } =
-  useTranslations(contentAttributes);
-
-const originalEmailText = computed(() => {
+const textToShow = computed(() => {
   const text =
     contentAttributes?.value?.email?.textContent?.full ?? content.value;
   return text?.replace(/\n/g, '<br>');
 });
 
-const originalEmailHtml = computed(
-  () =>
-    contentAttributes?.value?.email?.htmlContent?.full ??
-    originalEmailText.value
-);
-
-const messageContent = computed(() => {
-  // If translations exist and we're showing translations (not original)
-  if (hasTranslations.value && !renderOriginal.value) {
-    return translationContent.value;
-  }
-  // Otherwise show original content
-  return content.value;
-});
-
-const textToShow = computed(() => {
-  // If translations exist and we're showing translations (not original)
-  if (hasTranslations.value && !renderOriginal.value) {
-    return translationContent.value;
-  }
-  // Otherwise show original text
-  return originalEmailText.value;
-});
-
+// Use TextContent as the default to fullHTML
 const fullHTML = computed(() => {
-  // If translations exist and we're showing translations (not original)
-  if (hasTranslations.value && !renderOriginal.value) {
-    return translationContent.value;
-  }
-  // Otherwise show original HTML
-  return originalEmailHtml.value;
+  return contentAttributes?.value?.email?.htmlContent?.full ?? textToShow.value;
 });
 
-const unquotedHTML = computed(() =>
-  EmailQuoteExtractor.extractQuotes(fullHTML.value)
-);
-
-const hasQuotedMessage = computed(() =>
-  EmailQuoteExtractor.hasQuotes(fullHTML.value)
-);
-
-// Ensure unique keys for <Letter> when toggling between original and translated views.
-// This forces Vue to re-render the component and update content correctly.
-const translationKeySuffix = computed(() => {
-  if (renderOriginal.value) return 'original';
-  if (hasTranslations.value) return 'translated';
-  return 'original';
+const unquotedHTML = computed(() => {
+  return EmailQuoteExtractor.extractQuotes(fullHTML.value);
 });
 
-const handleSeeOriginal = () => {
-  renderOriginal.value = !renderOriginal.value;
-};
+const hasQuotedMessage = computed(() => {
+  return EmailQuoteExtractor.hasQuotes(fullHTML.value);
+});
 </script>
 
 <template>
@@ -119,7 +75,7 @@ const handleSeeOriginal = () => {
       >
         <div
           v-if="isExpandable && !isExpanded"
-          class="absolute left-0 right-0 bottom-0 h-40 px-8 flex items-end bg-gradient-to-t from-n-slate-4 via-n-slate-4 via-20% to-transparent"
+          class="absolute left-0 right-0 bottom-0 h-40 px-8 flex items-end bg-gradient-to-t from-n-gray-3 via-n-gray-3 via-20% to-transparent"
         >
           <button
             class="text-n-slate-12 py-2 px-8 mx-auto text-center flex items-center gap-2"
@@ -132,12 +88,11 @@ const handleSeeOriginal = () => {
         <FormattedContent
           v-if="isOutgoing && content"
           class="text-n-slate-12"
-          :content="messageContent"
+          :content="content"
         />
         <template v-else>
           <Letter
             v-if="showQuotedMessage"
-            :key="`letter-quoted-${translationKeySuffix}`"
             class-name="prose prose-bubble !max-w-none letter-render"
             :allowed-css-properties="[
               ...allowedCssProperties,
@@ -149,7 +104,6 @@ const handleSeeOriginal = () => {
           />
           <Letter
             v-else
-            :key="`letter-unquoted-${translationKeySuffix}`"
             class-name="prose prose-bubble !max-w-none letter-render"
             :html="unquotedHTML"
             :allowed-css-properties="[
@@ -181,12 +135,6 @@ const handleSeeOriginal = () => {
         </button>
       </div>
     </section>
-    <TranslationToggle
-      v-if="hasTranslations"
-      class="py-2 px-3"
-      :showing-original="renderOriginal"
-      @toggle="handleSeeOriginal"
-    />
     <section
       v-if="Array.isArray(attachments) && attachments.length"
       class="px-4 pb-4 space-y-2"

app/javascript/dashboard/components-next/message/bubbles/Text/Index.vue

@@ -3,16 +3,16 @@ import { computed, ref } from 'vue';
 import BaseBubble from 'next/message/bubbles/Base.vue';
 import FormattedContent from './FormattedContent.vue';
 import AttachmentChips from 'next/message/chips/AttachmentChips.vue';
-import TranslationToggle from 'dashboard/components-next/message/TranslationToggle.vue';
 import { MESSAGE_TYPES } from '../../constants';
 import { useMessageContext } from '../../provider.js';
-import { useTranslations } from 'dashboard/composables/useTranslations';
 
 const { content, attachments, contentAttributes, messageType } =
   useMessageContext();
 
-const { hasTranslations, translationContent } =
-  useTranslations(contentAttributes);
+const hasTranslations = computed(() => {
+  const { translations = {} } = contentAttributes.value;
+  return Object.keys(translations || {}).length > 0;
+});
 
 const renderOriginal = ref(false);
 
@@ -22,7 +22,8 @@ const renderContent = computed(() => {
   }
 
   if (hasTranslations.value) {
-    return translationContent.value;
+    const translations = contentAttributes.value.translations;
+    return translations[Object.keys(translations)[0]];
   }
 
   return content.value;
@@ -36,6 +37,12 @@ const isEmpty = computed(() => {
   return !content.value && !attachments.value?.length;
 });
 
+const viewToggleKey = computed(() => {
+  return renderOriginal.value
+    ? 'CONVERSATION.VIEW_TRANSLATED'
+    : 'CONVERSATION.VIEW_ORIGINAL';
+});
+
 const handleSeeOriginal = () => {
   renderOriginal.value = !renderOriginal.value;
 };
@@ -48,12 +55,15 @@ const handleSeeOriginal = () => {
         {{ $t('CONVERSATION.NO_CONTENT') }}
       </span>
       <FormattedContent v-if="renderContent" :content="renderContent" />
-      <TranslationToggle
-        v-if="hasTranslations"
-        class="-mt-3"
-        :showing-original="renderOriginal"
-        @toggle="handleSeeOriginal"
-      />
+      <span class="-mt-3">
+        <span
+          v-if="hasTranslations"
+          class="text-xs text-n-slate-11 cursor-pointer hover:underline"
+          @click="handleSeeOriginal"
+        >
+          {{ $t(viewToggleKey) }}
+        </span>
+      </span>
       <AttachmentChips :attachments="attachments" class="gap-2" />
       <template v-if="isTemplate">
         <div

app/javascript/dashboard/components-next/message/chips/File.vue

@@ -39,7 +39,7 @@ const textColorClass = computed(() => {
     docx: 'dark:text-[#D6E1FF] text-[#1F2D5C]', // indigo-12
     json: 'text-n-slate-12',
     odt: 'dark:text-[#D6E1FF] text-[#1F2D5C]', // indigo-12
-    pdf: 'text-n-slate-12',
+    pdf: 'text-n-ruby-12',
     ppt: 'dark:text-[#FFE0C2] text-[#582D1D]',
     pptx: 'dark:text-[#FFE0C2] text-[#582D1D]',
     rar: 'dark:text-[#EDEEF0] text-[#2F265F]',

app/javascript/dashboard/components-next/sidebar/Sidebar.vue

@@ -8,6 +8,7 @@ import { useStore } from 'vuex';
 import { useI18n } from 'vue-i18n';
 import { useStorage } from '@vueuse/core';
 import { useSidebarKeyboardShortcuts } from './useSidebarKeyboardShortcuts';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 import SidebarGroup from './SidebarGroup.vue';
@@ -36,6 +37,18 @@ const toggleShortcutModalFn = show => {
   }
 };
 
+const currentAccountId = useMapGetter('getCurrentAccountId');
+const isFeatureEnabledonAccount = useMapGetter(
+  'accounts/isFeatureEnabledonAccount'
+);
+
+const showV4Routes = computed(() => {
+  return isFeatureEnabledonAccount.value(
+    currentAccountId.value,
+    FEATURE_FLAGS.REPORT_V4
+  );
+});
+
 useSidebarKeyboardShortcuts(toggleShortcutModalFn);
 
 // We're using localStorage to store the expanded item in the sidebar
@@ -103,7 +116,32 @@ const newReportRoutes = () => [
   },
 ];
 
-const reportRoutes = computed(() => newReportRoutes());
+const oldReportRoutes = () => [
+  {
+    name: 'Reports Agent',
+    label: t('SIDEBAR.REPORTS_AGENT'),
+    to: accountScopedRoute('agent_reports'),
+  },
+  {
+    name: 'Reports Label',
+    label: t('SIDEBAR.REPORTS_LABEL'),
+    to: accountScopedRoute('label_reports'),
+  },
+  {
+    name: 'Reports Inbox',
+    label: t('SIDEBAR.REPORTS_INBOX'),
+    to: accountScopedRoute('inbox_reports'),
+  },
+  {
+    name: 'Reports Team',
+    label: t('SIDEBAR.REPORTS_TEAM'),
+    to: accountScopedRoute('team_reports'),
+  },
+];
+
+const reportRoutes = computed(() =>
+  showV4Routes.value ? newReportRoutes() : oldReportRoutes()
+);
 
 const menuItems = computed(() => {
   return [

app/javascript/dashboard/components/layout/config/sidebarItems/settings.js

@@ -127,6 +127,7 @@ const settings = accountId => ({
       meta: {
         permissions: ['administrator'],
       },
+      globalConfigFlag: 'csmlEditorHost',
       toState: frontendURL(`accounts/${accountId}/settings/agent-bots`),
       toStateName: 'agent_bots',
       featureFlag: FEATURE_FLAGS.AGENT_BOTS,

app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue

@@ -49,6 +49,13 @@ export default {
       return !!this.menuItem.children;
     },
     isMenuItemVisible() {
+      if (this.menuItem.globalConfigFlag) {
+        // this checks for the `csmlEditorHost` flag in the global config
+        // if this is present, we toggle the CSML editor menu item
+        // TODO: This is very specific, and can be handled better, fix it
+        return !!this.globalConfig[this.menuItem.globalConfigFlag];
+      }
+
       let isFeatureEnabled = true;
       if (this.menuItem.featureFlag) {
         isFeatureEnabled = this.isFeatureEnabledonAccount(

app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue

@@ -218,14 +218,14 @@ const emitDateRange = () => {
     />
     <div
       v-if="showDatePicker"
-      class="flex absolute top-9 ltr:left-0 rtl:right-0 z-30 shadow-md select-none w-[880px] h-[490px] rounded-2xl bg-n-alpha-3 backdrop-blur-[100px] border-0 outline outline-1 outline-n-container"
+      class="flex absolute top-9 ltr:left-0 rtl:right-0 z-30 shadow-md select-none w-[880px] h-[490px] rounded-2xl border border-slate-50 dark:border-slate-800 bg-white dark:bg-slate-800"
     >
       <CalendarDateRange
         :selected-range="selectedRange"
         @set-range="setDateRange"
       />
       <div
-        class="flex flex-col w-[680px] ltr:border-l rtl:border-r border-n-strong"
+        class="flex flex-col w-[680px] ltr:border-l rtl:border-r border-slate-50 dark:border-slate-700/50"
       >
         <div class="flex justify-around h-fit">
           <!-- Calendars for Start and End Dates -->
@@ -251,12 +251,12 @@ const emitDateRange = () => {
               @validate="updateManualInput($event, calendar)"
               @error="handleManualInputError($event)"
             />
-            <div class="py-5 border-b border-n-strong">
+            <div class="py-5 border-b border-slate-50 dark:border-slate-700/50">
               <div
                 class="flex flex-col items-center gap-2 px-5 min-w-[340px] max-h-[352px]"
                 :class="
                   calendar === START_CALENDAR &&
-                  'ltr:border-r rtl:border-l border-n-strong'
+                  'ltr:border-r rtl:border-l border-slate-50 dark:border-slate-700/50'
                 "
               >
                 <CalendarYear

app/javascript/dashboard/components/ui/DatePicker/components/CalendarAction.vue

@@ -1,8 +1,6 @@
 <script setup>
 import { CALENDAR_PERIODS } from '../helpers/DatePickerHelper';
 
-import NextButton from 'dashboard/components-next/button/Button.vue';
-
 defineProps({
   calendarType: {
     type: String,
@@ -40,38 +38,42 @@ const onClickSetView = (type, mode) => {
 
 <template>
   <div class="flex items-start justify-between w-full h-9">
-    <NextButton
-      slate
-      ghost
-      xs
-      icon="i-lucide-chevron-left"
-      class="rtl:rotate-180"
+    <button
+      class="p-1 rounded-lg hover:bg-slate-75 dark:hover:bg-slate-700/50 rtl:rotate-180"
       @click="onClickPrev(calendarType)"
-    />
+    >
+      <fluent-icon
+        icon="chevron-left"
+        size="14"
+        class="text-slate-900 dark:text-slate-50"
+      />
+    </button>
     <div class="flex items-center gap-1">
       <button
         v-if="firstButtonLabel"
-        class="p-0 text-sm font-medium text-center text-n-slate-12 hover:text-n-brand"
+        class="p-0 text-sm font-medium text-center text-slate-800 dark:text-slate-50 hover:text-woot-600 dark:hover:text-woot-600"
         @click="onClickSetView(calendarType, viewMode)"
       >
         {{ firstButtonLabel }}
       </button>
       <button
         v-if="buttonLabel"
-        class="p-0 text-sm font-medium text-center text-n-slate-12"
-        :class="{ 'hover:text-n-brand': viewMode }"
+        class="p-0 text-sm font-medium text-center text-slate-800 dark:text-slate-50"
+        :class="{ 'hover:text-woot-600 dark:hover:text-woot-600': viewMode }"
         @click="onClickSetView(calendarType, YEAR)"
       >
         {{ buttonLabel }}
       </button>
     </div>
-    <NextButton
-      slate
-      ghost
-      xs
-      icon="i-lucide-chevron-right"
-      class="rtl:rotate-180"
+    <button
+      class="p-1 rounded-lg hover:bg-slate-75 dark:hover:bg-slate-700/50 rtl:rotate-180"
       @click="onClickNext(calendarType)"
-    />
+    >
+      <fluent-icon
+        icon="chevron-right"
+        size="14"
+        class="text-slate-900 dark:text-slate-50"
+      />
+    </button>
   </div>
 </template>

app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateInput.vue

@@ -65,7 +65,7 @@ const validateDate = () => {
     <input
       v-model="localDateValue"
       type="text"
-      class="!text-sm !mb-0 disabled:!outline-n-strong"
+      class="reset-base border bg-slate-25 dark:bg-slate-900 ring-offset-ash-900 border-slate-50 dark:border-slate-700/50 w-full disabled:text-slate-200 dark:disabled:text-slate-700 disabled:cursor-not-allowed text-slate-800 dark:text-slate-50 px-1.5 py-1 text-sm rounded-xl h-10"
       :placeholder="dateFormat"
       :disabled="isDisabled"
       @keypress.enter="validateDate"

app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateRange.vue

@@ -18,7 +18,7 @@ const setDateRange = range => {
 <template>
   <div class="w-[200px] flex flex-col items-start">
     <h4
-      class="w-full px-5 py-4 text-sm font-medium capitalize text-start text-n-slate-12"
+      class="w-full px-5 py-4 text-sm font-medium capitalize text-start text-slate-600 dark:text-slate-200"
     >
       {{ $t('DATE_PICKER.DATE_RANGE_OPTIONS.TITLE') }}
     </h4>
@@ -26,11 +26,11 @@ const setDateRange = range => {
       <button
         v-for="range in dateRanges"
         :key="range.label"
-        class="w-full px-5 py-3 text-sm font-medium truncate border-none rounded-none text-start hover:bg-n-alpha-2 dark:hover:bg-n-solid-3"
+        class="w-full px-5 py-3 text-sm font-medium truncate border-none rounded-none text-start hover:bg-slate-50 dark:hover:bg-slate-700"
         :class="
           range.value === selectedRange
-            ? 'text-n-slate-12 bg-n-alpha-1 dark:bg-n-solid-active'
-            : 'text-n-slate-12'
+            ? 'text-slate-800 dark:text-slate-50 bg-slate-50 dark:bg-slate-700'
+            : 'text-slate-600 dark:text-slate-200'
         "
         @click="setDateRange(range)"
       >

app/javascript/dashboard/components/ui/DatePicker/components/CalendarFooter.vue

@@ -1,6 +1,4 @@
 <script setup>
-import NextButton from 'dashboard/components-next/button/Button.vue';
-
 const emit = defineEmits(['clear', 'change']);
 
 const onClickClear = () => {
@@ -13,19 +11,18 @@ const onClickApply = () => {
 </script>
 
 <template>
-  <div class="h-[56px] flex justify-between gap-2 px-2 py-3 items-center">
-    <NextButton
-      slate
-      ghost
-      sm
-      :label="$t('DATE_PICKER.CLEAR_BUTTON')"
+  <div class="h-[56px] flex justify-between px-5 py-3 items-center">
+    <button
+      class="p-1.5 rounded-lg w-fit text-sm font-medium text-slate-600 dark:text-slate-200 hover:text-slate-800 dark:hover:text-slate-100"
       @click="onClickClear"
-    />
-    <NextButton
-      sm
-      ghost
-      :label="$t('DATE_PICKER.APPLY_BUTTON')"
+    >
+      {{ $t('DATE_PICKER.CLEAR_BUTTON') }}
+    </button>
+    <button
+      class="p-1.5 rounded-lg w-fit text-sm font-medium text-woot-500 dark:text-woot-300 hover:text-woot-700 dark:hover:text-woot-500"
       @click="onClickApply"
-    />
+    >
+      {{ $t('DATE_PICKER.APPLY_BUTTON') }}
+    </button>
   </div>
 </template>

app/javascript/dashboard/components/ui/DatePicker/components/CalendarMonth.vue

@@ -71,12 +71,10 @@ const selectMonth = index => {
       <button
         v-for="(month, index) in months"
         :key="index"
-        class="p-2 text-sm font-medium text-center text-n-slate-12 w-[92px] h-10 rounded-lg py-2.5 px-2"
+        class="p-2 text-sm font-medium text-center text-slate-800 dark:text-slate-50 w-[92px] h-10 rounded-lg py-2.5 px-2 hover:bg-slate-75 dark:hover:bg-slate-700"
         :class="{
-          'bg-n-brand text-white hover:bg-n-blue-10':
+          'bg-woot-600 dark:bg-woot-600 text-white dark:text-white hover:bg-woot-500 dark:bg-woot-700':
             index === activeMonthIndex,
-          'hover:bg-n-alpha-2 dark:hover:bg-n-solid-3':
-            index !== activeMonthIndex,
         }"
         @click="selectMonth(index)"
       >

app/javascript/dashboard/components/ui/DatePicker/components/CalendarWeek.vue

@@ -107,16 +107,17 @@ const isNextDayInRange = day => {
 };
 
 const dayClasses = day => ({
-  'text-n-slate-10 pointer-events-none': !isInCurrentMonth(day),
-  'text-n-slate-12 hover:text-n-slate-12 hover:bg-n-blue-6 dark:hover:bg-n-blue-7':
+  'text-slate-500 dark:text-slate-400 pointer-events-none':
+    !isInCurrentMonth(day),
+  'text-slate-800 dark:text-slate-50 hover:text-slate-800 dark:hover:text-white hover:bg-woot-100 dark:hover:bg-woot-700':
     isInCurrentMonth(day),
-  'bg-n-brand text-white':
+  'bg-woot-600 dark:bg-woot-600 text-white dark:text-white':
     isSelectedStartOrEndDate(day) && isInCurrentMonth(day),
-  'bg-n-blue-4 dark:bg-n-blue-5':
+  'bg-woot-50 dark:bg-woot-800':
     (isInRange(day) || isHoveringInRange(day)) &&
     !isSelectedStartOrEndDate(day) &&
     isInCurrentMonth(day),
-  'outline outline-1 outline-n-blue-8 -outline-offset-1 !text-n-blue-text':
+  'outline outline-1 outline-woot-200 -outline-offset-1 dark:outline-woot-700 text-woot-600 dark:text-woot-400':
     isToday(props.currentDate, day) && !isSelectedStartOrEndDate(day),
 });
 </script>
@@ -163,7 +164,7 @@ const dayClasses = day => ({
             !isLastDayOfMonth(day) &&
             isInCurrentMonth(day)
           "
-          class="absolute bottom-0 w-6 h-8 ltr:-right-4 rtl:-left-4 bg-n-blue-4 dark:bg-n-blue-5 -z-10"
+          class="absolute bottom-0 w-6 h-8 ltr:-right-4 rtl:-left-4 bg-woot-50 dark:bg-woot-800 -z-10"
         />
       </div>
     </div>

app/javascript/dashboard/components/ui/DatePicker/components/CalendarYear.vue

@@ -72,10 +72,10 @@ const selectYear = year => {
       <button
         v-for="year in years"
         :key="year"
-        class="p-2 text-sm font-medium text-center text-n-slate-12 w-[144px] h-10 rounded-lg py-2.5 px-2"
+        class="p-2 text-sm font-medium text-center text-slate-800 dark:text-slate-50 w-[144px] h-10 rounded-lg py-2.5 px-2 hover:bg-slate-75 dark:hover:bg-slate-700"
         :class="{
-          'bg-n-brand text-white hover:bg-n-blue-10': year === activeYear,
-          'hover:bg-n-alpha-2 dark:hover:bg-n-solid-3': year !== activeYear,
+          'bg-woot-600 dark:bg-woot-600 text-white dark:text-white hover:bg-woot-500 dark:hover:bg-woot-700':
+            year === activeYear,
         }"
         @click="selectYear(year)"
       >

app/javascript/dashboard/components/ui/DatePicker/components/DatePickerButton.vue

@@ -48,7 +48,7 @@ const openDatePicker = () => {
 
 <template>
   <button
-    class="inline-flex relative items-center rounded-lg gap-2 py-1.5 px-3 h-8 bg-n-alpha-2 hover:bg-n-alpha-1 active:bg-n-alpha-1"
+    class="inline-flex relative items-center rounded-lg gap-2 py-1.5 px-3 h-8 bg-slate-50 dark:bg-slate-800 hover:bg-slate-50 dark:hover:bg-slate-800 active:bg-slate-75 dark:active:bg-slate-800"
     @click="openDatePicker"
   >
     <fluent-icon

app/javascript/dashboard/components/widgets/ChannelItem.vue

@@ -17,9 +17,6 @@ export default {
     hasFbConfigured() {
       return window.chatwootConfig?.fbAppId;
     },
-    hasInstagramConfigured() {
-      return window.chatwootConfig?.instagramAppId;
-    },
     isActive() {
       const { key } = this.channel;
       if (Object.keys(this.enabledFeatures).length === 0) {
@@ -36,9 +33,7 @@ export default {
       }
 
       if (key === 'instagram') {
-        return (
-          this.enabledFeatures.channel_instagram && this.hasInstagramConfigured
-        );
+        return this.enabledFeatures.channel_instagram;
       }
 
       return [

app/javascript/dashboard/components/widgets/WootWriter/Editor.vue

@@ -220,7 +220,6 @@ const plugins = computed(() => {
       trigger: '@',
       showMenu: showUserMentions,
       searchTerm: mentionSearchKey,
-      isAllowed: () => props.isPrivate,
     }),
     createSuggestionPlugin({
       trigger: '/',

app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue

@@ -202,7 +202,7 @@ export default {
       if (this.isALineChannel) {
         return ALLOWED_FILE_TYPES_FOR_LINE;
       }
-      if (this.isAnInstagramChannel || this.isInstagramDM) {
+      if (this.isAInstagramChannel || this.isInstagramDM) {
         return ALLOWED_FILE_TYPES_FOR_INSTAGRAM;
       }
 

app/javascript/dashboard/components/widgets/conversation/MessagesView.vue

@@ -36,7 +36,6 @@ 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 { INBOX_TYPES } from 'dashboard/helper/inbox';
 
 import NextButton from 'dashboard/components-next/button/Button.vue';
 
@@ -210,22 +209,6 @@ export default {
       return contactLastSeenAt;
     },
 
-    // Check there is a instagram inbox exists with the same instagram_id
-    hasDuplicateInstagramInbox() {
-      const instagramId = this.inbox.instagram_id;
-      const { additional_attributes: additionalAttributes = {} } = this.inbox;
-      const instagramInbox =
-        this.$store.getters['inboxes/getInstagramInboxByInstagramId'](
-          instagramId
-        );
-
-      return (
-        this.inbox.channel_type === INBOX_TYPES.FB &&
-        additionalAttributes.type === 'instagram_direct_message' &&
-        instagramInbox
-      );
-    },
-
     replyWindowBannerMessage() {
       if (this.isAWhatsAppChannel) {
         return this.$t('CONVERSATION.TWILIO_WHATSAPP_CAN_REPLY');
@@ -235,21 +218,15 @@ export default {
         if (additionalAttributes) {
           const {
             agent_reply_time_window_message: agentReplyTimeWindowMessage,
-            agent_reply_time_window: agentReplyTimeWindow,
           } = additionalAttributes;
-          return (
-            agentReplyTimeWindowMessage ||
-            this.$t('CONVERSATION.API_HOURS_WINDOW', {
-              hours: agentReplyTimeWindow,
-            })
-          );
+          return agentReplyTimeWindowMessage;
         }
         return '';
       }
       return this.$t('CONVERSATION.CANNOT_REPLY');
     },
     replyWindowLink() {
-      if (this.isAFacebookInbox || this.isAnInstagramChannel) {
+      if (this.isAFacebookInbox || this.isAInstagramChannel) {
         return REPLY_POLICY.FACEBOOK;
       }
       if (this.isAWhatsAppCloudChannel) {
@@ -264,7 +241,7 @@ export default {
       if (
         this.isAWhatsAppChannel ||
         this.isAFacebookInbox ||
-        this.isAnInstagramChannel
+        this.isAInstagramChannel
       ) {
         return this.$t('CONVERSATION.24_HOURS_WINDOW');
       }
@@ -520,12 +497,6 @@ export default {
       :href-link="replyWindowLink"
       :href-link-text="replyWindowLinkText"
     />
-    <Banner
-      v-else-if="hasDuplicateInstagramInbox"
-      color-scheme="alert"
-      class="mx-2 mt-2 overflow-hidden rounded-lg"
-      :banner-message="$t('CONVERSATION.OLD_INSTAGRAM_INBOX_REPLY_BANNER')"
-    />
     <div class="flex justify-end">
       <NextButton
         faded

app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue

@@ -241,27 +241,15 @@ export default {
       if (this.isAFacebookInbox) {
         return MESSAGE_MAX_LENGTH.FACEBOOK;
       }
-      if (this.isAnInstagramChannel) {
-        return MESSAGE_MAX_LENGTH.INSTAGRAM;
-      }
-      if (this.isATwilioWhatsAppChannel) {
+      if (this.isAWhatsAppChannel) {
         return MESSAGE_MAX_LENGTH.TWILIO_WHATSAPP;
       }
-      if (this.isAWhatsAppCloudChannel) {
-        return MESSAGE_MAX_LENGTH.WHATSAPP_CLOUD;
-      }
       if (this.isASmsInbox) {
         return MESSAGE_MAX_LENGTH.TWILIO_SMS;
       }
       if (this.isAnEmailChannel) {
         return MESSAGE_MAX_LENGTH.EMAIL;
       }
-      if (this.isATwilioSMSChannel) {
-        return MESSAGE_MAX_LENGTH.TWILIO_SMS;
-      }
-      if (this.isAWhatsAppChannel) {
-        return MESSAGE_MAX_LENGTH.WHATSAPP_CLOUD;
-      }
       return MESSAGE_MAX_LENGTH.GENERAL;
     },
     showFileUpload() {
@@ -274,7 +262,7 @@ export default {
         this.isASmsInbox ||
         this.isATelegramChannel ||
         this.isALineChannel ||
-        this.isAnInstagramChannel
+        this.isAInstagramChannel
       );
     },
     replyButtonLabel() {
@@ -400,14 +388,9 @@ export default {
     },
   },
   watch: {
-    currentChat(conversation, oldConversation) {
+    currentChat(conversation) {
       const { can_reply: canReply } = conversation;
-      if (oldConversation && oldConversation.id !== conversation.id) {
-        // Only update email fields when switching to a completely different conversation (by ID)
-        // This prevents overwriting user input (e.g., CC/BCC fields) when performing actions
-        // like self-assign or other updates that do not actually change the conversation context
-        this.setCCAndToEmailsFromLastChat();
-      }
+      this.setCCAndToEmailsFromLastChat();
 
       if (this.isOnPrivateNote) {
         return;
@@ -423,12 +406,13 @@ export default {
     },
     // When moving from one conversation to another, the store may not have the
     // list of all the messages. A fetch is subsequently made to get the messages.
-    // This watcher handles two main cases:
-    // 1. When switching conversations and messages are fetched/updated, ensures CC/BCC fields are set from the latest OUTGOING/INCOMING email (not activity/private messages).
-    // 2. Fixes and issue where CC/BCC fields could be reset/lost after assignment/activity actions or message mutations that did not represent a true email context change.
-    lastEmail: {
-      handler(lastEmail) {
-        if (!lastEmail) return;
+    // However, this update does not trigger the `currentChat` watcher.
+    // We can add a deep watcher to it, but then, that would be too broad of a net to cast
+    // And would impact performance too. So we watch the messages directly.
+    // The watcher here is `deep` too, because the messages array is mutated and
+    // not replaced. So, a shallow watcher would not catch the change.
+    'currentChat.messages': {
+      handler() {
         this.setCCAndToEmailsFromLastChat();
       },
       deep: true,
@@ -702,11 +686,7 @@ export default {
           this.isATwilioWhatsAppChannel ||
           this.isAWhatsAppCloudChannel ||
           this.is360DialogWhatsAppChannel;
-        // When users send messages containing both text and attachments on Instagram, Instagram treats them as separate messages.
-        // Although Chatwoot combines these into a single message, Instagram sends separate echo events for each component.
-        // This can create duplicate messages in Chatwoot. To prevent this issue, we'll handle text and attachments as separate messages.
-        const isOnInstagram = this.isAnInstagramChannel;
-        if ((isOnWhatsApp || isOnInstagram) && !this.isPrivate) {
+        if (isOnWhatsApp && !this.isPrivate) {
           this.sendMessageAsMultipleMessages(this.message);
         } else {
           const messagePayload = this.getMessagePayload(this.message);
@@ -723,7 +703,7 @@ export default {
       }
     },
     sendMessageAsMultipleMessages(message) {
-      const messages = this.getMultipleMessagesPayload(message);
+      const messages = this.getMessagePayloadForWhatsapp(message);
       messages.forEach(messagePayload => {
         this.sendMessage(messagePayload);
       });
@@ -955,11 +935,11 @@ export default {
 
       return payload;
     },
-    getMultipleMessagesPayload(message) {
+    getMessagePayloadForWhatsapp(message) {
       const multipleMessagePayload = [];
 
       if (this.attachedFiles && this.attachedFiles.length) {
-        let caption = this.isAnInstagramChannel ? '' : message;
+        let caption = message;
         this.attachedFiles.forEach(attachment => {
           const attachedFile = this.globalConfig.directUploadsEnabled
             ? attachment.blobSignedId
@@ -974,19 +954,9 @@ export default {
 
           attachmentPayload = this.setReplyToInPayload(attachmentPayload);
           multipleMessagePayload.push(attachmentPayload);
-          // For WhatsApp, only the first attachment gets a caption
-          if (!this.isAnInstagramChannel) caption = '';
+          caption = '';
         });
-      }
-
-      const hasNoAttachments =
-        !this.attachedFiles || !this.attachedFiles.length;
-      // For Instagram, we need a separate text message
-      // For WhatsApp, we only need a text message if there are no attachments
-      if (
-        (this.isAnInstagramChannel && this.message) ||
-        (!this.isAnInstagramChannel && hasNoAttachments)
-      ) {
+      } else {
         let messagePayload = {
           conversationId: this.currentChat.id,
           message,
@@ -1166,7 +1136,7 @@ export default {
         v-else-if="!showRichContentEditor"
         ref="messageInput"
         v-model="message"
-        class="rounded-none input"
+        class="input"
         :placeholder="messagePlaceHolder"
         :min-height="4"
         :signature="signatureToApply"

app/javascript/dashboard/components/widgets/conversation/TagAgents.vue

@@ -69,6 +69,10 @@ const onAgentSelect = index => {
       v-if="items.length"
       ref="tagAgentsRef"
       class="vertical dropdown menu mention--box bg-n-solid-1 p-1 rounded-xl text-sm overflow-auto absolute w-full z-20 shadow-md left-0 leading-[1.2] bottom-full max-h-[12.5rem] border border-solid border-n-strong"
+      :class="{
+        'border-b-[0.5rem] border-solid border-white dark:!border-slate-700':
+          items.length <= 4,
+      }"
     >
       <li
         v-for="(agent, index) in items"

app/javascript/dashboard/components/widgets/conversation/linear/index.vue

@@ -124,7 +124,7 @@ onMounted(() => {
       v-if="linkedIssue"
       :issue="linkedIssue.issue"
       :link-id="linkedIssue.id"
-      class="absolute right-0 top-[32px] invisible group-hover:visible"
+      class="absolute right-0 top-[40px] invisible group-hover:visible"
       @unlink-issue="unlinkIssue"
     />
     <woot-modal

app/javascript/dashboard/composables/spec/useTranslations.spec.js

@@ -1,39 +0,0 @@
-import { ref } from 'vue';
-import { useTranslations } from '../useTranslations';
-
-describe('useTranslations', () => {
-  it('returns false and null when contentAttributes is null', () => {
-    const contentAttributes = ref(null);
-    const { hasTranslations, translationContent } =
-      useTranslations(contentAttributes);
-    expect(hasTranslations.value).toBe(false);
-    expect(translationContent.value).toBeNull();
-  });
-
-  it('returns false and null when translations are missing', () => {
-    const contentAttributes = ref({});
-    const { hasTranslations, translationContent } =
-      useTranslations(contentAttributes);
-    expect(hasTranslations.value).toBe(false);
-    expect(translationContent.value).toBeNull();
-  });
-
-  it('returns false and null when translations is an empty object', () => {
-    const contentAttributes = ref({ translations: {} });
-    const { hasTranslations, translationContent } =
-      useTranslations(contentAttributes);
-    expect(hasTranslations.value).toBe(false);
-    expect(translationContent.value).toBeNull();
-  });
-
-  it('returns true and correct translation content when translations exist', () => {
-    const contentAttributes = ref({
-      translations: { en: 'Hello' },
-    });
-    const { hasTranslations, translationContent } =
-      useTranslations(contentAttributes);
-    expect(hasTranslations.value).toBe(true);
-    // Should return the first translation (en: 'Hello')
-    expect(translationContent.value).toBe('Hello');
-  });
-});

app/javascript/dashboard/composables/useInbox.js

@@ -121,7 +121,7 @@ export const useInbox = () => {
     );
   });
 
-  const isAnInstagramChannel = computed(() => {
+  const isAInstagramChannel = computed(() => {
     return channelType.value === INBOX_TYPES.INSTAGRAM;
   });
 
@@ -141,6 +141,6 @@ export const useInbox = () => {
     isAWhatsAppCloudChannel,
     is360DialogWhatsAppChannel,
     isAnEmailChannel,
-    isAnInstagramChannel,
+    isAInstagramChannel,
   };
 };

app/javascript/dashboard/composables/useReportMetrics.js

@@ -7,12 +7,8 @@ import { formatTime } from '@chatwoot/utils';
  * @param {string} [accountSummaryKey='getAccountSummary'] - The key for accessing account summary data.
  * @returns {Object} An object containing utility functions for report metrics.
  */
-export function useReportMetrics(
-  accountSummaryKey = 'getAccountSummary',
-  summarFetchingKey = 'getAccountSummaryFetchingStatus'
-) {
+export function useReportMetrics(accountSummaryKey = 'getAccountSummary') {
   const accountSummary = useMapGetter(accountSummaryKey);
-  const fetchingStatus = useMapGetter(summarFetchingKey);
 
   /**
    * Calculates the trend percentage for a given metric.
@@ -57,6 +53,5 @@ export function useReportMetrics(
     calculateTrend,
     isAverageMetricType,
     displayMetric,
-    fetchingStatus,
   };
 }

app/javascript/dashboard/composables/useTranslations.js

@@ -1,22 +0,0 @@
-import { computed } from 'vue';
-
-/**
- * Composable to extract translation state/content from contentAttributes.
- * @param {Ref|Reactive} contentAttributes - Ref or reactive object containing `translations` property
- * @returns {Object} { hasTranslations, translationContent }
- */
-export function useTranslations(contentAttributes) {
-  const hasTranslations = computed(() => {
-    if (!contentAttributes.value) return false;
-    const { translations = {} } = contentAttributes.value;
-    return Object.keys(translations || {}).length > 0;
-  });
-
-  const translationContent = computed(() => {
-    if (!hasTranslations.value) return null;
-    const translations = contentAttributes.value.translations;
-    return translations[Object.keys(translations)[0]];
-  });
-
-  return { hasTranslations, translationContent };
-}

app/javascript/dashboard/composables/useUISettings.js

@@ -36,7 +36,7 @@ const useConversationSidebarItemsOrder = uiSettings => {
     const { conversation_sidebar_items_order: itemsOrder } = uiSettings.value;
     // If the sidebar order is not set, use the default order.
     if (!itemsOrder) {
-      return [...DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER];
+      return DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER;
     }
     // Create a copy of itemsOrder to avoid mutating the original store object.
     const itemsOrderCopy = [...itemsOrder];

app/javascript/dashboard/helper/permissionsHelper.js

@@ -16,15 +16,6 @@ export const getUserPermissions = (user, accountId) => {
   return currentAccount.permissions || [];
 };
 
-export const getUserRole = (user, accountId) => {
-  const currentAccount = getCurrentAccount(user, accountId) || {};
-  if (currentAccount.custom_role_id) {
-    return 'custom_role';
-  }
-
-  return currentAccount.role || 'agent';
-};
-
 const isPermissionsPresentInRoute = route =>
   route.meta && route.meta.permissions;
 

app/javascript/dashboard/helper/portalHelper.js

@@ -1,44 +1,6 @@
-/**
- * Formats a custom domain with https protocol if needed
- * @param {string} customDomain - The custom domain to format
- * @returns {string} Formatted domain with https protocol
- */
-const formatCustomDomain = customDomain =>
-  customDomain.startsWith('https') ? customDomain : `https://${customDomain}`;
-
-/**
- * Gets the default base URL from configuration
- * @returns {string} The default base URL
- * @throws {Error} If no valid base URL is found
- */
-const getDefaultBaseURL = () => {
-  const { hostURL, helpCenterURL } = window.chatwootConfig || {};
+export const buildPortalURL = portalSlug => {
+  const { hostURL, helpCenterURL } = window.chatwootConfig;
   const baseURL = helpCenterURL || hostURL || '';
-
-  if (!baseURL) {
-    throw new Error('No valid base URL found in configuration');
-  }
-
-  return baseURL;
-};
-
-/**
- * Gets the base URL from configuration or custom domain
- * @param {string} [customDomain] - Optional custom domain for the portal
- * @returns {string} The base URL for the portal
- */
-const getPortalBaseURL = customDomain =>
-  customDomain ? formatCustomDomain(customDomain) : getDefaultBaseURL();
-
-/**
- * Builds a portal URL using the provided portal slug and optional custom domain
- * @param {string} portalSlug - The slug identifier for the portal
- * @param {string} [customDomain] - Optional custom domain for the portal
- * @returns {string} The complete portal URL
- * @throws {Error} If portalSlug is not provided or invalid
- */
-export const buildPortalURL = (portalSlug, customDomain) => {
-  const baseURL = getPortalBaseURL(customDomain);
   return `${baseURL}/hc/${portalSlug}`;
 };
 
@@ -46,10 +8,9 @@ export const buildPortalArticleURL = (
   portalSlug,
   categorySlug,
   locale,
-  articleSlug,
-  customDomain
+  articleSlug
 ) => {
-  const portalURL = buildPortalURL(portalSlug, customDomain);
+  const portalURL = buildPortalURL(portalSlug);
   return `${portalURL}/articles/${articleSlug}`;
 };
 

app/javascript/dashboard/helper/specs/portalHelper.spec.js

@@ -25,47 +25,5 @@ describe('PortalHelper', () => {
       ).toEqual('https://help.chatwoot.com/hc/handbook/articles/article-slug');
       window.chatwootConfig = {};
     });
-
-    it('returns the correct url with custom domain', () => {
-      window.chatwootConfig = {
-        hostURL: 'https://app.chatwoot.com',
-        helpCenterURL: 'https://help.chatwoot.com',
-      };
-      expect(
-        buildPortalArticleURL(
-          'handbook',
-          'culture',
-          'fr',
-          'article-slug',
-          'custom-domain.dev'
-        )
-      ).toEqual('https://custom-domain.dev/hc/handbook/articles/article-slug');
-    });
-
-    it('handles https in custom domain correctly', () => {
-      window.chatwootConfig = {
-        hostURL: 'https://app.chatwoot.com',
-        helpCenterURL: 'https://help.chatwoot.com',
-      };
-      expect(
-        buildPortalArticleURL(
-          'handbook',
-          'culture',
-          'fr',
-          'article-slug',
-          'https://custom-domain.dev'
-        )
-      ).toEqual('https://custom-domain.dev/hc/handbook/articles/article-slug');
-    });
-
-    it('uses hostURL when helpCenterURL is not available', () => {
-      window.chatwootConfig = {
-        hostURL: 'https://app.chatwoot.com',
-        helpCenterURL: '',
-      };
-      expect(
-        buildPortalArticleURL('handbook', 'culture', 'fr', 'article-slug')
-      ).toEqual('https://app.chatwoot.com/hc/handbook/articles/article-slug');
-    });
   });
 });

app/javascript/dashboard/i18n/locale/en/agentBots.json

@@ -2,13 +2,23 @@
   "AGENT_BOTS": {
     "HEADER": "Bots",
     "LOADING_EDITOR": "Loading editor...",
-    "DESCRIPTION": "Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try. You can manage your bots from this page or create new ones using the 'Add Bot' button.",
+    "DESCRIPTION": "Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try.You can manage your bots from this page or create new ones using the 'Configure new bot' button.",
     "LEARN_MORE": "Learn about agent bots",
-    "GLOBAL_BOT": "System bot",
-    "GLOBAL_BOT_BADGE": "System",
-    "AVATAR": {
-      "SUCCESS_DELETE": "Bot avatar deleted successfully",
-      "ERROR_DELETE": "Error deleting bot avatar, please try again"
+    "CSML_BOT_EDITOR": {
+      "NAME": {
+        "LABEL": "Bot name",
+        "PLACEHOLDER": "Name your bot.",
+        "ERROR": "Bot name is required."
+      },
+      "DESCRIPTION": {
+        "LABEL": "Bot description",
+        "PLACEHOLDER": "What does this bot do?"
+      },
+      "BOT_CONFIG": {
+        "ERROR": "Please enter your CSML bot configuration above.",
+        "API_ERROR": "Your CSML configuration is invalid. Please fix it and try again."
+      },
+      "SUBMIT": "Validate and save"
     },
     "BOT_CONFIGURATION": {
       "TITLE": "Select an agent bot",
@@ -22,7 +32,7 @@
       "SELECT_PLACEHOLDER": "Select bot"
     },
     "ADD": {
-      "TITLE": "Add Bot",
+      "TITLE": "Configure new bot",
       "CANCEL_BUTTON_TEXT": "Cancel",
       "API": {
         "SUCCESS_MESSAGE": "Bot added successfully.",
@@ -30,22 +40,16 @@
       }
     },
     "LIST": {
-      "404": "No bots found. You can create a bot by clicking the 'Add Bot' button.",
+      "404": "No bots found. You can create a bot by clicking the 'Configure new bot' button ↗",
       "LOADING": "Fetching bots...",
-      "TABLE_HEADER": {
-        "DETAILS": "Bot Details",
-        "URL": "Webhook URL"
-      }
+      "TYPE": "Bot type"
     },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "TITLE": "Delete bot",
-      "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure you want to delete {name}?",
-        "YES": "Yes, Delete",
-        "NO": "No, Keep"
-      },
+      "SUBMIT": "Delete",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible.",
       "API": {
         "SUCCESS_MESSAGE": "Bot deleted successfully.",
         "ERROR_MESSAGE": "Could not delete bot. Please try again."
@@ -53,44 +57,17 @@
     },
     "EDIT": {
       "BUTTON_TEXT": "Edit",
+      "LOADING": "Fetching bots...",
       "TITLE": "Edit bot",
+      "CANCEL_BUTTON_TEXT": "Cancel",
       "API": {
         "SUCCESS_MESSAGE": "Bot updated successfully.",
         "ERROR_MESSAGE": "Could not update bot. Please try again."
       }
     },
-    "FORM": {
-      "AVATAR": {
-        "LABEL": "Bot avatar"
-      },
-      "NAME": {
-        "LABEL": "Bot name",
-        "PLACEHOLDER": "Enter bot name",
-        "REQUIRED": "Bot name is required"
-      },
-      "DESCRIPTION": {
-        "LABEL": "Description",
-        "PLACEHOLDER": "What does this bot do?"
-      },
-      "WEBHOOK_URL": {
-        "LABEL": "Webhook URL",
-        "PLACEHOLDER": "https://example.com/webhook",
-        "REQUIRED": "Webhook URL is required"
-      },
-      "ERRORS": {
-        "NAME": "Bot name is required",
-        "URL": "Webhook URL is required",
-        "VALID_URL": "Please enter a valid URL starting with http:// or https://"
-      },
-      "CANCEL": "Cancel",
-      "CREATE": "Create Bot",
-      "UPDATE": "Update Bot"
-    },
-    "WEBHOOK": {
-      "DESCRIPTION": "Configure a webhook bot to integrate with your custom services. The bot will receive and process events from conversations and can respond to them."
-    },
     "TYPES": {
-      "WEBHOOK": "Webhook bot"
+      "WEBHOOK": "Webhook bot",
+      "CSML": "CSML bot"
     }
   }
 }

app/javascript/dashboard/i18n/locale/en/conversation.json

@@ -32,12 +32,10 @@
     "LOADING_CONVERSATIONS": "Loading Conversations",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
-    "API_HOURS_WINDOW": "You can only reply to this conversation within {hours} hours",
     "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
     "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
-    "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "This Instagram account was migrated to the new Instagram channel inbox. All new messages will show up there. You won’t be able to send messages from this conversation anymore.",
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",

app/javascript/dashboard/i18n/locale/en/inboxMgmt.json

@@ -51,9 +51,7 @@
         "CONNECT_YOUR_INSTAGRAM_PROFILE": "Connect your Instagram Profile",
         "HELP": "To add your Instagram profile as a channel, you need to authenticate your Instagram Profile by clicking on 'Continue with Instagram' ",
         "ERROR_MESSAGE": "There was an error connecting to Instagram, please try again",
-        "ERROR_AUTH": "There was an error connecting to Instagram, please try again",
-        "NEW_INBOX_SUGGESTION": "This Instagram account was previously linked to a different inbox and has now been migrated here. All new messages will appear here. The old inbox will no longer be able to send or receive messages for this account.",
-        "DUPLICATE_INBOX_BANNER": "This Instagram account was migrated to the new Instagram channel inbox. You won’t be able to send/receive Instagram messages from this inbox anymore."
+        "ERROR_AUTH": "There was an error connecting to Instagram, please try again"
       },
       "TWITTER": {
         "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",

app/javascript/dashboard/i18n/locale/en/integrations.json

@@ -326,7 +326,6 @@
     "HEADER_KNOW_MORE": "Know more",
     "COPILOT": {
       "SEND_MESSAGE": "Send message...",
-      "EMPTY_MESSAGE": "There was an error generating the response. Please try again.",
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",

app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue

@@ -120,7 +120,6 @@ export default {
 
   mounted() {
     this.$store.dispatch('agents/get');
-    this.$store.dispatch('portals/index');
     this.initialize();
     this.$watch('$store.state.route', () => this.initialize());
     this.$watch('chatList.length', () => {

app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue

@@ -1,7 +1,6 @@
 <script>
 import { debounce } from '@chatwoot/utils';
 import { useAlert } from 'dashboard/composables';
-import { mapGetters } from 'vuex';
 import allLocales from 'shared/constants/locales.js';
 
 import SearchHeader from './Header.vue';
@@ -34,15 +33,6 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      portalBySlug: 'portals/portalBySlug',
-    }),
-    portal() {
-      return this.portalBySlug(this.selectedPortalSlug);
-    },
-    portalCustomDomain() {
-      return this.portal?.custom_domain;
-    },
     articleViewerUrl() {
       const article = this.activeArticle(this.activeId);
       if (!article) return '';
@@ -57,7 +47,6 @@ export default {
 
       return `${url}`;
     },
-
     searchResultsWithUrl() {
       return this.searchResults.map(article => ({
         ...article,
@@ -76,8 +65,7 @@ export default {
         this.selectedPortalSlug,
         '',
         '',
-        article.slug,
-        this.portalCustomDomain
+        article.slug
       );
     },
     localeName(code) {
@@ -123,6 +111,7 @@ export default {
     },
     onInsert(id) {
       const article = this.activeArticle(id || this.activeId);
+
       this.$emit('insert', article);
       useAlert(this.$t('HELP_CENTER.ARTICLE_SEARCH.SUCCESS_ARTICLE_INSERTED'));
       this.onClose();

app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesEditPage.vue

@@ -20,23 +20,17 @@ const articleById = useMapGetter('articles/articleById');
 
 const article = computed(() => articleById.value(articleSlug));
 
-const portalBySlug = useMapGetter('portals/portalBySlug');
-
-const portal = computed(() => portalBySlug.value(portalSlug));
-
 const isUpdating = ref(false);
 const isSaved = ref(false);
 
-const articleLink = computed(() => {
+const portalLink = computed(() => {
   const { slug: categorySlug, locale: categoryLocale } = article.value.category;
   const { slug: articleSlugValue } = article.value;
-  const portalCustomDomain = portal.value?.custom_domain;
   return buildPortalArticleURL(
     portalSlug,
     categorySlug,
     categoryLocale,
-    articleSlugValue,
-    portalCustomDomain
+    articleSlugValue
   );
 });
 
@@ -97,7 +91,7 @@ const fetchArticleDetails = () => {
 };
 
 const previewArticle = () => {
-  window.open(articleLink.value, '_blank');
+  window.open(portalLink.value, '_blank');
   useTrack(PORTALS_EVENTS.PREVIEW_ARTICLE, {
     status: article.value?.status,
   });

app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue

@@ -1,191 +1,102 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
 import { useMapGetter, useStore } from 'dashboard/composables/store';
 import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
+import { frontendURL } from 'dashboard/helper/URLHelper';
+
+import AgentBotRow from './components/AgentBotRow.vue';
 
 import SettingsLayout from '../SettingsLayout.vue';
 import BaseSettingsHeader from '../components/BaseSettingsHeader.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
-import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
-import AgentBotModal from './components/AgentBotModal.vue';
-import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
-
-const MODAL_TYPES = {
-  CREATE: 'create',
-  EDIT: 'edit',
-};
 
+const router = useRouter();
 const store = useStore();
 const { t } = useI18n();
 
+const accountId = useMapGetter('getCurrentAccountId');
 const agentBots = useMapGetter('agentBots/getBots');
 const uiFlags = useMapGetter('agentBots/getUIFlags');
 
-const selectedBot = ref({});
-const loading = ref({});
-const modalType = ref(MODAL_TYPES.CREATE);
-const agentBotModalRef = ref(null);
-const agentBotDeleteDialogRef = ref(null);
+const confirmDialog = ref(null);
 
-const tableHeaders = computed(() => {
-  return [
-    t('AGENT_BOTS.LIST.TABLE_HEADER.DETAILS'),
-    t('AGENT_BOTS.LIST.TABLE_HEADER.URL'),
-  ];
-});
-
-const selectedBotName = computed(() => selectedBot.value?.name || '');
-
-const openAddModal = () => {
-  modalType.value = MODAL_TYPES.CREATE;
-  selectedBot.value = {};
-  agentBotModalRef.value.dialogRef.open();
-};
-
-const openEditModal = bot => {
-  modalType.value = MODAL_TYPES.EDIT;
-  selectedBot.value = bot;
-  agentBotModalRef.value.dialogRef.open();
-};
-
-const openDeletePopup = bot => {
-  selectedBot.value = bot;
-  agentBotDeleteDialogRef.value.open();
-};
-
-const deleteAgentBot = async id => {
-  try {
-    await store.dispatch('agentBots/delete', id);
-    useAlert(t('AGENT_BOTS.DELETE.API.SUCCESS_MESSAGE'));
-  } catch (error) {
-    useAlert(t('AGENT_BOTS.DELETE.API.ERROR_MESSAGE'));
-  } finally {
-    loading.value[id] = false;
-    selectedBot.value = {};
-  }
-};
-
-const confirmDeletion = () => {
-  loading.value[selectedBot.value.id] = true;
-  deleteAgentBot(selectedBot.value.id);
-  agentBotDeleteDialogRef.value.close();
+const onConfigureNewBot = () => {
+  router.push({
+    name: 'agent_bots_csml_new',
+  });
 };
 
 onMounted(() => {
   store.dispatch('agentBots/get');
 });
+
+const onDeleteAgentBot = async bot => {
+  const ok = await confirmDialog.value.showConfirmation();
+
+  if (ok) {
+    try {
+      await store.dispatch('agentBots/delete', bot.id);
+      useAlert(t('AGENT_BOTS.DELETE.API.SUCCESS_MESSAGE'));
+    } catch (error) {
+      useAlert(t('AGENT_BOTS.DELETE.API.ERROR_MESSAGE'));
+    }
+  }
+};
+
+const onEditAgentBot = bot => {
+  router.push(
+    frontendURL(
+      `accounts/${accountId.value}/settings/agent-bots/csml/${bot.id}`
+    )
+  );
+};
 </script>
 
 <template>
   <SettingsLayout
     :is-loading="uiFlags.isFetching"
-    :loading-message="t('AGENT_BOTS.LIST.LOADING')"
+    :loading-message="$t('AGENT_BOTS.LIST.LOADING')"
     :no-records-found="!agentBots.length"
-    :no-records-message="t('AGENT_BOTS.LIST.404')"
+    :no-records-message="$t('AGENT_BOTS.LIST.404')"
   >
     <template #header>
       <BaseSettingsHeader
-        :title="t('AGENT_BOTS.HEADER')"
-        :description="t('AGENT_BOTS.DESCRIPTION')"
-        :link-text="t('AGENT_BOTS.LEARN_MORE')"
+        :title="$t('AGENT_BOTS.HEADER')"
+        :description="$t('AGENT_BOTS.DESCRIPTION')"
+        :link-text="$t('AGENT_BOTS.LEARN_MORE')"
         feature-name="agent_bots"
       >
         <template #actions>
           <Button
             icon="i-lucide-circle-plus"
             :label="$t('AGENT_BOTS.ADD.TITLE')"
-            @click="openAddModal"
+            @click="onConfigureNewBot"
           />
         </template>
       </BaseSettingsHeader>
     </template>
     <template #body>
-      <table class="min-w-full overflow-x-auto divide-y divide-n-strong">
-        <thead>
-          <th
-            v-for="thHeader in tableHeaders"
-            :key="thHeader"
-            class="py-4 font-semibold text-left ltr:pr-4 rtl:pl-4 text-n-slate-11"
-          >
-            {{ thHeader }}
-          </th>
-        </thead>
-        <tbody class="flex-1 divide-y divide-n-weak text-n-slate-12">
-          <tr v-for="bot in agentBots" :key="bot.id">
-            <td class="py-4 ltr:pr-4 rtl:pl-4">
-              <div class="flex flex-row items-center gap-4">
-                <Avatar
-                  :name="bot.name"
-                  :src="bot.thumbnail"
-                  :size="40"
-                  rounded-full
-                />
-                <div>
-                  <span class="block font-medium break-words">
-                    {{ bot.name }}
-                    <span
-                      v-if="bot.system_bot"
-                      class="text-xs text-n-slate-12 bg-n-blue-5 inline-block rounded-md py-0.5 px-1 ltr:ml-1 rtl:mr-1"
-                    >
-                      {{ $t('AGENT_BOTS.GLOBAL_BOT_BADGE') }}
-                    </span>
-                  </span>
-                  <span class="text-sm text-n-slate-11">
-                    {{ bot.description }}
-                  </span>
-                </div>
-              </div>
-            </td>
-            <td class="py-4 ltr:pr-4 rtl:pl-4 text-sm">
-              {{ bot.outgoing_url || bot.bot_config?.webhook_url }}
-            </td>
-            <td class="py-4 min-w-xs">
-              <div class="flex gap-1 justify-end">
-                <Button
-                  v-if="!bot.system_bot"
-                  v-tooltip.top="t('AGENT_BOTS.EDIT.BUTTON_TEXT')"
-                  icon="i-lucide-pen"
-                  slate
-                  xs
-                  faded
-                  :is-loading="loading[bot.id]"
-                  @click="openEditModal(bot)"
-                />
-                <Button
-                  v-if="!bot.system_bot"
-                  v-tooltip.top="t('AGENT_BOTS.DELETE.BUTTON_TEXT')"
-                  icon="i-lucide-trash-2"
-                  xs
-                  ruby
-                  faded
-                  :is-loading="loading[bot.id]"
-                  @click="openDeletePopup(bot)"
-                />
-              </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
+      <div class="flex-1 overflow-auto">
+        <table class="divide-y divide-slate-75 dark:divide-slate-700">
+          <tbody class="divide-y divide-n-weak text-n-slate-11">
+            <AgentBotRow
+              v-for="(agentBot, index) in agentBots"
+              :key="agentBot.id"
+              :agent-bot="agentBot"
+              :index="index"
+              @delete="onDeleteAgentBot"
+              @edit="onEditAgentBot"
+            />
+          </tbody>
+        </table>
+        <woot-confirm-modal
+          ref="confirmDialog"
+          :title="$t('AGENT_BOTS.DELETE.TITLE')"
+          :description="$t('AGENT_BOTS.DELETE.DESCRIPTION')"
+        />
+      </div>
     </template>
-
-    <AgentBotModal
-      ref="agentBotModalRef"
-      :type="modalType"
-      :selected-bot="selectedBot"
-    />
-
-    <Dialog
-      ref="agentBotDeleteDialogRef"
-      type="alert"
-      :title="t('AGENT_BOTS.DELETE.CONFIRM.TITLE')"
-      :description="
-        t('AGENT_BOTS.DELETE.CONFIRM.MESSAGE', { name: selectedBotName })
-      "
-      :is-loading="uiFlags.isDeleting"
-      :confirm-button-label="t('AGENT_BOTS.DELETE.CONFIRM.YES')"
-      :cancel-button-label="t('AGENT_BOTS.DELETE.CONFIRM.NO')"
-      @confirm="confirmDeletion"
-    />
   </SettingsLayout>
 </template>

app/javascript/dashboard/routes/dashboard/settings/agentBots/agentBot.routes.js

@@ -1,6 +1,9 @@
 import { FEATURE_FLAGS } from '../../../../featureFlags';
 import Bot from './Index.vue';
+import CsmlEditBot from './csml/Edit.vue';
+import CsmlNewBot from './csml/New.vue';
 import { frontendURL } from '../../../../helper/URLHelper';
+import SettingsContent from '../Wrapper.vue';
 import SettingsWrapper from '../SettingsWrapper.vue';
 
 export default {
@@ -23,5 +26,36 @@ export default {
         },
       ],
     },
+    {
+      path: frontendURL('accounts/:accountId/settings/agent-bots'),
+      component: SettingsContent,
+      props: () => {
+        return {
+          headerTitle: 'AGENT_BOTS.HEADER',
+          icon: 'bot',
+          showBackButton: true,
+        };
+      },
+      children: [
+        {
+          path: 'csml/new',
+          name: 'agent_bots_csml_new',
+          component: CsmlNewBot,
+          meta: {
+            featureFlag: FEATURE_FLAGS.AGENT_BOTS,
+            permissions: ['administrator'],
+          },
+        },
+        {
+          path: 'csml/:botId',
+          name: 'agent_bots_csml_edit',
+          component: CsmlEditBot,
+          meta: {
+            featureFlag: FEATURE_FLAGS.AGENT_BOTS,
+            permissions: ['administrator'],
+          },
+        },
+      ],
+    },
   ],
 };

app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotModal.vue

@@ -1,251 +0,0 @@
-<script setup>
-import { ref, computed, reactive, watch } from 'vue';
-import { useStore, useMapGetter } from 'dashboard/composables/store';
-import { useAlert } from 'dashboard/composables';
-import { useI18n } from 'vue-i18n';
-import { required, helpers, url } from '@vuelidate/validators';
-import { useVuelidate } from '@vuelidate/core';
-
-import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-import Input from 'dashboard/components-next/input/Input.vue';
-import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
-import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
-
-const props = defineProps({
-  type: {
-    type: String,
-    default: 'create',
-    validator: value => ['create', 'edit'].includes(value),
-  },
-  selectedBot: {
-    type: Object,
-    default: () => ({}),
-  },
-});
-
-const MODAL_TYPES = {
-  CREATE: 'create',
-  EDIT: 'edit',
-};
-
-const store = useStore();
-const { t } = useI18n();
-const dialogRef = ref(null);
-const uiFlags = useMapGetter('agentBots/getUIFlags');
-
-const formState = reactive({
-  botName: '',
-  botDescription: '',
-  botUrl: '',
-  botAvatar: null,
-  botAvatarUrl: '',
-});
-
-const v$ = useVuelidate(
-  {
-    botName: {
-      required: helpers.withMessage(
-        () => t('AGENT_BOTS.FORM.ERRORS.NAME'),
-        required
-      ),
-    },
-    botUrl: {
-      required: helpers.withMessage(
-        () => t('AGENT_BOTS.FORM.ERRORS.URL'),
-        required
-      ),
-      url: helpers.withMessage(
-        () => t('AGENT_BOTS.FORM.ERRORS.VALID_URL'),
-        url
-      ),
-    },
-  },
-  formState
-);
-
-const isLoading = computed(() =>
-  props.type === MODAL_TYPES.CREATE
-    ? uiFlags.value.isCreating
-    : uiFlags.value.isUpdating
-);
-
-const dialogTitle = computed(() =>
-  props.type === MODAL_TYPES.CREATE
-    ? t('AGENT_BOTS.ADD.TITLE')
-    : t('AGENT_BOTS.EDIT.TITLE')
-);
-
-const confirmButtonLabel = computed(() =>
-  props.type === MODAL_TYPES.CREATE
-    ? t('AGENT_BOTS.FORM.CREATE')
-    : t('AGENT_BOTS.FORM.UPDATE')
-);
-
-const botNameError = computed(() =>
-  v$.value.botName.$error ? v$.value.botName.$errors[0]?.$message : ''
-);
-
-const botUrlError = computed(() =>
-  v$.value.botUrl.$error ? v$.value.botUrl.$errors[0]?.$message : ''
-);
-
-const resetForm = () => {
-  Object.assign(formState, {
-    botName: '',
-    botDescription: '',
-    botUrl: '',
-    botAvatar: null,
-    botAvatarUrl: '',
-  });
-  v$.value.$reset();
-};
-
-const handleImageUpload = ({ file, url: avatarUrl }) => {
-  formState.botAvatar = file;
-  formState.botAvatarUrl = avatarUrl;
-};
-
-const handleAvatarDelete = async () => {
-  if (props.selectedBot?.id) {
-    try {
-      await store.dispatch(
-        'agentBots/deleteAgentBotAvatar',
-        props.selectedBot.id
-      );
-      formState.botAvatar = null;
-      formState.botAvatarUrl = '';
-      useAlert(t('AGENT_BOTS.AVATAR.SUCCESS_DELETE'));
-    } catch (error) {
-      useAlert(t('AGENT_BOTS.AVATAR.ERROR_DELETE'));
-    }
-  } else {
-    formState.botAvatar = null;
-    formState.botAvatarUrl = '';
-  }
-};
-
-const handleSubmit = async () => {
-  v$.value.$touch();
-  if (v$.value.$invalid) return;
-
-  const botData = {
-    name: formState.botName,
-    description: formState.botDescription,
-    outgoing_url: formState.botUrl,
-    bot_type: 'webhook',
-    avatar: formState.botAvatar,
-  };
-
-  const isCreate = props.type === MODAL_TYPES.CREATE;
-
-  try {
-    const actionPayload = isCreate
-      ? botData
-      : { id: props.selectedBot.id, data: botData };
-
-    await store.dispatch(
-      `agentBots/${isCreate ? 'create' : 'update'}`,
-      actionPayload
-    );
-
-    const alertKey = isCreate
-      ? t('AGENT_BOTS.ADD.API.SUCCESS_MESSAGE')
-      : t('AGENT_BOTS.EDIT.API.SUCCESS_MESSAGE');
-    useAlert(alertKey);
-
-    dialogRef.value.close();
-    resetForm();
-  } catch (error) {
-    const errorKey = isCreate
-      ? t('AGENT_BOTS.ADD.API.ERROR_MESSAGE')
-      : t('AGENT_BOTS.EDIT.API.ERROR_MESSAGE');
-    useAlert(errorKey);
-  }
-};
-
-const initializeForm = () => {
-  if (props.selectedBot && Object.keys(props.selectedBot).length) {
-    const { name, description, outgoing_url, thumbnail, bot_config } =
-      props.selectedBot;
-    formState.botName = name || '';
-    formState.botDescription = description || '';
-    formState.botUrl = outgoing_url || bot_config?.webhook_url || '';
-    formState.botAvatarUrl = thumbnail || '';
-  } else {
-    resetForm();
-  }
-};
-
-watch(() => props.selectedBot, initializeForm, { immediate: true, deep: true });
-
-defineExpose({ dialogRef });
-</script>
-
-<template>
-  <Dialog
-    ref="dialogRef"
-    type="edit"
-    :title="dialogTitle"
-    :show-cancel-button="false"
-    :show-confirm-button="false"
-    @close="v$.$reset()"
-  >
-    <form class="flex flex-col gap-4" @submit.prevent="handleSubmit">
-      <div class="mb-2 flex flex-col items-start">
-        <span class="mb-2 text-sm font-medium text-n-slate-12">
-          {{ $t('AGENT_BOTS.FORM.AVATAR.LABEL') }}
-        </span>
-        <Avatar
-          :src="formState.botAvatarUrl"
-          :name="formState.botName"
-          :size="68"
-          allow-upload
-          @upload="handleImageUpload"
-          @delete="handleAvatarDelete"
-        />
-      </div>
-
-      <Input
-        v-model="formState.botName"
-        :label="$t('AGENT_BOTS.FORM.NAME.LABEL')"
-        :placeholder="$t('AGENT_BOTS.FORM.NAME.PLACEHOLDER')"
-        :message="botNameError"
-        :message-type="botNameError ? 'error' : 'info'"
-        @blur="v$.botName.$touch()"
-      />
-
-      <TextArea
-        v-model="formState.botDescription"
-        :label="$t('AGENT_BOTS.FORM.DESCRIPTION.LABEL')"
-        :placeholder="$t('AGENT_BOTS.FORM.DESCRIPTION.PLACEHOLDER')"
-      />
-
-      <Input
-        v-model="formState.botUrl"
-        :label="$t('AGENT_BOTS.FORM.WEBHOOK_URL.LABEL')"
-        :placeholder="$t('AGENT_BOTS.FORM.WEBHOOK_URL.PLACEHOLDER')"
-        :message="botUrlError"
-        :message-type="botUrlError ? 'error' : 'info'"
-        @blur="v$.botUrl.$touch()"
-      />
-
-      <div class="flex items-center justify-end w-full gap-2 px-0 py-2">
-        <NextButton
-          faded
-          slate
-          type="reset"
-          :label="$t('AGENT_BOTS.FORM.CANCEL')"
-          @click="dialogRef.close()"
-        />
-        <NextButton
-          type="submit"
-          data-testid="label-submit"
-          :label="confirmButtonLabel"
-          :is-loading="isLoading"
-          :disabled="v$.$invalid"
-        />
-      </div>
-    </form>
-  </Dialog>
-</template>

app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotRow.vue

@@ -0,0 +1,59 @@
+<script setup>
+import { computed } from 'vue';
+import ShowMore from 'dashboard/components/widgets/ShowMore.vue';
+import AgentBotType from './AgentBotType.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+
+const props = defineProps({
+  agentBot: {
+    type: Object,
+    required: true,
+  },
+  index: {
+    type: Number,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['edit', 'delete']);
+
+const isACSMLTypeBot = computed(() => {
+  const { bot_type: botType } = props.agentBot;
+  return botType === 'csml';
+});
+</script>
+
+<template>
+  <tr class="space-x-2">
+    <td class="py-4 ltr:pl-0 ltr:pr-4 rtl:pl-4 rtl:pr-0">
+      <div class="flex items-center break-words font-medium">
+        {{ agentBot.name }}
+        (<AgentBotType :bot-type="agentBot.bot_type" />)
+      </div>
+      <div class="text-sm">
+        <ShowMore :text="agentBot.description || ''" :limit="120" />
+      </div>
+    </td>
+    <td class="align-middle">
+      <div class="flex justify-end gap-1 h-full items-center">
+        <Button
+          v-if="isACSMLTypeBot"
+          v-tooltip.top="$t('AGENT_BOTS.EDIT.BUTTON_TEXT')"
+          icon="i-lucide-pen"
+          slate
+          xs
+          faded
+          @click="emit('edit', agentBot)"
+        />
+        <Button
+          v-tooltip.top="$t('AGENT_BOTS.DELETE.BUTTON_TEXT')"
+          icon="i-lucide-trash-2"
+          xs
+          ruby
+          faded
+          @click="emit('delete', agentBot, index)"
+        />
+      </div>
+    </td>
+  </tr>
+</template>

app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotType.vue

@@ -0,0 +1,36 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+defineProps({
+  botType: {
+    type: String,
+    default: 'webhook',
+  },
+});
+
+const { t } = useI18n();
+
+const botTypeConfig = computed(() => ({
+  csml: {
+    label: t('AGENT_BOTS.TYPES.CSML'),
+    thumbnail: '/dashboard/images/agent-bots/csml.png',
+  },
+  webhook: {
+    label: t('AGENT_BOTS.TYPES.WEBHOOK'),
+    thumbnail: '/dashboard/images/agent-bots/webhook.svg',
+  },
+}));
+</script>
+
+<template>
+  <span class="inline-flex items-center gap-1">
+    <img
+      v-tooltip="botTypeConfig[botType].label"
+      class="h-3 w-auto"
+      :src="botTypeConfig[botType].thumbnail"
+      :alt="botTypeConfig[botType].label"
+    />
+    <span>{{ botTypeConfig[botType].label }}</span>
+  </span>
+</template>

app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue

@@ -0,0 +1,99 @@
+<script>
+import { useVuelidate } from '@vuelidate/core';
+import { required } from '@vuelidate/validators';
+import CsmlMonacoEditor from './CSMLMonacoEditor.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+export default {
+  components: { CsmlMonacoEditor, NextButton },
+  props: {
+    agentBot: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  emits: ['submit'],
+  setup() {
+    return { v$: useVuelidate() };
+  },
+  validations: {
+    bot: {
+      name: { required },
+      csmlContent: { required },
+    },
+  },
+  data() {
+    return {
+      bot: {
+        name: this.agentBot.name || '',
+        description: this.agentBot.description || '',
+        csmlContent: this.agentBot.bot_config.csml_content || '',
+      },
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.v$.$touch();
+      if (this.v$.$invalid) {
+        return;
+      }
+      this.$emit('submit', {
+        id: this.agentBot.id || '',
+        ...this.bot,
+      });
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="flex flex-col h-auto overflow-auto">
+    <div class="flex flex-row">
+      <div class="w-[68%]">
+        <div class="h-[calc(100vh-56px)] relative">
+          <CsmlMonacoEditor v-model="bot.csmlContent" class="w-full h-full" />
+          <div
+            v-if="v$.bot.csmlContent.$error"
+            class="bg-red-100 dark:bg-red-200 text-white dark:text-white absolute bottom-0 w-full p-2.5 flex items-center text-xs justify-center flex-shrink-0"
+          >
+            <span>{{ $t('AGENT_BOTS.CSML_BOT_EDITOR.BOT_CONFIG.ERROR') }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="w-[32%] overflow-auto p-4 h-[calc(100vh-56px)]">
+        <form
+          class="flex flex-col justify-between h-full"
+          @submit.prevent="onSubmit"
+        >
+          <div>
+            <label :class="{ error: v$.bot.name.$error }">
+              {{ $t('AGENT_BOTS.CSML_BOT_EDITOR.NAME.LABEL') }}
+              <input
+                v-model="bot.name"
+                type="text"
+                :placeholder="$t('AGENT_BOTS.CSML_BOT_EDITOR.NAME.PLACEHOLDER')"
+              />
+              <span v-if="v$.bot.name.$error" class="message">
+                {{ $t('AGENT_BOTS.CSML_BOT_EDITOR.NAME.ERROR') }}
+              </span>
+            </label>
+            <label>
+              {{ $t('AGENT_BOTS.CSML_BOT_EDITOR.DESCRIPTION.LABEL') }}
+              <textarea
+                v-model="bot.description"
+                rows="4"
+                :placeholder="
+                  $t('AGENT_BOTS.CSML_BOT_EDITOR.DESCRIPTION.PLACEHOLDER')
+                "
+              />
+            </label>
+            <NextButton
+              type="submit"
+              :label="$t('AGENT_BOTS.CSML_BOT_EDITOR.SUBMIT')"
+            />
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</template>

app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLMonacoEditor.vue

@@ -0,0 +1,71 @@
+<script>
+import LoadingState from 'dashboard/components/widgets/LoadingState.vue';
+import { mapGetters } from 'vuex';
+
+export default {
+  components: { LoadingState },
+  props: {
+    modelValue: {
+      type: String,
+      default: '',
+    },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      iframeLoading: true,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      globalConfig: 'globalConfig/get',
+    }),
+  },
+  mounted() {
+    window.onmessage = e => {
+      if (
+        typeof e.data !== 'string' ||
+        !e.data.startsWith('chatwoot-csml-editor:update')
+      ) {
+        return;
+      }
+      const csmlContent = e.data.replace('chatwoot-csml-editor:update', '');
+      this.$emit('update:modelValue', csmlContent);
+    };
+  },
+  methods: {
+    onEditorLoad() {
+      const frameElement = document.getElementById(`csml-editor--frame`);
+      const eventData = {
+        event: 'editorContext',
+        data: this.modelValue || '',
+      };
+      frameElement.contentWindow.postMessage(JSON.stringify(eventData), '*');
+      this.iframeLoading = false;
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="csml-editor--container">
+    <LoadingState
+      v-if="iframeLoading"
+      :message="$t('AGENT_BOTS.LOADING_EDITOR')"
+      class="dashboard-app_loading-container"
+    />
+    <iframe
+      id="csml-editor--frame"
+      :src="globalConfig.csmlEditorHost"
+      @load="onEditorLoad"
+    />
+  </div>
+</template>
+
+<style scoped>
+#csml-editor--frame {
+  border: 0;
+  width: 100%;
+  height: 100%;
+}
+</style>

app/javascript/dashboard/routes/dashboard/settings/agentBots/csml/Edit.vue

@@ -0,0 +1,40 @@
+<script>
+import { useAlert } from 'dashboard/composables';
+import Spinner from 'shared/components/Spinner.vue';
+import CsmlBotEditor from '../components/CSMLBotEditor.vue';
+
+export default {
+  components: { Spinner, CsmlBotEditor },
+  computed: {
+    agentBot() {
+      return this.$store.getters['agentBots/getBot'](this.$route.params.botId);
+    },
+  },
+  mounted() {
+    this.$store.dispatch('agentBots/show', this.$route.params.botId);
+  },
+  methods: {
+    async updateBot(bot) {
+      try {
+        await this.$store.dispatch('agentBots/update', {
+          id: bot.id,
+          name: bot.name,
+          description: bot.description,
+          bot_type: 'csml',
+          bot_config: { csml_content: bot.csmlContent },
+        });
+        useAlert(this.$t('AGENT_BOTS.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        useAlert(this.$t('AGENT_BOTS.CSML_BOT_EDITOR.BOT_CONFIG.API_ERROR'));
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <CsmlBotEditor v-if="agentBot.id" :agent-bot="agentBot" @submit="updateBot" />
+  <div v-else class="flex flex-col h-auto overflow-auto no-padding">
+    <Spinner />
+  </div>
+</template>

app/javascript/dashboard/routes/dashboard/settings/agentBots/csml/New.vue

@@ -0,0 +1,41 @@
+<script>
+import { mapGetters } from 'vuex';
+import { useAlert } from 'dashboard/composables';
+import { frontendURL } from '../../../../../helper/URLHelper';
+import CsmlBotEditor from '../components/CSMLBotEditor.vue';
+
+export default {
+  components: { CsmlBotEditor },
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+    }),
+  },
+  methods: {
+    async saveBot(bot) {
+      try {
+        const agentBot = await this.$store.dispatch('agentBots/create', {
+          name: bot.name,
+          description: bot.description,
+          bot_type: 'csml',
+          bot_config: { csml_content: bot.csmlContent },
+        });
+        if (agentBot) {
+          this.$router.replace(
+            frontendURL(
+              `accounts/${this.accountId}/settings/agent-bots/csml/${agentBot.id}`
+            )
+          );
+        }
+        useAlert(this.$t('AGENT_BOTS.ADD.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        useAlert(this.$t('AGENT_BOTS.ADD.API.ERROR_MESSAGE'));
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <CsmlBotEditor :agent-bot="{ bot_config: {} }" @submit="saveBot" />
+</template>

app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue

@@ -35,7 +35,8 @@ export default {
         },
         { key: 'telegram', name: 'Telegram' },
         { key: 'line', name: 'Line' },
-        { key: 'instagram', name: 'Instagram' },
+        // TODO: Add Instagram to the channel list after the feature is ready to use.
+        // { key: 'instagram', name: 'Instagram' },
       ];
     },
     ...mapGetters({

app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue

@@ -1,13 +1,11 @@
 <script>
 import EmptyState from '../../../../components/widgets/EmptyState.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
-import DuplicateInboxBanner from './channels/instagram/DuplicateInboxBanner.vue';
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
+
 export default {
   components: {
     EmptyState,
     NextButton,
-    DuplicateInboxBanner,
   },
   computed: {
     currentInbox() {
@@ -18,20 +16,6 @@ export default {
     isATwilioInbox() {
       return this.currentInbox.channel_type === 'Channel::TwilioSms';
     },
-    // Check if a facebook inbox exists with the same instagram_id
-    hasDuplicateInstagramInbox() {
-      const instagramId = this.currentInbox.instagram_id;
-      const facebookInbox =
-        this.$store.getters['inboxes/getFacebookInboxByInstagramId'](
-          instagramId
-        );
-
-      return (
-        this.currentInbox.channel_type === INBOX_TYPES.INSTAGRAM &&
-        facebookInbox
-      );
-    },
-
     isAEmailInbox() {
       return this.currentInbox.channel_type === 'Channel::Email';
     },
@@ -88,12 +72,8 @@ export default {
 
 <template>
   <div
-    class="w-full h-full col-span-6 p-6 overflow-auto border border-b-0 rounded-t-lg border-n-weak bg-n-solid-1"
+    class="border border-n-weak bg-n-solid-1 rounded-t-lg border-b-0 h-full w-full p-6 col-span-6 overflow-auto"
   >
-    <DuplicateInboxBanner
-      v-if="hasDuplicateInstagramInbox"
-      :content="$t('INBOX_MGMT.ADD.INSTAGRAM.NEW_INBOX_SUGGESTION')"
-    />
     <EmptyState
       :title="$t('INBOX_MGMT.FINISH.TITLE')"
       :message="message"

app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue

@@ -8,7 +8,6 @@ import SettingsSection from '../../../../components/SettingsSection.vue';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import FacebookReauthorize from './facebook/Reauthorize.vue';
 import InstagramReauthorize from './channels/instagram/Reauthorize.vue';
-import DuplicateInboxBanner from './channels/instagram/DuplicateInboxBanner.vue';
 import MicrosoftReauthorize from './channels/microsoft/Reauthorize.vue';
 import GoogleReauthorize from './channels/google/Reauthorize.vue';
 import PreChatFormSettings from './PreChatForm/Settings.vue';
@@ -21,7 +20,6 @@ import BotConfiguration from './components/BotConfiguration.vue';
 import { FEATURE_FLAGS } from '../../../../featureFlags';
 import SenderNameExamplePreview from './components/SenderNameExamplePreview.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
 export default {
   components: {
@@ -40,7 +38,6 @@ export default {
     GoogleReauthorize,
     NextButton,
     InstagramReauthorize,
-    DuplicateInboxBanner,
   },
   mixins: [inboxMixin],
   setup() {
@@ -141,7 +138,11 @@ export default {
       }
 
       if (
-        this.isFeatureEnabledonAccount(this.accountId, FEATURE_FLAGS.AGENT_BOTS)
+        this.isFeatureEnabledonAccount(
+          this.accountId,
+          FEATURE_FLAGS.AGENT_BOTS
+        ) &&
+        !(this.isAnEmailChannel || this.isATwitterInbox)
       ) {
         visibleToAllChannelTabs = [
           ...visibleToAllChannelTabs,
@@ -204,17 +205,7 @@ export default {
       return false;
     },
     instagramUnauthorized() {
-      return this.isAnInstagramChannel && this.inbox.reauthorization_required;
-    },
-    // Check if a instagram inbox exists with the same instagram_id
-    hasDuplicateInstagramInbox() {
-      const instagramId = this.inbox.instagram_id;
-      const instagramInbox =
-        this.$store.getters['inboxes/getInstagramInboxByInstagramId'](
-          instagramId
-        );
-
-      return this.inbox.channel_type === INBOX_TYPES.FB && instagramInbox;
+      return this.isAInstagramChannel && this.inbox.reauthorization_required;
     },
     microsoftUnauthorized() {
       return this.isAMicrosoftInbox && this.inbox.reauthorization_required;
@@ -402,11 +393,6 @@ export default {
       <FacebookReauthorize v-if="facebookUnauthorized" :inbox="inbox" />
       <GoogleReauthorize v-if="googleUnauthorized" :inbox="inbox" />
       <InstagramReauthorize v-if="instagramUnauthorized" :inbox="inbox" />
-      <DuplicateInboxBanner
-        v-if="hasDuplicateInstagramInbox"
-        :content="$t('INBOX_MGMT.ADD.INSTAGRAM.DUPLICATE_INBOX_BANNER')"
-        class="mx-8 mt-5"
-      />
       <div v-if="selectedTabKey === 'inbox_settings'" class="mx-8">
         <SettingsSection
           :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_UPDATE_TITLE')"

app/javascript/dashboard/routes/dashboard/settings/inbox/channels/instagram/DuplicateInboxBanner.vue

@@ -1,20 +0,0 @@
-<script setup>
-import Banner from 'dashboard/components-next/banner/Banner.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-defineProps({
-  content: {
-    type: String,
-    default: '',
-  },
-});
-</script>
-
-<template>
-  <Banner color="amber">
-    <div class="flex items-center gap-2">
-      <Icon icon="i-lucide-info" class="flex-shrink-0 size-4" />
-      <span>{{ content }}</span>
-    </div>
-  </Banner>
-</template>

app/javascript/dashboard/routes/dashboard/settings/reports/BotReports.vue

@@ -98,7 +98,6 @@ export default {
     <BotMetrics :filters="requestPayload" />
     <ReportContainer
       account-summary-key="getBotSummary"
-      summary-fetching-key="getBotSummaryFetchingStatus"
       :group-by="groupBy"
       :report-keys="reportKeys"
     />

app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue

@@ -19,10 +19,6 @@ export default {
       type: String,
       default: 'getAccountSummary',
     },
-    summaryFetchingKey: {
-      type: String,
-      default: 'getAccountSummaryFetchingStatus',
-    },
     reportKeys: {
       type: Object,
       default: () => ({
@@ -152,11 +148,7 @@ export default {
       :key="metric.KEY"
       class="p-4 mb-3 rounded-md"
     >
-      <ChartStats
-        :metric="metric"
-        :account-summary-key="accountSummaryKey"
-        :summary-fetching-key="summaryFetchingKey"
-      />
+      <ChartStats :metric="metric" :account-summary-key="accountSummaryKey" />
       <div class="mt-4 h-72">
         <woot-loading-state
           v-if="accountReport.isFetching[metric.KEY]"

app/javascript/dashboard/routes/dashboard/settings/reports/components/ChartElements/ChartStats.vue

@@ -1,8 +1,5 @@
 <script setup>
 import { useReportMetrics } from 'dashboard/composables/useReportMetrics';
-import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
-import { STATUS } from 'dashboard/store/constants';
-import { useI18n } from 'vue-i18n';
 
 const props = defineProps({
   metric: {
@@ -13,16 +10,11 @@ const props = defineProps({
     type: String,
     default: 'getAccountSummary',
   },
-  summaryFetchingKey: {
-    type: String,
-    default: 'getAccountSummaryFetchingStatus',
-  },
 });
 
-const { t } = useI18n();
-
-const { calculateTrend, displayMetric, isAverageMetricType, fetchingStatus } =
-  useReportMetrics(props.accountSummaryKey, props.summaryFetchingKey);
+const { calculateTrend, displayMetric, isAverageMetricType } = useReportMetrics(
+  props.accountSummaryKey
+);
 
 const trendColor = (value, key) => {
   if (isAverageMetricType(key)) {
@@ -42,25 +34,10 @@ const trendColor = (value, key) => {
       {{ metric.NAME }}
     </span>
     <div class="flex items-end text-n-slate-12">
-      <div v-if="fetchingStatus === STATUS.FETCHING">
-        <Spinner />
-      </div>
-      <div
-        v-else-if="fetchingStatus === STATUS.FAILED"
-        class="text-n-ruby-10 text-sm"
-      >
-        {{ t('REPORT.SUMMARY_FETCHING_FAILED') }}
-      </div>
-      <div
-        v-else-if="fetchingStatus === STATUS.FINISHED"
-        class="text-xl font-medium"
-      >
+      <div class="text-xl font-medium">
         {{ displayMetric(metric.KEY) }}
       </div>
-      <div
-        v-if="metric.trend && fetchingStatus === STATUS.FINISHED"
-        class="text-xs ml-4 flex items-center mb-0.5"
-      >
+      <div v-if="metric.trend" class="text-xs ml-4 flex items-center mb-0.5">
         <div
           v-if="metric.trend < 0"
           class="h-0 w-0 border-x-4 medium border-x-transparent border-t-[8px] mr-1"

app/javascript/dashboard/store/constants.js

@@ -1,5 +0,0 @@
-export const STATUS = {
-  FAILED: 'failed',
-  FETCHING: 'fetching',
-  FINISHED: 'finished',
-};

app/javascript/dashboard/store/modules/agentBots.js

@@ -12,7 +12,6 @@ export const state = {
     isCreating: false,
     isDeleting: false,
     isUpdating: false,
-    isUpdatingAvatar: false,
     isFetchingAgentBot: false,
     isSettingAgentBot: false,
     isDisconnecting: false,
@@ -49,23 +48,10 @@ export const actions = {
       commit(types.SET_AGENT_BOT_UI_FLAG, { isFetching: false });
     }
   },
-
-  create: async ({ commit }, botData) => {
+  create: async ({ commit }, agentBotObj) => {
     commit(types.SET_AGENT_BOT_UI_FLAG, { isCreating: true });
     try {
-      // Create FormData for file upload
-      const formData = new FormData();
-      formData.append('name', botData.name);
-      formData.append('description', botData.description);
-      formData.append('bot_type', botData.bot_type || 'webhook');
-      formData.append('outgoing_url', botData.outgoing_url);
-
-      // Add avatar file if available
-      if (botData.avatar) {
-        formData.append('avatar', botData.avatar);
-      }
-
-      const response = await AgentBotsAPI.create(formData);
+      const response = await AgentBotsAPI.create(agentBotObj);
       commit(types.ADD_AGENT_BOT, response.data);
       return response.data;
     } catch (error) {
@@ -75,22 +61,10 @@ export const actions = {
     }
     return null;
   },
-
-  update: async ({ commit }, { id, data }) => {
+  update: async ({ commit }, { id, ...agentBotObj }) => {
     commit(types.SET_AGENT_BOT_UI_FLAG, { isUpdating: true });
     try {
-      // Create FormData for file upload
-      const formData = new FormData();
-      formData.append('name', data.name);
-      formData.append('description', data.description);
-      formData.append('bot_type', data.bot_type || 'webhook');
-      formData.append('outgoing_url', data.outgoing_url);
-
-      if (data.avatar) {
-        formData.append('avatar', data.avatar);
-      }
-
-      const response = await AgentBotsAPI.update(id, formData);
+      const response = await AgentBotsAPI.update(id, agentBotObj);
       commit(types.EDIT_AGENT_BOT, response.data);
     } catch (error) {
       throwErrorMessage(error);
@@ -98,7 +72,6 @@ export const actions = {
       commit(types.SET_AGENT_BOT_UI_FLAG, { isUpdating: false });
     }
   },
-
   delete: async ({ commit }, id) => {
     commit(types.SET_AGENT_BOT_UI_FLAG, { isDeleting: true });
     try {
@@ -110,20 +83,6 @@ export const actions = {
       commit(types.SET_AGENT_BOT_UI_FLAG, { isDeleting: false });
     }
   },
-
-  deleteAgentBotAvatar: async ({ commit }, id) => {
-    commit(types.SET_AGENT_BOT_UI_FLAG, { isUpdatingAvatar: true });
-    try {
-      await AgentBotsAPI.deleteAgentBotAvatar(id);
-      // Update the thumbnail to empty string after deletion
-      commit(types.UPDATE_AGENT_BOT_AVATAR, { id, thumbnail: '' });
-    } catch (error) {
-      throwErrorMessage(error);
-    } finally {
-      commit(types.SET_AGENT_BOT_UI_FLAG, { isUpdatingAvatar: false });
-    }
-  },
-
   show: async ({ commit }, id) => {
     commit(types.SET_AGENT_BOT_UI_FLAG, { isFetchingItem: true });
     try {
@@ -191,12 +150,6 @@ export const mutations = {
       [inboxId]: agentBotId,
     };
   },
-  [types.UPDATE_AGENT_BOT_AVATAR]($state, { id, thumbnail }) {
-    const botIndex = $state.records.findIndex(bot => bot.id === id);
-    if (botIndex !== -1) {
-      $state.records[botIndex].thumbnail = thumbnail || '';
-    }
-  },
 };
 
 export default {

app/javascript/dashboard/store/modules/conversations/getters.js

@@ -1,11 +1,7 @@
 import { MESSAGE_TYPE } from 'shared/constants/messages';
-import { applyPageFilters, applyRoleFilter, sortComparator } from './helpers';
+import { applyPageFilters, sortComparator } from './helpers';
 import filterQueryGenerator from 'dashboard/helper/filterQueryGenerator';
 import { matchesFilters } from './helpers/filterHelpers';
-import {
-  getUserPermissions,
-  getUserRole,
-} from '../../../helper/permissionsHelper';
 import camelcaseKeys from 'camelcase-keys';
 
 export const getSelectedChatConversation = ({
@@ -81,24 +77,10 @@ const getters = {
       return isUnAssigned && shouldFilter;
     });
   },
-  getAllStatusChats: (_state, _, __, rootGetters) => activeFilters => {
-    const currentUser = rootGetters.getCurrentUser;
-    const currentUserId = rootGetters.getCurrentUser.id;
-    const currentAccountId = rootGetters.getCurrentAccountId;
-
-    const permissions = getUserPermissions(currentUser, currentAccountId);
-    const userRole = getUserRole(currentUser, currentAccountId);
-
+  getAllStatusChats: _state => activeFilters => {
     return _state.allConversations.filter(conversation => {
       const shouldFilter = applyPageFilters(conversation, activeFilters);
-      const allowedForRole = applyRoleFilter(
-        conversation,
-        userRole,
-        permissions,
-        currentUserId
-      );
-
-      return shouldFilter && allowedForRole;
+      return shouldFilter;
     });
   },
   getChatListLoadingStatus: ({ listLoadingStatus }) => listLoadingStatus,

app/javascript/dashboard/store/modules/conversations/helpers.js

@@ -62,51 +62,6 @@ export const applyPageFilters = (conversation, filters) => {
   return shouldFilter;
 };
 
-/**
- * Filters conversations based on user role and permissions
- *
- * @param {Object} conversation - The conversation object to check permissions for
- * @param {string} role - The user's role (administrator, agent, etc.)
- * @param {Array<string>} permissions - List of permission strings the user has
- * @param {number|string} currentUserId - The ID of the current user
- * @returns {boolean} - Whether the user has permissions to access this conversation
- */
-export const applyRoleFilter = (
-  conversation,
-  role,
-  permissions,
-  currentUserId
-) => {
-  // the role === "agent" check is typically not correct on it's own
-  // the backend handles this by checking the custom_role_id at the user model
-  // here however, the `getUserRole` returns "custom_role" if the id is present,
-  // so we can check the role === "agent" directly
-  if (['administrator', 'agent'].includes(role)) {
-    return true;
-  }
-
-  // Check for full conversation management permission
-  if (permissions.includes('conversation_manage')) {
-    return true;
-  }
-
-  const conversationAssignee = conversation.meta.assignee;
-  const isUnassigned = !conversationAssignee;
-  const isAssignedToUser = conversationAssignee?.id === currentUserId;
-
-  // Check unassigned management permission
-  if (permissions.includes('conversation_unassigned_manage')) {
-    return isUnassigned || isAssignedToUser;
-  }
-
-  // Check participating conversation management permission
-  if (permissions.includes('conversation_participating_manage')) {
-    return isAssignedToUser;
-  }
-
-  return false;
-};
-
 const SORT_OPTIONS = {
   last_activity_at_asc: ['sortOnLastActivityAt', 'asc'],
   last_activity_at_desc: ['sortOnLastActivityAt', 'desc'],

app/javascript/dashboard/store/modules/conversations/specs/helpers.spec.js

@@ -1,276 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { applyRoleFilter } from '../helpers';
-
-describe('Conversation Helpers', () => {
-  describe('#applyRoleFilter', () => {
-    // Test data for conversations
-    const conversationWithAssignee = {
-      meta: {
-        assignee: {
-          id: 1,
-        },
-      },
-    };
-
-    const conversationWithDifferentAssignee = {
-      meta: {
-        assignee: {
-          id: 2,
-        },
-      },
-    };
-
-    const conversationWithoutAssignee = {
-      meta: {
-        assignee: null,
-      },
-    };
-
-    // Test for administrator role
-    it('always returns true for administrator role regardless of permissions', () => {
-      const role = 'administrator';
-      const permissions = [];
-      const currentUserId = 1;
-
-      expect(
-        applyRoleFilter(
-          conversationWithAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-      expect(
-        applyRoleFilter(
-          conversationWithDifferentAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-      expect(
-        applyRoleFilter(
-          conversationWithoutAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-    });
-
-    // Test for agent role
-    it('always returns true for agent role regardless of permissions', () => {
-      const role = 'agent';
-      const permissions = [];
-      const currentUserId = 1;
-
-      expect(
-        applyRoleFilter(
-          conversationWithAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-      expect(
-        applyRoleFilter(
-          conversationWithDifferentAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-      expect(
-        applyRoleFilter(
-          conversationWithoutAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-    });
-
-    // Test for custom role with 'conversation_manage' permission
-    it('returns true for any user with conversation_manage permission', () => {
-      const role = 'custom_role';
-      const permissions = ['conversation_manage'];
-      const currentUserId = 1;
-
-      expect(
-        applyRoleFilter(
-          conversationWithAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-      expect(
-        applyRoleFilter(
-          conversationWithDifferentAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-      expect(
-        applyRoleFilter(
-          conversationWithoutAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(true);
-    });
-
-    // Test for custom role with 'conversation_unassigned_manage' permission
-    describe('with conversation_unassigned_manage permission', () => {
-      const role = 'custom_role';
-      const permissions = ['conversation_unassigned_manage'];
-      const currentUserId = 1;
-
-      it('returns true for conversations assigned to the user', () => {
-        expect(
-          applyRoleFilter(
-            conversationWithAssignee,
-            role,
-            permissions,
-            currentUserId
-          )
-        ).toBe(true);
-      });
-
-      it('returns true for unassigned conversations', () => {
-        expect(
-          applyRoleFilter(
-            conversationWithoutAssignee,
-            role,
-            permissions,
-            currentUserId
-          )
-        ).toBe(true);
-      });
-
-      it('returns false for conversations assigned to other users', () => {
-        expect(
-          applyRoleFilter(
-            conversationWithDifferentAssignee,
-            role,
-            permissions,
-            currentUserId
-          )
-        ).toBe(false);
-      });
-    });
-
-    // Test for custom role with 'conversation_participating_manage' permission
-    describe('with conversation_participating_manage permission', () => {
-      const role = 'custom_role';
-      const permissions = ['conversation_participating_manage'];
-      const currentUserId = 1;
-
-      it('returns true for conversations assigned to the user', () => {
-        expect(
-          applyRoleFilter(
-            conversationWithAssignee,
-            role,
-            permissions,
-            currentUserId
-          )
-        ).toBe(true);
-      });
-
-      it('returns false for unassigned conversations', () => {
-        expect(
-          applyRoleFilter(
-            conversationWithoutAssignee,
-            role,
-            permissions,
-            currentUserId
-          )
-        ).toBe(false);
-      });
-
-      it('returns false for conversations assigned to other users', () => {
-        expect(
-          applyRoleFilter(
-            conversationWithDifferentAssignee,
-            role,
-            permissions,
-            currentUserId
-          )
-        ).toBe(false);
-      });
-    });
-
-    // Test for user with no relevant permissions
-    it('returns false for custom role without any relevant permissions', () => {
-      const role = 'custom_role';
-      const permissions = ['some_other_permission'];
-      const currentUserId = 1;
-
-      expect(
-        applyRoleFilter(
-          conversationWithAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(false);
-      expect(
-        applyRoleFilter(
-          conversationWithDifferentAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(false);
-      expect(
-        applyRoleFilter(
-          conversationWithoutAssignee,
-          role,
-          permissions,
-          currentUserId
-        )
-      ).toBe(false);
-    });
-
-    // Test edge cases for meta.assignee
-    describe('handles edge cases with meta.assignee', () => {
-      const role = 'custom_role';
-      const permissions = ['conversation_unassigned_manage'];
-      const currentUserId = 1;
-
-      it('treats undefined assignee as unassigned', () => {
-        const conversationWithUndefinedAssignee = {
-          meta: {
-            assignee: undefined,
-          },
-        };
-
-        expect(
-          applyRoleFilter(
-            conversationWithUndefinedAssignee,
-            role,
-            permissions,
-            currentUserId
-          )
-        ).toBe(true);
-      });
-
-      it('handles empty meta object', () => {
-        const conversationWithEmptyMeta = {
-          meta: {},
-        };
-
-        expect(
-          applyRoleFilter(
-            conversationWithEmptyMeta,
-            role,
-            permissions,
-            currentUserId
-          )
-        ).toBe(true);
-      });
-    });
-  });
-});

app/javascript/dashboard/store/modules/inboxes.js

@@ -122,20 +122,6 @@ export const getters = {
       item => item.channel_type !== INBOX_TYPES.EMAIL
     );
   },
-  getFacebookInboxByInstagramId: $state => instagramId => {
-    return $state.records.find(
-      item =>
-        item.instagram_id === instagramId &&
-        item.channel_type === INBOX_TYPES.FB
-    );
-  },
-  getInstagramInboxByInstagramId: $state => instagramId => {
-    return $state.records.find(
-      item =>
-        item.instagram_id === instagramId &&
-        item.channel_type === INBOX_TYPES.INSTAGRAM
-    );
-  },
 };
 
 const sendAnalyticsEvent = channelType => {

app/javascript/dashboard/store/modules/reports.js

@@ -1,6 +1,5 @@
 /* eslint no-console: 0 */
 import * as types from '../mutation-types';
-import { STATUS } from '../constants';
 import Report from '../../api/reports';
 import { downloadCsvFile, generateFileName } from '../../helper/downloadHelper';
 import AnalyticsHelper from '../../helper/AnalyticsHelper';
@@ -10,8 +9,6 @@ import liveReports from '../../api/liveReports';
 
 const state = {
   fetchingStatus: false,
-  accountSummaryFetchingStatus: STATUS.FINISHED,
-  botSummaryFetchingStatus: STATUS.FINISHED,
   accountReport: {
     isFetching: {
       conversations_count: false,
@@ -77,12 +74,6 @@ const getters = {
   getBotSummary(_state) {
     return _state.botSummary;
   },
-  getAccountSummaryFetchingStatus(_state) {
-    return _state.accountSummaryFetchingStatus;
-  },
-  getBotSummaryFetchingStatus(_state) {
-    return _state.botSummaryFetchingStatus;
-  },
   getAccountConversationMetric(_state) {
     return _state.overview.accountConversationMetric;
   },
@@ -131,7 +122,6 @@ export const actions = {
     });
   },
   fetchAccountSummary({ commit }, reportObj) {
-    commit(types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FETCHING);
     Report.getSummary(
       reportObj.from,
       reportObj.to,
@@ -142,14 +132,12 @@ export const actions = {
     )
       .then(accountSummary => {
         commit(types.default.SET_ACCOUNT_SUMMARY, accountSummary.data);
-        commit(types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FINISHED);
       })
       .catch(() => {
-        commit(types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FAILED);
+        commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
       });
   },
   fetchBotSummary({ commit }, reportObj) {
-    commit(types.default.SET_BOT_SUMMARY_STATUS, STATUS.FETCHING);
     Report.getBotSummary({
       from: reportObj.from,
       to: reportObj.to,
@@ -158,10 +146,9 @@ export const actions = {
     })
       .then(botSummary => {
         commit(types.default.SET_BOT_SUMMARY, botSummary.data);
-        commit(types.default.SET_BOT_SUMMARY_STATUS, STATUS.FINISHED);
       })
       .catch(() => {
-        commit(types.default.SET_BOT_SUMMARY_STATUS, STATUS.FAILED);
+        commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
       });
   },
   fetchAccountConversationMetric({ commit }, params = {}) {
@@ -290,12 +277,6 @@ const mutations = {
   [types.default.TOGGLE_ACCOUNT_REPORT_LOADING](_state, { metric, value }) {
     _state.accountReport.isFetching[metric] = value;
   },
-  [types.default.SET_BOT_SUMMARY_STATUS](_state, status) {
-    _state.botSummaryFetchingStatus = status;
-  },
-  [types.default.SET_ACCOUNT_SUMMARY_STATUS](_state, status) {
-    _state.accountSummaryFetchingStatus = status;
-  },
   [types.default.TOGGLE_HEATMAP_LOADING](_state, flag) {
     _state.overview.uiFlags.isFetchingAccountConversationsHeatmap = flag;
   },

app/javascript/dashboard/store/modules/specs/agentBots/agentBots.spec.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { actions } from '../../agentBots';
 import types from '../../../mutation-types';
-import { agentBotRecords, agentBotData } from './fixtures';
+import { agentBotRecords } from './fixtures';
 
 const commit = vi.fn();
 global.axios = axios;
@@ -30,22 +30,16 @@ describe('#actions', () => {
   describe('#create', () => {
     it('sends correct actions if API is success', async () => {
       axios.post.mockResolvedValue({ data: agentBotRecords[0] });
-      await actions.create({ commit }, agentBotData);
-
+      await actions.create({ commit }, agentBotRecords[0]);
       expect(commit.mock.calls).toEqual([
         [types.SET_AGENT_BOT_UI_FLAG, { isCreating: true }],
         [types.ADD_AGENT_BOT, agentBotRecords[0]],
         [types.SET_AGENT_BOT_UI_FLAG, { isCreating: false }],
       ]);
-
-      expect(axios.post.mock.calls.length).toBe(1);
-      const formDataArg = axios.post.mock.calls[0][1];
-      expect(formDataArg instanceof FormData).toBe(true);
     });
-
     it('sends correct actions if API is error', async () => {
       axios.post.mockRejectedValue({ message: 'Incorrect header' });
-      await expect(actions.create({ commit }, {})).rejects.toThrow(Error);
+      await expect(actions.create({ commit })).rejects.toThrow(Error);
       expect(commit.mock.calls).toEqual([
         [types.SET_AGENT_BOT_UI_FLAG, { isCreating: true }],
         [types.SET_AGENT_BOT_UI_FLAG, { isCreating: false }],
@@ -56,29 +50,17 @@ describe('#actions', () => {
   describe('#update', () => {
     it('sends correct actions if API is success', async () => {
       axios.patch.mockResolvedValue({ data: agentBotRecords[0] });
-      await actions.update(
-        { commit },
-        {
-          id: agentBotRecords[0].id,
-          data: agentBotData,
-        }
-      );
-
+      await actions.update({ commit }, agentBotRecords[0]);
       expect(commit.mock.calls).toEqual([
         [types.SET_AGENT_BOT_UI_FLAG, { isUpdating: true }],
         [types.EDIT_AGENT_BOT, agentBotRecords[0]],
         [types.SET_AGENT_BOT_UI_FLAG, { isUpdating: false }],
       ]);
-
-      expect(axios.patch.mock.calls.length).toBe(1);
-      const formDataArg = axios.patch.mock.calls[0][1];
-      expect(formDataArg instanceof FormData).toBe(true);
     });
-
     it('sends correct actions if API is error', async () => {
       axios.patch.mockRejectedValue({ message: 'Incorrect header' });
       await expect(
-        actions.update({ commit }, { id: 1, data: {} })
+        actions.update({ commit }, agentBotRecords[0])
       ).rejects.toThrow(Error);
       expect(commit.mock.calls).toEqual([
         [types.SET_AGENT_BOT_UI_FLAG, { isUpdating: true }],
@@ -86,6 +68,7 @@ describe('#actions', () => {
       ]);
     });
   });
+
   describe('#delete', () => {
     it('sends correct actions if API is success', async () => {
       axios.delete.mockResolvedValue({ data: agentBotRecords[0] });

app/javascript/dashboard/store/modules/specs/agentBots/fixtures.js

@@ -1,35 +1,15 @@
 export const agentBotRecords = [
   {
-    account_id: 1,
     id: 11,
     name: 'Agent Bot 11',
     description: 'Agent Bot Description',
-    bot_type: 'webhook',
-    thumbnail: 'https://example.com/thumbnail.jpg',
-    bot_config: {},
-    outgoing_url: 'https://example.com/outgoing',
-    access_token: 'hN8QwG769RqBXmme',
-    system_bot: false,
+    type: 'csml',
   },
 
   {
-    account_id: 1,
     id: 12,
     name: 'Agent Bot 12',
     description: 'Agent Bot Description 12',
-    bot_type: 'webhook',
-    thumbnail: 'https://example.com/thumbnail.jpg',
-    bot_config: {},
-    outgoing_url: 'https://example.com/outgoing',
-    access_token: 'hN8QwG769RqBXmme',
-    system_bot: false,
+    type: 'csml',
   },
 ];
-
-export const agentBotData = {
-  name: 'Test Bot',
-  description: 'Test Description',
-  outgoing_url: 'https://test.com',
-  bot_type: 'webhook',
-  avatar: new File([''], 'filename'),
-};

app/javascript/dashboard/store/modules/specs/agentBots/mutations.spec.js

@@ -51,16 +51,4 @@ describe('#mutations', () => {
       expect(state.agentBotInbox).toEqual({ 3: 2 });
     });
   });
-  describe('#UPDATE_AGENT_BOT_AVATAR', () => {
-    it('update agent bot avatar', () => {
-      const state = { records: [agentBotRecords[0]] };
-      mutations[types.UPDATE_AGENT_BOT_AVATAR](state, {
-        id: 11,
-        thumbnail: 'https://example.com/thumbnail.jpg',
-      });
-      expect(state.records[0].thumbnail).toEqual(
-        'https://example.com/thumbnail.jpg'
-      );
-    });
-  });
 });

app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js

@@ -9,7 +9,6 @@ export default [
     widget_color: null,
     website_token: null,
     enable_auto_assignment: true,
-    instagram_id: 123456789,
   },
   {
     id: 2,
@@ -63,12 +62,4 @@ export default [
     channel_type: 'Channel::Sms',
     provider: 'default',
   },
-  {
-    id: 7,
-    channel_id: 7,
-    name: 'Test Instagram 1',
-    channel_type: 'Channel::Instagram',
-    instagram_id: 123456789,
-    provider: 'default',
-  },
 ];

app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js

@@ -26,7 +26,7 @@ describe('#getters', () => {
 
   it('dialogFlowEnabledInboxes', () => {
     const state = { records: inboxList };
-    expect(getters.dialogFlowEnabledInboxes(state).length).toEqual(7);
+    expect(getters.dialogFlowEnabledInboxes(state).length).toEqual(6);
   });
 
   it('getInbox', () => {
@@ -43,7 +43,6 @@ describe('#getters', () => {
       widget_color: null,
       website_token: null,
       enable_auto_assignment: true,
-      instagram_id: 123456789,
     });
   });
 
@@ -65,32 +64,4 @@ describe('#getters', () => {
       isDeleting: false,
     });
   });
-
-  it('getFacebookInboxByInstagramId', () => {
-    const state = { records: inboxList };
-    expect(getters.getFacebookInboxByInstagramId(state)(123456789)).toEqual({
-      id: 1,
-      channel_id: 1,
-      name: 'Test FacebookPage 1',
-      channel_type: 'Channel::FacebookPage',
-      avatar_url: 'random_image.png',
-      page_id: '12345',
-      widget_color: null,
-      website_token: null,
-      enable_auto_assignment: true,
-      instagram_id: 123456789,
-    });
-  });
-
-  it('getInstagramInboxByInstagramId', () => {
-    const state = { records: inboxList };
-    expect(getters.getInstagramInboxByInstagramId(state)(123456789)).toEqual({
-      id: 7,
-      channel_id: 7,
-      name: 'Test Instagram 1',
-      channel_type: 'Channel::Instagram',
-      instagram_id: 123456789,
-      provider: 'default',
-    });
-  });
 });

app/javascript/dashboard/store/modules/specs/reports/actions.spec.js

@@ -1,122 +1,14 @@
 import axios from 'axios';
 import { actions } from '../../reports';
-import * as types from '../../../mutation-types';
-import { STATUS } from '../../../constants';
 import * as DownloadHelper from 'dashboard/helper/downloadHelper';
-import { flushPromises } from '@vue/test-utils';
 
 global.open = vi.fn();
 global.axios = axios;
-global.URL.createObjectURL = vi.fn();
 
 vi.mock('axios');
 vi.spyOn(DownloadHelper, 'downloadCsvFile');
 
 describe('#actions', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  describe('#fetchAccountSummary', () => {
-    it('sends correct actions if API is success', async () => {
-      const commit = vi.fn();
-      const reportObj = {
-        from: 1630504922510,
-        to: 1630504922510,
-        type: 'account',
-        id: 1,
-        groupBy: 'day',
-        businessHours: true,
-      };
-      const summaryData = {
-        conversations_count: 10,
-        incoming_messages_count: 20,
-        outgoing_messages_count: 15,
-        avg_first_response_time: 30,
-        avg_resolution_time: 60,
-        resolutions_count: 5,
-        bot_resolutions_count: 2,
-        bot_handoffs_count: 1,
-        reply_time: 25,
-      };
-      axios.get.mockResolvedValue({ data: summaryData });
-
-      actions.fetchAccountSummary({ commit }, reportObj);
-      await flushPromises();
-
-      expect(commit.mock.calls).toEqual([
-        [types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FETCHING],
-        [types.default.SET_ACCOUNT_SUMMARY, summaryData],
-        [types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FINISHED],
-      ]);
-    });
-
-    it('sends correct actions if API fails', async () => {
-      const commit = vi.fn();
-      const reportObj = {
-        from: 1630504922510,
-        to: 1630504922510,
-      };
-      axios.get.mockRejectedValue(new Error('API Error'));
-
-      actions.fetchAccountSummary({ commit }, reportObj);
-      await flushPromises();
-
-      expect(commit.mock.calls).toEqual([
-        [types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FETCHING],
-        [types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FAILED],
-      ]);
-    });
-  });
-
-  describe('#fetchBotSummary', () => {
-    it('sends correct actions if API is success', async () => {
-      const commit = vi.fn();
-      const reportObj = {
-        from: 1630504922510,
-        to: 1630504922510,
-        groupBy: 'day',
-        businessHours: true,
-      };
-      const summaryData = {
-        bot_resolutions_count: 10,
-        bot_handoffs_count: 5,
-        previous: {
-          bot_resolutions_count: 8,
-          bot_handoffs_count: 4,
-        },
-      };
-      axios.get.mockResolvedValue({ data: summaryData });
-
-      actions.fetchBotSummary({ commit }, reportObj);
-      await flushPromises();
-
-      expect(commit.mock.calls).toEqual([
-        [types.default.SET_BOT_SUMMARY_STATUS, STATUS.FETCHING],
-        [types.default.SET_BOT_SUMMARY, summaryData],
-        [types.default.SET_BOT_SUMMARY_STATUS, STATUS.FINISHED],
-      ]);
-    });
-
-    it('sends correct actions if API fails', async () => {
-      const commit = vi.fn();
-      const reportObj = {
-        from: 1630504922510,
-        to: 1630504922510,
-      };
-      const error = new Error('API error');
-      axios.get.mockRejectedValueOnce(error);
-
-      actions.fetchBotSummary({ commit }, reportObj);
-      await flushPromises();
-
-      expect(commit.mock.calls).toEqual([
-        [types.default.SET_BOT_SUMMARY_STATUS, STATUS.FETCHING],
-        [types.default.SET_BOT_SUMMARY_STATUS, STATUS.FAILED],
-      ]);
-    });
-  });
-
   describe('#downloadAgentReports', () => {
     it('open CSV download prompt if API is success', async () => {
       const data = `Agent name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
@@ -128,9 +20,7 @@ describe('#actions', () => {
         to: 1630504922510,
         fileName: 'agent-report-01-09-2021.csv',
       };
-      actions.downloadAgentReports(1, param);
-      await flushPromises();
-
+      await actions.downloadAgentReports(1, param);
       expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
         param.fileName,
         data
@@ -149,9 +39,7 @@ describe('#actions', () => {
         type: 'label',
         fileName: 'label-report-01-09-2021.csv',
       };
-      actions.downloadLabelReports(1, param);
-      await flushPromises();
-
+      await actions.downloadLabelReports(1, param);
       expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
         param.fileName,
         data
@@ -171,9 +59,7 @@ describe('#actions', () => {
         to: 1635013800,
         fileName: 'inbox-report-24-10-2021.csv',
       };
-      actions.downloadInboxReports(1, param);
-      await flushPromises();
-
+      await actions.downloadInboxReports(1, param);
       expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
         param.fileName,
         data
@@ -192,9 +78,7 @@ describe('#actions', () => {
         to: 1635013800,
         fileName: 'inbox-report-24-10-2021.csv',
       };
-      actions.downloadInboxReports(1, param);
-      await flushPromises();
-
+      await actions.downloadInboxReports(1, param);
       expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
         param.fileName,
         data

app/javascript/dashboard/store/mutation-types.js

@@ -189,8 +189,6 @@ export default {
   SET_ACCOUNT_SUMMARY: 'SET_ACCOUNT_SUMMARY',
   SET_BOT_SUMMARY: 'SET_BOT_SUMMARY',
   TOGGLE_ACCOUNT_REPORT_LOADING: 'TOGGLE_ACCOUNT_REPORT_LOADING',
-  SET_BOT_SUMMARY_STATUS: 'SET_BOT_SUMMARY_STATUS',
-  SET_ACCOUNT_SUMMARY_STATUS: 'SET_ACCOUNT_SUMMARY_STATUS',
   SET_ACCOUNT_CONVERSATION_METRIC: 'SET_ACCOUNT_CONVERSATION_METRIC',
   TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING:
     'TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING',
@@ -301,7 +299,6 @@ export default {
   EDIT_AGENT_BOT: 'EDIT_AGENT_BOT',
   DELETE_AGENT_BOT: 'DELETE_AGENT_BOT',
   SET_AGENT_BOT_INBOX: 'SET_AGENT_BOT_INBOX',
-  UPDATE_AGENT_BOT_AVATAR: 'UPDATE_AGENT_BOT_AVATAR',
 
   // MACROS
   SET_MACROS_UI_FLAG: 'SET_MACROS_UI_FLAG',

app/javascript/sdk/sdk.js

@@ -38,7 +38,7 @@ export const SDK_CSS = `
   border: 0;
 }
 
-.woot-widget-bubble {
+.woot-widget-bubble[class] {
   background: #1f93ff;
   border-radius: 100px;
   border-width: 0px;
@@ -135,6 +135,7 @@ export const SDK_CSS = `
 .woot-widget-bubble svg {
   all: revert;
   height: 24px;
+  margin: 20px;
   width: 24px;
 }
 

app/javascript/shared/constants/messages.js

@@ -44,7 +44,6 @@ export const ALLOWED_FILE_TYPES =
   'video/*,' +
   '.3gpp,' +
   'text/csv, text/plain, application/json, application/pdf, text/rtf,' +
-  'application/xml, text/xml,' +
   'application/zip, application/x-7z-compressed application/vnd.rar application/x-tar,' +
   'application/msword, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/vnd.oasis.opendocument.text,' +
   'application/vnd.openxmlformats-officedocument.presentationml.presentation, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,' +

app/javascript/shared/helpers/MessageTypeHelper.js

@@ -4,20 +4,8 @@ export const isASubmittedFormMessage = (message = {}) =>
 
 export const MESSAGE_MAX_LENGTH = {
   GENERAL: 10000,
-  // https://developers.facebook.com/docs/messenger-platform/reference/send-api#request
-  FACEBOOK: 2000,
-  // https://developers.facebook.com/docs/instagram-platform/instagram-api-with-instagram-login/messaging-api#send-a-text-message
-  INSTAGRAM: 1000,
-  // https://www.twilio.com/docs/glossary/what-sms-character-limit
+  FACEBOOK: 1000,
   TWILIO_SMS: 320,
-  // https://help.twilio.com/articles/360033806753-Maximum-Message-Length-with-Twilio-Programmable-Messaging
   TWILIO_WHATSAPP: 1600,
-  // https://developers.facebook.com/docs/whatsapp/cloud-api/reference/messages#text-object
-  WHATSAPP_CLOUD: 4096,
-  // https://support.bandwidth.com/hc/en-us/articles/360010235373-What-are-Bandwidth-s-SMS-character-limits-and-concatenation-practices
-  BANDWIDTH_SMS: 160,
-  // https://core.telegram.org/bots/api#sendmessage
-  TELEGRAM: 4096,
-  LINE: 2000,
   EMAIL: 25000,
 };

app/javascript/shared/mixins/inboxMixin.js

@@ -121,7 +121,7 @@ export default {
         this.isATwilioWhatsAppChannel
       );
     },
-    isAnInstagramChannel() {
+    isAInstagramChannel() {
       return this.channelType === INBOX_TYPES.INSTAGRAM;
     },
   },

app/javascript/shared/store/globalConfig.js

@@ -5,6 +5,7 @@ const {
   AZURE_APP_ID: azureAppId,
   BRAND_NAME: brandName,
   CHATWOOT_INBOX_TOKEN: chatwootInboxToken,
+  CSML_EDITOR_HOST: csmlEditorHost,
   CREATE_NEW_ACCOUNT_FROM_DASHBOARD: createNewAccountFromDashboard,
   DIRECT_UPLOADS_ENABLED: directUploadsEnabled,
   DISPLAY_MANIFEST: displayManifest,
@@ -28,6 +29,7 @@ const state = {
   azureAppId,
   brandName,
   chatwootInboxToken,
+  csmlEditorHost,
   deploymentEnv,
   createNewAccountFromDashboard,
   directUploadsEnabled: directUploadsEnabled === 'true',

app/jobs/agent_bots/csml_job.rb

@@ -0,0 +1,10 @@
+class AgentBots::CsmlJob < ApplicationJob
+  queue_as :high
+
+  def perform(event, agent_bot, message)
+    event_data = { message: message }
+    Integrations::Csml::ProcessorService.new(
+      event_name: event, agent_bot: agent_bot, event_data: event_data
+    ).perform
+  end
+end

app/jobs/webhooks/instagram_events_job.rb

@@ -24,11 +24,6 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
   private
 
   def process_single_entry(entry)
-    if test_event?(entry)
-      process_test_event(entry)
-      return
-    end
-
     process_messages(entry)
   end
 
@@ -51,20 +46,6 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
     messaging[:message].present? && messaging[:message][:is_echo].present?
   end
 
-  def test_event?(entry)
-    entry[:changes].present?
-  end
-
-  def process_test_event(entry)
-    messaging = extract_messaging_from_test_event(entry)
-
-    Instagram::TestEventService.new(messaging).perform if messaging.present?
-  end
-
-  def extract_messaging_from_test_event(entry)
-    entry[:changes].first&.dig(:value) if entry[:changes].present?
-  end
-
   def instagram_id(messaging)
     if agent_message_via_echo?(messaging)
       messaging[:sender][:id]

app/listeners/agent_bot_listener.rb

@@ -59,10 +59,14 @@ class AgentBotListener < BaseListener
     true
   end
 
-  def process_message_event(method_name, agent_bot, message, _event)
-    # Only webhook bots are supported
-    payload = message.webhook_data.merge(event: method_name)
-    process_webhook_bot_event(agent_bot, payload)
+  def process_message_event(method_name, agent_bot, message, event)
+    case agent_bot.bot_type
+    when 'webhook'
+      payload = message.webhook_data.merge(event: method_name)
+      process_webhook_bot_event(agent_bot, payload)
+    when 'csml'
+      process_csml_bot_event(event.name, agent_bot, message)
+    end
   end
 
   def process_webhook_bot_event(agent_bot, payload)
@@ -70,4 +74,8 @@ class AgentBotListener < BaseListener
 
     AgentBots::WebhookJob.perform_later(agent_bot.outgoing_url, payload)
   end
+
+  def process_csml_bot_event(event, agent_bot, message)
+    AgentBots::CsmlJob.perform_later(event, agent_bot, message)
+  end
 end

app/mailers/conversation_reply_mailer.rb

@@ -1,8 +1,4 @@
 class ConversationReplyMailer < ApplicationMailer
-  # We needs to expose large attachments to the view as links
-  # Small attachments are linked as mail attachments directly
-  attr_reader :large_attachments
-
   include ConversationReplyMailerHelper
   default from: ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot <accounts@chatwoot.com>')
   layout :choose_layout

app/mailers/conversation_reply_mailer_helper.rb

@@ -17,44 +17,11 @@ module ConversationReplyMailerHelper
     google_smtp_settings
     set_delivery_method
 
-    # Email type detection logic:
-    # - email_reply: Sets @message with a single message
-    # - Other actions: Set @messages with a collection of messages
-    #
-    # So this check implicitly determines we're handling an email_reply
-    # and not one of the other email types (summary, transcript, etc.)
-    process_attachments_as_files_for_email_reply if @message&.attachments.present?
+    Rails.logger.info("Email sent from #{email_from} to #{to_emails} with subject #{mail_subject}")
+
     mail(@options)
   end
 
-  def process_attachments_as_files_for_email_reply
-    # Attachment processing for direct email replies (when replying to a single message)
-    #
-    # How attachments are handled:
-    # 1. Total file size (<20MB): Added directly to the email as proper attachments
-    # 2. Total file size (>20MB): Added to @large_attachments to be displayed as links in the email
-
-    @options[:attachments] = []
-    @large_attachments = []
-    current_total_size = 0
-
-    @message.attachments.each do |attachment|
-      raw_data = attachment.file.download
-      attachment_name = attachment.file.filename.to_s
-      file_size = raw_data.bytesize
-
-      # Attach files directly until we hit 20MB total
-      # After reaching 20MB, send remaining files as links
-      if current_total_size + file_size <= 20.megabytes
-        mail.attachments[attachment_name] = raw_data
-        @options[:attachments] << { name: attachment_name }
-        current_total_size += file_size
-      else
-        @large_attachments << attachment
-      end
-    end
-  end
-
   private
 
   def google_smtp_settings
@@ -85,8 +52,6 @@ module ConversationReplyMailerHelper
       tls: false,
       enable_starttls_auto: true,
       openssl_verify_mode: 'none',
-      open_timeout: 15,
-      read_timeout: 15,
       authentication: 'xoauth2'
     }
   end

app/models/agent_bot.rb

@@ -25,8 +25,9 @@ class AgentBot < ApplicationRecord
   has_many :inboxes, through: :agent_bot_inboxes
   has_many :messages, as: :sender, dependent: :nullify
   belongs_to :account, optional: true
-  enum bot_type: { webhook: 0 }
+  enum bot_type: { webhook: 0, csml: 1 }
 
+  validate :validate_agent_bot_config
   validates :outgoing_url, length: { maximum: Limits::URL_LENGTH_LIMIT }
 
   def available_name
@@ -50,7 +51,9 @@ class AgentBot < ApplicationRecord
     }
   end
 
-  def system_bot?
-    account.nil?
+  private
+
+  def validate_agent_bot_config
+    errors.add(:bot_config, 'Invalid Bot Configuration') unless AgentBots::ValidateBotService.new(agent_bot: self).perform
   end
 end

app/models/channel/api.rb

@@ -33,6 +33,10 @@ class Channel::Api < ApplicationRecord
     'API'
   end
 
+  def messaging_window_enabled?
+    additional_attributes.present? && additional_attributes['agent_reply_time_window'].present?
+  end
+
   private
 
   def ensure_valid_agent_reply_time_window

app/models/channel/facebook_page.rb

@@ -32,6 +32,10 @@ class Channel::FacebookPage < ApplicationRecord
     'Facebook'
   end
 
+  def messaging_window_enabled?
+    false
+  end
+
   def create_contact_inbox(instagram_id, name)
     @contact_inbox = ::ContactInboxWithContactBuilder.new({
                                                             source_id: instagram_id,

app/models/channel/twilio_sms.rb

@@ -41,6 +41,10 @@ class Channel::TwilioSms < ApplicationRecord
     medium == 'sms' ? 'Twilio SMS' : 'Whatsapp'
   end
 
+  def messaging_window_enabled?
+    medium == 'whatsapp'
+  end
+
   def send_message(to:, body:, media_url: nil)
     params = send_message_from.merge(to: to, body: body)
     params[:media_url] = media_url if media_url.present?

app/models/channel/whatsapp.rb

@@ -46,6 +46,10 @@ class Channel::Whatsapp < ApplicationRecord
     end
   end
 
+  def messaging_window_enabled?
+    true
+  end
+
   def mark_message_templates_updated
     # rubocop:disable Rails/SkipsModelValidations
     update_column(:message_templates_last_updated, Time.zone.now)

app/models/concerns/channelable.rb

@@ -7,6 +7,10 @@ module Channelable
     after_update :create_audit_log_entry
   end
 
+  def messaging_window_enabled?
+    false
+  end
+
   def create_audit_log_entry; end
 end
 

app/models/conversation.rb

@@ -115,7 +115,14 @@ class Conversation < ApplicationRecord
   delegate :auto_resolve_duration, to: :account
 
   def can_reply?
-    Conversations::MessageWindowService.new(self).can_reply?
+    channel = inbox&.channel
+
+    return can_reply_on_instagram? if additional_attributes['type'] == 'instagram_direct_message'
+
+    return true unless channel&.messaging_window_enabled?
+
+    messaging_window = inbox.api? ? channel.additional_attributes['agent_reply_time_window'].to_i : 24
+    last_message_in_messaging_window?(messaging_window)
   end
 
   def language
@@ -130,6 +137,24 @@ class Conversation < ApplicationRecord
     messages&.incoming&.last
   end
 
+  def last_message_in_messaging_window?(time)
+    return false if last_incoming_message.nil?
+
+    Time.current < last_incoming_message.created_at + time.hours
+  end
+
+  def can_reply_on_instagram?
+    global_config = GlobalConfig.get('ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT')
+
+    return false if last_incoming_message.nil?
+
+    if global_config['ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT']
+      Time.current < last_incoming_message.created_at + 7.days
+    else
+      last_message_in_messaging_window?(24)
+    end
+  end
+
   def toggle_status
     # FIXME: implement state machine with aasm
     self.status = open? ? :resolved : :open

app/services/agent_bots/validate_bot_service.rb

@@ -0,0 +1,38 @@
+class AgentBots::ValidateBotService
+  pattr_initialize [:agent_bot]
+  def perform
+    return true unless agent_bot.bot_type == 'csml'
+
+    validate_csml_bot
+  end
+
+  private
+
+  def csml_client
+    @csml_client ||= CsmlEngine.new
+  end
+
+  def csml_bot_payload
+    {
+      id: agent_bot[:name],
+      name: agent_bot[:name],
+      default_flow: 'Default',
+      flows: [
+        {
+          id: SecureRandom.uuid,
+          name: 'Default',
+          content: agent_bot.bot_config['csml_content'],
+          commands: []
+        }
+      ]
+    }
+  end
+
+  def validate_csml_bot
+    response = csml_client.validate(csml_bot_payload)
+    response.blank? || response['valid']
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: agent_bot&.account).capture_exception
+    false
+  end
+end

app/services/conversations/message_window_service.rb

@@ -1,64 +0,0 @@
-class Conversations::MessageWindowService
-  MESSAGING_WINDOW_24_HOURS = 24.hours
-  MESSAGING_WINDOW_7_DAYS = 7.days
-
-  def initialize(conversation)
-    @conversation = conversation
-  end
-
-  def can_reply?
-    return true if messaging_window.blank?
-
-    last_message_in_messaging_window?(messaging_window)
-  end
-
-  private
-
-  def messaging_window
-    case @conversation.inbox.channel_type
-    when 'Channel::Api'
-      api_messaging_window
-    when 'Channel::FacebookPage'
-      messenger_messaging_window
-    when 'Channel::Instagram'
-      instagram_messaging_window
-    when 'Channel::Whatsapp'
-      MESSAGING_WINDOW_24_HOURS
-    when 'Channel::TwilioSms'
-      twilio_messaging_window
-    end
-  end
-
-  def last_message_in_messaging_window?(time)
-    return false if last_incoming_message.nil?
-
-    Time.current < last_incoming_message.created_at + time
-  end
-
-  def api_messaging_window
-    return if @conversation.inbox.channel.additional_attributes['agent_reply_time_window'].blank?
-
-    @conversation.inbox.channel.additional_attributes['agent_reply_time_window'].to_i.hours
-  end
-
-  # Check medium of the inbox to determine the messaging window
-  def twilio_messaging_window
-    @conversation.inbox.channel.medium == 'whatsapp' ? MESSAGING_WINDOW_24_HOURS : nil
-  end
-
-  def messenger_messaging_window
-    meta_messaging_window('ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT')
-  end
-
-  def instagram_messaging_window
-    meta_messaging_window('ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT')
-  end
-
-  def meta_messaging_window(config_key)
-    GlobalConfigService.load(config_key, nil) ? MESSAGING_WINDOW_7_DAYS : MESSAGING_WINDOW_24_HOURS
-  end
-
-  def last_incoming_message
-    @last_incoming_message ||= @conversation.messages&.incoming&.last
-  end
-end

app/services/instagram/test_event_service.rb

@@ -1,79 +0,0 @@
-class Instagram::TestEventService
-  def initialize(messaging)
-    @messaging = messaging
-  end
-
-  def perform
-    Rails.logger.info("Processing Instagram test webhook event, #{@messaging}")
-
-    return false unless test_webhook_event?
-
-    create_test_text
-  end
-
-  private
-
-  def test_webhook_event?
-    @messaging[:sender][:id] == '12334' && @messaging[:recipient][:id] == '23245'
-  end
-
-  def create_test_text
-    # As of now, we are using the last created instagram channel as the test channel,
-    # since we don't have any other channel for testing purpose at the time of meta approval
-    channel = Channel::Instagram.last
-
-    @inbox = ::Inbox.find_by(channel: channel)
-    return unless @inbox
-
-    @contact = create_test_contact
-
-    @conversation ||= create_test_conversation(conversation_params)
-
-    @message = @conversation.messages.create!(test_message_params)
-  end
-
-  def create_test_contact
-    @contact_inbox = @inbox.contact_inboxes.where(source_id: @messaging[:sender][:id]).first
-    unless @contact_inbox
-      @contact_inbox ||= @inbox.channel.create_contact_inbox(
-        'sender_username', 'sender_username'
-      )
-    end
-
-    @contact_inbox.contact
-  end
-
-  def create_test_conversation(conversation_params)
-    Conversation.find_by(conversation_params) || build_conversation(conversation_params)
-  end
-
-  def test_message_params
-    {
-      account_id: @conversation.account_id,
-      inbox_id: @conversation.inbox_id,
-      message_type: 'incoming',
-      source_id: @messaging[:message][:mid],
-      content: @messaging[:message][:text],
-      sender: @contact
-    }
-  end
-
-  def build_conversation(conversation_params)
-    Conversation.create!(
-      conversation_params.merge(
-        contact_inbox_id: @contact_inbox.id
-      )
-    )
-  end
-
-  def conversation_params
-    {
-      account_id: @inbox.account_id,
-      inbox_id: @inbox.id,
-      contact_id: @contact.id,
-      additional_attributes: {
-        type: 'instagram_direct_message'
-      }
-    }
-  end
-end