fix: calc relative ms for sidebar categories correctly

Author: ndom91

apps/desktop/package.json

@@ -38,6 +38,7 @@
 		"@lezer/common": "^1.2.1",
 		"@lezer/highlight": "^1.2.0",
 		"@octokit/rest": "^20.1.1",
+		"@reduxjs/toolkit": "catalog:redux",
 		"@replit/codemirror-lang-svelte": "^6.0.0",
 		"@sentry/sveltekit": "^8.9.2",
 		"@sveltejs/adapter-static": "catalog:svelte",
@@ -90,10 +91,10 @@
 		"tinykeys": "^2.1.0",
 		"ts-node": "^10.9.2",
 		"vite": "catalog:",
-		"vitest": "^2.0.5",
-		"@reduxjs/toolkit": "catalog:redux"
+		"vitest": "^2.0.5"
 	},
 	"dependencies": {
+		"dayjs": "^1.11.13",
 		"openai": "^4.47.3"
 	}
 }

apps/desktop/src/lib/branches/branchListing.ts

@@ -9,6 +9,7 @@ import {
 	type SidebarEntrySubject
 } from '$lib/navigation/types';
 import { debouncedDerive } from '$lib/utils/debounce';
+import { msSinceDaysAgo } from '$lib/utils/time';
 import { persisted, type Persisted } from '@gitbutler/shared/persisted';
 import { Transform, Type, plainToInstance } from 'class-transformer';
 import Fuse from 'fuse.js';
@@ -121,7 +122,6 @@ export class BranchListingService {
 	}
 }
 
-const oneDay = 1000 * 60 * 60 * 24;
 export type GroupedSidebarEntries = Record<
 	'applied' | 'today' | 'yesterday' | 'lastWeek' | 'older',
 	SidebarEntrySubject[]
@@ -283,11 +283,11 @@ export class CombinedBranchListingService {
 
 			if (getEntryWorkspaceStatus(b)) {
 				grouped.applied.push(b);
-			} else if (msSinceLastCommit < oneDay) {
+			} else if (msSinceLastCommit < msSinceDaysAgo(1)) {
 				grouped.today.push(b);
-			} else if (msSinceLastCommit < 2 * oneDay) {
+			} else if (msSinceLastCommit < msSinceDaysAgo(2)) {
 				grouped.yesterday.push(b);
-			} else if (msSinceLastCommit < 7 * oneDay) {
+			} else if (msSinceLastCommit < msSinceDaysAgo(7)) {
 				grouped.lastWeek.push(b);
 			} else {
 				grouped.older.push(b);

apps/desktop/src/lib/utils/time.ts

@@ -1,3 +1,5 @@
+import dayjs from 'dayjs';
+
 export function toHumanReadableTime(d: Date) {
 	return d.toLocaleTimeString('en-US', {
 		hour: 'numeric',
@@ -11,3 +13,7 @@ export function toHumanReadableDate(d: Date) {
 		hour12: false
 	});
 }
+
+export function msSinceDaysAgo(days: number) {
+	return Math.abs(dayjs().subtract(days, 'day').endOf('day').diff(dayjs(), 'millisecond'));
+}