Fix bugs

Author: DaryaVorontsova

src/containers/Node/NodeNetwork/columns.ts

@@ -12,9 +12,9 @@ import {
 } from '../../../components/nodesColumns/columns';
 import type {GetNodesColumnsParams} from '../../../components/nodesColumns/types';
 import {EMPTY_DATA_PLACEHOLDER} from '../../../lib';
+import {formatBytes} from '../../../utils/bytesParsers';
 import {formatDateTime} from '../../../utils/dataFormatters/dataFormatters';
 import type {Column} from '../../../utils/tableUtils/types';
-import {bytesToMB, isNumeric} from '../../../utils/utils';
 
 import {
     NODE_NETWORK_COLUMNS_IDS,
@@ -35,15 +35,22 @@ function getPeerConnectTimeColumn<T extends {ConnectTime?: string}>(): Column<T>
     };
 }
 
+function renderSent(bytes?: number | string) {
+    return formatBytes({
+        value: bytes,
+        size: 'mb',
+        withSizeLabel: true,
+    });
+}
+
 function getPeerSentBytesColumn<T extends {BytesSend?: string | number}>(): Column<T> {
     return {
         name: NODE_NETWORK_COLUMNS_IDS.BytesSend,
         header: NODE_NETWORK_COLUMNS_TITLES.BytesSend,
         align: DataTable.RIGHT,
         width: 140,
         resizeMinWidth: 120,
-        render: ({row}) =>
-            isNumeric(row.BytesSend) ? bytesToMB(row.BytesSend, 0, true) : EMPTY_DATA_PLACEHOLDER,
+        render: ({row}) => renderSent(row.BytesSend) ?? EMPTY_DATA_PLACEHOLDER,
     };
 }
 
@@ -54,10 +61,7 @@ function getPeerReceivedBytesColumn<T extends {BytesReceived?: string | number}>
         align: DataTable.RIGHT,
         width: 160,
         resizeMinWidth: 130,
-        render: ({row}) =>
-            isNumeric(row.BytesReceived)
-                ? bytesToMB(row.BytesReceived, 0, true)
-                : EMPTY_DATA_PLACEHOLDER,
+        render: ({row}) => renderSent(row.BytesReceived) ?? EMPTY_DATA_PLACEHOLDER,
     };
 }
 

src/utils/utils.ts

@@ -34,40 +34,27 @@ export function bytesToSize(bytes: number) {
     return val.toPrecision(3) + sizes[i];
 }
 
-function formatMbWithMaxFractionDigits(value: number, fractionDigits?: number): string {
-    if (isNumeric(fractionDigits)) {
-        const fixed = value.toFixed(fractionDigits);
-        const trimmed = fixed.replace(/\.?0+$/, '');
-
-        return trimmed === '' ? '0' : trimmed;
-    }
-
-    if (value < 10) {
-        return value.toFixed(2);
-    } else if (value < 100) {
-        return value.toFixed(1);
-    }
-
-    return value.toFixed();
-}
-
-export function bytesToMB(
-    bytes?: number | string,
-    fractionDigits?: number,
-    withThousandsGrouping?: boolean,
-) {
+export function bytesToMB(bytes?: number | string, fractionDigits?: number) {
     const bytesNumber = Number(bytes);
     if (isNaN(bytesNumber)) {
         return '';
     }
 
     const val = bytesNumber / base ** 2;
 
-    const roundedStr = formatMbWithMaxFractionDigits(val, fractionDigits);
+    if (isNumeric(fractionDigits)) {
+        const rounded = Number(val.toFixed(fractionDigits));
 
-    const result = withThousandsGrouping ? formatNumber(roundedStr) : roundedStr;
+        return String(rounded) + sizes[2];
+    }
 
-    return `${result}${sizes[2]}`;
+    if (val < 10) {
+        return val.toFixed(2) + sizes[2];
+    } else if (val < 100) {
+        return val.toFixed(1) + sizes[2];
+    } else {
+        return val.toFixed() + sizes[2];
+    }
 }
 
 export function bytesToSpeed(bytes?: number | string, fractionDigits?: number) {