Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

fix(duration): avoid adding zero-value units to shiftTo

Andrii Andrushchyshyna8222877623f
diff --git a/client/src/lib/dateTimeUtils.ts b/client/src/lib/dateTimeUtils.ts
index 1e3e995a6..85a0f1f81 100644
--- a/client/src/lib/dateTimeUtils.ts
+++ b/client/src/lib/dateTimeUtils.ts
@@ -1,5 +1,5 @@
-import { Duration, DateTime } from "luxon";
+import { Duration, DateTime, DurationLikeObject } from "luxon";
/**
* Returns localized weekday names, starting from Monday.
@@ -78,9 +78,15 @@ export function formatDuration(minutes: number, seconds: number): string {
units.seconds = seconds;
}
+ const keys: (keyof DurationLikeObject)[] = [];
+ if (minutes > 0) {
+ keys.push("minutes");
+ }
+ keys.push("seconds");
+
const duration = Duration.fromObject(units)
- .shiftTo("minutes", "seconds")
- .normalize();
+ .shiftTo(...keys)
+ .normalize();
return duration.toHuman({
listStyle: "narrow",