Merge branch 'develop' into feat/read-only-token

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

@@ -61,21 +61,9 @@ const hasAdvancedAssignment = computed(() => {
   );
 });
 
-const hasConversationUnreadCounts = computed(() => {
-  return isFeatureEnabledonAccount.value(
-    accountId.value,
-    FEATURE_FLAGS.CONVERSATION_UNREAD_COUNTS
-  );
-});
-
-const fetchConversationUnreadCounts = ([currentAccountId, isEnabled]) => {
+const fetchConversationUnreadCounts = currentAccountId => {
   if (!currentAccountId) return;
 
-  if (!isEnabled) {
-    store.dispatch('conversationUnreadCounts/clear');
-    return;
-  }
-
   store.dispatch('conversationUnreadCounts/get');
 };
 
@@ -200,7 +188,7 @@ onMounted(() => {
   store.dispatch('customViews/get', 'contact');
 });
 
-watch([accountId, hasConversationUnreadCounts], fetchConversationUnreadCounts, {
+watch(accountId, fetchConversationUnreadCounts, {
   immediate: true,
 });
 

app/javascript/dashboard/featureFlags.js

@@ -46,7 +46,6 @@ export const FEATURE_FLAGS = {
   COMPANIES: 'companies',
   ADVANCED_SEARCH: 'advanced_search',
   CONVERSATION_REQUIRED_ATTRIBUTES: 'conversation_required_attributes',
-  CONVERSATION_UNREAD_COUNTS: 'conversation_unread_counts',
 };
 
 export const PREMIUM_FEATURES = [

app/javascript/dashboard/helper/actionCable.js

@@ -13,7 +13,6 @@ import {
 } from 'dashboard/composables/useWhatsappCallSession';
 import { VOICE_CALL_PROVIDERS } from 'dashboard/helper/inbox';
 import { VOICE_CALL_DIRECTION } from 'dashboard/components-next/message/constants';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 const { isImpersonating } = useImpersonation();
 const UNREAD_COUNTS_REFETCH_THROTTLE_MS = 5000;
@@ -172,23 +171,10 @@ class ActionCableConnector extends BaseActionCableConnector {
   };
 
   fetchConversationUnreadCounts = () => {
-    if (!this.isConversationUnreadCountsEnabled()) return;
-
     this.lastUnreadCountsFetchAt = Date.now();
     this.app.$store.dispatch('conversationUnreadCounts/get');
   };
 
-  isConversationUnreadCountsEnabled = () => {
-    const accountId = this.app.$store.getters.getCurrentAccountId;
-    const isFeatureEnabled =
-      this.app.$store.getters['accounts/isFeatureEnabledonAccount'];
-
-    return isFeatureEnabled?.(
-      accountId,
-      FEATURE_FLAGS.CONVERSATION_UNREAD_COUNTS
-    );
-  };
-
   onTypingOn = ({ conversation, user }) => {
     const conversationId = conversation.id;
 

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

@@ -30,7 +30,6 @@ describe('ActionCableConnector - Copilot Tests', () => {
         dispatch: mockDispatch,
         getters: {
           getCurrentAccountId: 1,
-          'accounts/isFeatureEnabledonAccount': vi.fn(() => true),
         },
       },
     };
@@ -89,21 +88,6 @@ describe('ActionCableConnector - Copilot Tests', () => {
       expect(mockDispatch).toHaveBeenCalledWith('conversationUnreadCounts/get');
     });
 
-    it('does not refetch unread counts when unread count feature is disabled', () => {
-      store.$store.getters[
-        'accounts/isFeatureEnabledonAccount'
-      ].mockReturnValue(false);
-
-      actionCable.onReceived({
-        event: 'conversation.unread_count_changed',
-        data: { account_id: 1 },
-      });
-
-      expect(mockDispatch).not.toHaveBeenCalledWith(
-        'conversationUnreadCounts/get'
-      );
-    });
-
     it('should throttle unread count refetches for repeated events', () => {
       vi.useFakeTimers();
       vi.setSystemTime(new Date('2026-01-01T00:00:00Z'));

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

@@ -48,9 +48,6 @@ export const actions = {
       // Ignore errors so the sidebar can continue rendering without badges.
     }
   },
-  clear({ commit }) {
-    commit(types.SET_CONVERSATION_UNREAD_COUNTS, {});
-  },
 };
 
 export const mutations = {

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

@@ -39,15 +39,4 @@ describe('#actions', () => {
       expect(commit).not.toHaveBeenCalled();
     });
   });
-
-  describe('#clear', () => {
-    it('clears unread counts', () => {
-      actions.clear({ commit });
-
-      expect(commit).toHaveBeenCalledWith(
-        types.SET_CONVERSATION_UNREAD_COUNTS,
-        {}
-      );
-    });
-  });
 });