Merge remote-tracking branch 'origin/develop' into feat/whatsapp-call

# Conflicts:
#	db/migrate/20260408170902_create_calls.rb
#	db/schema.rb
#	enterprise/app/models/call.rb

app/javascript/dashboard/helper/URLHelper.js

@@ -51,6 +51,7 @@ export const conversationListPageURL = ({
   } else if (conversationType) {
     const urlMap = {
       mention: 'mentions/conversations',
+      participating: 'participating/conversations',
       unattended: 'unattended/conversations',
     };
     url = `accounts/${accountId}/${urlMap[conversationType]}`;

app/javascript/dashboard/helper/automationHelper.js

@@ -150,6 +150,7 @@ export const getConditionOptions = ({
     conversation_language: languages,
     country_code: countries,
     message_type: messageTypeOptions,
+    private_note: booleanFilterOptions,
     priority: priorityOptions,
     labels: generateConditionOptions(labels, 'title'),
   };

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

@@ -40,6 +40,15 @@ describe('#URL Helpers', () => {
         '/app/accounts/1/custom_view/1'
       );
     });
+
+    it('should return url to participating conversations', () => {
+      expect(
+        conversationListPageURL({
+          accountId: 1,
+          conversationType: 'participating',
+        })
+      ).toBe('/app/accounts/1/participating/conversations');
+    });
   });
   describe('conversationUrl', () => {
     it('should return direct conversation URL if activeInbox is nil', () => {

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

@@ -178,6 +178,21 @@ describe('getConditionOptions', () => {
       })
     ).toEqual(testOptions);
   });
+
+  it('returns boolean options for private_note', () => {
+    const booleanOptions = [
+      { id: true, name: 'True' },
+      { id: false, name: 'False' },
+    ];
+
+    expect(
+      helpers.getConditionOptions({
+        booleanFilterOptions: booleanOptions,
+        customAttributes,
+        type: 'private_note',
+      })
+    ).toEqual(booleanOptions);
+  });
 });
 
 describe('getFileName', () => {

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

@@ -45,6 +45,10 @@ describe('#resolveTeamIds', () => {
     const resolvedTeams = '⚙️ sales team, 🤷‍♂️ fayaz';
     expect(resolveTeamIds(teams, [1, 2])).toEqual(resolvedTeams);
   });
+
+  it('resolves nil as None', () => {
+    expect(resolveTeamIds(teams, ['nil'])).toEqual('None');
+  });
 });
 
 describe('#resolveLabels', () => {
@@ -59,6 +63,10 @@ describe('#resolveAgents', () => {
     const resolvedAgents = 'John Doe';
     expect(resolveAgents(agents, [1])).toEqual(resolvedAgents);
   });
+
+  it('resolves nil and self values', () => {
+    expect(resolveAgents(agents, ['nil', 'self'])).toEqual('None, Self');
+  });
 });
 
 describe('#getFileName', () => {

app/javascript/dashboard/helper/validations.js

@@ -125,6 +125,7 @@ const validateSingleAction = action => {
     'mute_conversation',
     'snooze_conversation',
     'resolve_conversation',
+    'remove_assigned_agent',
     'remove_assigned_team',
     'open_conversation',
     'pending_conversation',