From 87b9b23025c0323747d9ca919edc5653a5a5ebab Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Tue, 2 Apr 2024 12:06:26 +0200 Subject: [PATCH] [Glitch] Use integers and not numbers in notification policy API counters Port b4d991adaa82e05a2dd95ae5c08bb374391ef568 to glitch-soc Signed-off-by: Claire --- .../components/filtered_notifications_banner.jsx | 2 +- app/javascript/flavours/glitch/utils/numbers.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx index 4239d3d3e5..a2149ce89e 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.jsx @@ -27,7 +27,7 @@ export const FilteredNotificationsBanner = () => { }; }, [dispatch]); - if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) * 1 === 0) { + if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) { return null; } diff --git a/app/javascript/flavours/glitch/utils/numbers.ts b/app/javascript/flavours/glitch/utils/numbers.ts index 03235cea81..89526404b3 100644 --- a/app/javascript/flavours/glitch/utils/numbers.ts +++ b/app/javascript/flavours/glitch/utils/numbers.ts @@ -70,10 +70,10 @@ export function roundTo10(num: number): number { return Math.round(num * 0.1) / 0.1; } -export function toCappedNumber(num: string): string { - if (parseInt(num) > 99) { - return '99+'; +export function toCappedNumber(num: number, max = 99): string { + if (num > max) { + return `${max}+`; } else { - return num; + return num.toString(); } }