Make handling of units more reliable

oasisprotocol · May 2, 2023 · 7796707 · 7796707
1 parent 0513587
commit 7796707
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/app/hooks/useNumberFormatter.ts b/src/app/hooks/useNumberFormatter.ts
@@ -32,11 +32,13 @@ export const useFormatNumber =
         ? number.toFormat(decimalPlaces, wantedFormat)
         : number.toFormat(decimalPlaces, roundingMode, wantedFormat)
     if (unit) {
-      const formattedUnit = number
-        .toNumber()
-        .toLocaleString(undefined, { style: 'unit', unit, unitDisplay: 'long' })
-        .split(' ')
-        .at(-1)
+      const formattedUnit = Intl.NumberFormat(undefined, {
+        style: 'unit',
+        unit,
+        unitDisplay: 'long',
+      })
+        .formatToParts(number.toNumber())
+        .find(p => p.type === 'unit')!.value
       return `${numberString} ${formattedUnit}`
     } else {
       return numberString