Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/upgrades/changelog/ChangelogClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,19 @@ function scheduleLabel(change: Change): string {
return getVibenetChangeById(change.id) ? 'Vibenet' : 'Not scheduled';
}

// Reverse-chronological rank per upgrade id
const upgradeRankById = new Map(
getUpgradesReversed().map((upgrade, index) => [upgrade.id, index]),
);

function upgradeRank(change: Change): number {
// Vibenet changes aren't in an upgrade yet, but should display at the top for testing
if (!change.upgrade) {
return getVibenetChangeById(change.id) ? -1 : Number.MAX_SAFE_INTEGER;
}
return upgradeRankById.get(change.upgrade) ?? Number.MAX_SAFE_INTEGER;
}

function NetworkStatus({ change, network }: { change: Change; network: 'sepolia' | 'mainnet' }) {
const lifecycle = getLifecycleForChange(change);
if (lifecycle) {
Expand Down Expand Up @@ -99,8 +112,9 @@ export function ChangelogClient() {
});

return next.sort((a, b) => {
const upgradeCmp = scheduleLabel(a).localeCompare(scheduleLabel(b));
if (upgradeCmp !== 0) return upgradeCmp;
const rankCmp = upgradeRank(a) - upgradeRank(b);
if (rankCmp !== 0) return rankCmp;
// Fall back to alphabetical for equal rank
return a.title.localeCompare(b.title);
});
}, [categoryFilter, kindFilter, lifecycleFilter, query, upgradeFilter]);
Expand Down
Loading