try to hack away toLocaleString being undefined

MakePrisms · Nov 26, 2024 · f1f0eb0 · f1f0eb0
1 parent 6d68b16
commit f1f0eb0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/components/utility/amounts/Amount.tsx b/src/components/utility/amounts/Amount.tsx
@@ -36,6 +36,10 @@ const Amount: React.FC<AmountProps> = ({
          const decimalParts = val.split('.');
 
          if (!hasDecimal) {
+            /* Ensure numericValue is defined before calling toLocaleString */
+            if (typeof numericValue !== 'number' || isNaN(numericValue)) {
+               return { formattedValue: '0', greyZeros: '' };
+            }
             return { formattedValue: numericValue.toLocaleString('en-US'), greyZeros: '' };
          }
 
@@ -49,8 +53,10 @@ const Amount: React.FC<AmountProps> = ({
       }
 
       const val = stringValue.startsWith('.') ? `0${stringValue}` : stringValue;
+      /* Ensure val is a valid number before calling toLocaleString */
+      const num = Number(val);
       return {
-         formattedValue: val === '' ? '0' : Number(val).toLocaleString('en-US'),
+         formattedValue: val === '' || isNaN(num) ? '0' : num.toLocaleString('en-US'),
          greyZeros: '',
       };
    }, [value, unit, isDollarAmount]);

diff --git a/src/hooks/boardwalk/useBalance.tsx b/src/hooks/boardwalk/useBalance.tsx
@@ -74,11 +74,11 @@ export const BalanceProvider: React.FC<React.PropsWithChildren> = ({ children })
       if (usdBalance === null || satBalance === null) return '';
 
       if (!showFxValue) {
-         return activeUnit === 'usd' ? formatUsdBalance(usdBalance) : satBalance.toLocaleString();
+         return activeUnit === 'usd' ? formatUsdBalance(usdBalance) : satBalance?.toLocaleString();
       } else {
          if (activeUnit === 'usd') {
             const sats = await unitToSats(usdBalance / 100, 'usd');
-            return sats.toLocaleString();
+            return sats?.toLocaleString();
          } else {
             const usd = await satsToUnit(satBalance, 'usd');
             return formatUsdBalance(usd);

diff --git a/src/utils/formatting.ts b/src/utils/formatting.ts
@@ -52,7 +52,7 @@ export const formatCents = (cents: number, decimals = true) => {
    return `$${(cents / 100).toFixed(decimals ? 2 : 0)}`;
 };
 
-export const formatSats = (sats: number) => `${sats.toLocaleString()}₿`;
+export const formatSats = (sats: number) => `${sats?.toLocaleString()}₿`;
 
 export const shortenString = (str: string, maxLength: number) => {
    if (str.length <= maxLength) {