fix threshold sorting [ci]

Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>

Author: pawelperek-da

apps/sv/frontend/src/__tests__/governance/governance-sorting.test.tsx

@@ -15,7 +15,6 @@ import { ProposalListingData } from '../../utils/types';
 describe('Governance Page Sorting', () => {
   describe('Action Required Section', () => {
     test('should render items sorted by voting closes date ascending (closest deadline first)', () => {
-      // Pass data intentionally in unsorted order
       const unsortedRequests: ActionRequiredData[] = [
         {
           actionName: 'Action C - Latest deadline',
@@ -49,7 +48,6 @@ describe('Governance Page Sorting', () => {
       const cards = screen.getAllByTestId('action-required-card');
       expect(cards).toHaveLength(3);
 
-      // Verify order: earliest deadline first
       const actionNames = cards.map(
         card => card.querySelector('[data-testid="action-required-action-content"]')?.textContent
       );
@@ -103,7 +101,6 @@ describe('Governance Page Sorting', () => {
     };
 
     test('should render items sorted by effective date ascending (closest first)', () => {
-      // Pass data intentionally in unsorted order
       const unsortedRequests: ProposalListingData[] = [
         {
           ...baseData,
@@ -154,7 +151,7 @@ describe('Governance Page Sorting', () => {
       expect(actionNames[2]).toBe('Action C - Latest effective');
     });
 
-    test('should place Threshold items after items with specific effective dates', () => {
+    test('should sort Threshold items by their voting deadline alongside dated items', () => {
       const unsortedRequests: ProposalListingData[] = [
         {
           ...baseData,
@@ -192,9 +189,8 @@ describe('Governance Page Sorting', () => {
         row => row.querySelector('[data-testid="inflight-votes-row-action-name"]')?.textContent
       );
 
-      // Dated items should come before Threshold items
-      expect(actionNames[0]).toBe('Dated Action');
-      expect(actionNames[1]).toBe('Threshold Action');
+      expect(actionNames[0]).toBe('Threshold Action');
+      expect(actionNames[1]).toBe('Dated Action');
     });
 
     test('should sort multiple Threshold items by voting deadline', () => {
@@ -260,7 +256,6 @@ describe('Governance Page Sorting', () => {
     };
 
     test('should render items sorted by effective date descending (most recent first)', () => {
-      // Pass data intentionally in unsorted order
       const unsortedRequests: ProposalListingData[] = [
         {
           ...baseData,
@@ -349,7 +344,6 @@ describe('Governance Page Sorting', () => {
         row => row.querySelector('[data-testid="vote-history-row-action-name"]')?.textContent
       );
 
-      // Later time should come first (most recent)
       expect(actionNames[0]).toBe('Action B - Later time');
       expect(actionNames[1]).toBe('Action A - Earlier time');
     });

apps/sv/frontend/src/components/governance/ProposalListingSection.tsx

@@ -45,25 +45,21 @@ const sortProposals = (
 ): ProposalListingData[] => {
   if (!sortOrder) return data;
 
-  return data.toSorted((a, b) => {
-    if (sortOrder === 'effectiveAtAsc') {
-      // For ascending sort: items with "Threshold" (no specific effective date) go after items with dates
-      const aIsThreshold = a.voteTakesEffect === 'Threshold';
-      const bIsThreshold = b.voteTakesEffect === 'Threshold';
-
-      if (aIsThreshold && bIsThreshold) {
-        // Both are threshold-based, sort by voting deadline
-        return dayjs(a.votingThresholdDeadline).isBefore(dayjs(b.votingThresholdDeadline)) ? -1 : 1;
+  return data
+    .map(item => ({
+      item,
+      effectiveDate: dayjs(
+        item.voteTakesEffect === 'Threshold' ? item.votingThresholdDeadline : item.voteTakesEffect
+      ),
+    }))
+    .toSorted((a, b) => {
+      if (sortOrder === 'effectiveAtAsc') {
+        return a.effectiveDate.isBefore(b.effectiveDate) ? -1 : 1;
+      } else {
+        return a.effectiveDate.isAfter(b.effectiveDate) ? -1 : 1;
       }
-      if (aIsThreshold) return 1;
-      if (bIsThreshold) return -1;
-
-      return dayjs(a.voteTakesEffect).isBefore(dayjs(b.voteTakesEffect)) ? -1 : 1;
-    } else {
-      // effectiveAtDesc: most recent first
-      return dayjs(a.voteTakesEffect).isAfter(dayjs(b.voteTakesEffect)) ? -1 : 1;
-    }
-  });
+    })
+    .map(({ item }) => item);
 };
 
 export const ProposalListingSection: React.FC<ProposalListingSectionProps> = props => {