From 86f948540bb788532ff4bb620c51bd5115a11eee Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sat, 1 Aug 2026 05:49:25 +0000
Subject: [PATCH] fix: rebase on main (B85 demands + B87 assessores)

---
 src/components/campaign/advisor/AdvisorsTable.tsx   | 2 +-
 src/lib/campaignAdvisorQuickActions.ts              | 2 +-
 src/lib/campaignQuickActionMount.ts                 | 2 +-
 src/lib/campaignQuickActionRegistry.ts              | 2 +-
 tests/unit/campaignAdvisorQuickActions.unit.spec.ts | 4 +---
 tests/unit/campaignQuickAction.unit.spec.ts         | 3 +--
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/campaign/advisor/AdvisorsTable.tsx b/src/components/campaign/advisor/AdvisorsTable.tsx
index 77920edc..88bee994 100644
--- a/src/components/campaign/advisor/AdvisorsTable.tsx
+++ b/src/components/campaign/advisor/AdvisorsTable.tsx
@@ -11,7 +11,7 @@ import {
 } from 'lucide-react'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
-import { useMemo, useState, useTransition, useEffect } from 'react'
+import { useEffect, useMemo, useState, useTransition } from 'react'
 import { toast } from 'sonner'
 
 import { AdvisorDebouncedTextCell } from '@/components/campaign/advisor/AdvisorDebouncedTextCell'
diff --git a/src/lib/campaignAdvisorQuickActions.ts b/src/lib/campaignAdvisorQuickActions.ts
index c6d46bac..1043a05c 100644
--- a/src/lib/campaignAdvisorQuickActions.ts
+++ b/src/lib/campaignAdvisorQuickActions.ts
@@ -1,8 +1,8 @@
 import { UserPlus } from 'lucide-react'
 
-import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { CAMPAIGN_ADVISORS_HOME } from '@/lib/campaignPaths'
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
+import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { isUnrestrictedCampaignRole, type CampaignRole } from '@/lib/campaignRoles'
 
 export const ADVISOR_QUICK_CREATE_PARAM = 'criar' as const
diff --git a/src/lib/campaignQuickActionMount.ts b/src/lib/campaignQuickActionMount.ts
index 51597ce3..ecd8daa2 100644
--- a/src/lib/campaignQuickActionMount.ts
+++ b/src/lib/campaignQuickActionMount.ts
@@ -1,5 +1,5 @@
-import { isAdvisorsPath } from '@/lib/campaignAdvisorQuickActions'
 import { CAMPAIGN_ACTIONS_HOME } from '@/lib/campaignActionRoutes'
+import { isAdvisorsPath } from '@/lib/campaignAdvisorQuickActions'
 import { CAMPAIGN_HOME, LEADER_CONTACTS_HOME } from '@/lib/campaignPaths'
 import { isActivityTourComposerPath } from '@/lib/campaignQuickActionPaths'
 import {
diff --git a/src/lib/campaignQuickActionRegistry.ts b/src/lib/campaignQuickActionRegistry.ts
index ae5d8270..06643fff 100644
--- a/src/lib/campaignQuickActionRegistry.ts
+++ b/src/lib/campaignQuickActionRegistry.ts
@@ -4,13 +4,13 @@ import { resolveStaffHomeQuickActions } from '@/lib/campaignHomeActions'
 import { resolveMunicipalityQuickActionsForPath } from '@/lib/campaignMunicipalityQuickActions'
 import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
-import { isLeaderContactsPath } from '@/lib/campaignQuickActionMount'
 import {
   isDemandDetailPath,
   isDemandsListPath,
   resolveDemandDetailQuickActions,
   resolveDemandsListQuickActions,
 } from '@/lib/campaignQuickActionDemands'
+import { isLeaderContactsPath } from '@/lib/campaignQuickActionMount'
 import {
   parseActivityQuickActionSurface,
   parseOrganizationQuickActionSurface,
diff --git a/tests/unit/campaignAdvisorQuickActions.unit.spec.ts b/tests/unit/campaignAdvisorQuickActions.unit.spec.ts
index 6114f3e2..91cea3c9 100644
--- a/tests/unit/campaignAdvisorQuickActions.unit.spec.ts
+++ b/tests/unit/campaignAdvisorQuickActions.unit.spec.ts
@@ -56,8 +56,6 @@ describe('resolveAdvisorQuickActionsForPath', () => {
   })
 
   it('returns empty catalog for advisor role even on assessores paths', () => {
-    expect(
-      resolveAdvisorQuickActionsForPath('/campanha/assessores', 'advisor', {}),
-    ).toEqual([])
+    expect(resolveAdvisorQuickActionsForPath('/campanha/assessores', 'advisor', {})).toEqual([])
   })
 })
diff --git a/tests/unit/campaignQuickAction.unit.spec.ts b/tests/unit/campaignQuickAction.unit.spec.ts
index 078243c8..4c906c9b 100644
--- a/tests/unit/campaignQuickAction.unit.spec.ts
+++ b/tests/unit/campaignQuickAction.unit.spec.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
 
 import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
 import { CAMPAIGN_WIZARD_ACTION_SLUGS } from '@/lib/campaignActionRoutes'
+import { advisorQuickCreateHref } from '@/lib/campaignAdvisorQuickActions'
 import { UNCOVERED_MUNICIPALITIES_LIST_HREF, homeActionsForRole } from '@/lib/campaignHomeActions'
 import {
   CAMPAIGN_DEMANDS_CREATE_HREF,
@@ -11,7 +12,6 @@ import {
   resolveDemandDetailQuickActions,
   resolveDemandsListQuickActions,
 } from '@/lib/campaignQuickActionDemands'
-import { advisorQuickCreateHref } from '@/lib/campaignAdvisorQuickActions'
 import {
   isCampaignActionsPath,
   isCampaignHomePath,
@@ -253,7 +253,6 @@ describe('campaignQuickActionRegistry', () => {
     expect(resolveQuickActionsForPath('/campanha/territorios', 'leader', {})).toEqual([])
   })
 
-<<<<<<< HEAD
   it('returns single register-demand launcher on demandas list (B85)', () => {
     const actions = resolveQuickActionsForPath('/campanha/demandas', 'coordinator', {})
     expect(actions.map((action) => action.id)).toEqual(['register-demand'])