diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ec11c7a..d97b4f5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ NOTE: Add new changes BELOW THIS COMMENT. ### Fixed +- Formatting of elapsed times less than one millisecond. - Changes to global upstream DNS settings not applying to custom client upstream configurations. - The formatting of large numbers in the clients tables on the *Client settings* page ([#7583]). diff --git a/client/src/helpers/helpers.tsx b/client/src/helpers/helpers.tsx index ba18b1c0..74f50ee7 100644 --- a/client/src/helpers/helpers.tsx +++ b/client/src/helpers/helpers.tsx @@ -669,15 +669,17 @@ export const countClientsStatistics = (ids: any, autoClients: any) => { * @returns {string} */ export const formatElapsedMs = (elapsedMs: string, t: (key: string) => string) => { - const parsedElapsedMs = parseInt(elapsedMs, 10); + const parsedElapsedMs = parseFloat(elapsedMs); if (Number.isNaN(parsedElapsedMs)) { return elapsedMs; } - const formattedMs = formatNumber(parsedElapsedMs); + const formattedValue = parsedElapsedMs < 1 + ? parsedElapsedMs.toFixed(2) + : Math.floor(parsedElapsedMs).toString(); - return `${formattedMs} ${t('milliseconds_abbreviation')}`; + return `${formattedValue} ${t('milliseconds_abbreviation')}`; }; /**