fix(3681): change proposal sort order

2023-05-10 17:12:18 +01:00
2 changed files with 5 additions and 6 deletions
@@ -24,7 +24,6 @@ const openProposalClosesNextMonth = generateProposal({
  },
  terms: {
    closingDatetime: nextMonth.toString(),
-    enactmentDatetime: nextMonth.toString(),
  },
 });

@@ -36,7 +35,6 @@ const openProposalClosesNextWeek = generateProposal({
  },
  terms: {
    closingDatetime: nextWeek.toString(),
-    enactmentDatetime: nextWeek.toString(),
  },
 });

@@ -45,7 +43,6 @@ const enactedProposalClosedLastWeek = generateProposal({
  state: ProposalState.STATE_ENACTED,
  terms: {
    closingDatetime: lastWeek.toString(),
-    enactmentDatetime: lastWeek.toString(),
  },
 });

@@ -54,7 +51,6 @@ const failedProposalClosedLastMonth = generateProposal({
  state: ProposalState.STATE_FAILED,
  terms: {
    closingDatetime: lastMonth.toString(),
-    enactmentDatetime: lastMonth.toString(),
  },
 });

@@ -20,8 +20,11 @@ import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
 const orderByDate = (arr: ProposalFieldsFragment[]) =>
  orderBy(
    arr,
-    [(p) => new Date(p?.terms?.closingDatetime).getTime(), (p) => p.id],
-    ['desc', 'desc']
+    [
+      (p) => new Date(p?.terms?.closingDatetime).getTime(),
+      (p) => new Date(p?.datetime).getTime(),
+    ],
+    ['asc', 'asc']
  );

 const orderByUpgradeBlockHeight = (