Merge pull request #1761 from balancednetwork/fix/fix-app-crash

Hotfix app crash

Author: hetfly

apps/web/src/app/pages/trade/supply/_components/utils.tsx

@@ -1,10 +1,10 @@
-import { Currency, CurrencyAmount, Fraction } from '@balancednetwork/sdk-core';
+import { Currency, CurrencyAmount } from '@balancednetwork/sdk-core';
 import { t } from '@lingui/macro';
 import BigNumber from 'bignumber.js';
 
 import { ZERO } from '@/constants/misc';
 import { PairData } from '@/queries/backendv2';
-import { formatBigNumber } from '@/utils';
+import { formatBigNumber, toFraction } from '@/utils';
 import { formatBalance, formatSymbol, formatValue } from '@/utils/formatter';
 
 export function swapMessage(inputAmount: string, inputCurrency: string, outputAmount: string, outputCurrency: string) {
@@ -59,11 +59,7 @@ export function withdrawMessage(
   return { pendingMessage, successMessage, failureMessage };
 }
 
-export const stakedFraction = stakedLPPercent => {
-  const [stakedNumerator, stakedDenominator] = stakedLPPercent ? stakedLPPercent.toFraction() : [0, 1];
-  const stakedFraction = new Fraction(stakedNumerator.toFixed(), stakedDenominator.toFixed());
-  return stakedFraction;
-};
+export const stakedFraction = (stakedLPPercent?: BigNumber) => toFraction(stakedLPPercent);
 
 export const totalSupply = (withdrawValue: CurrencyAmount<Currency>, suppliedValue?: CurrencyAmount<Currency>) =>
   !!withdrawValue ? suppliedValue?.subtract(withdrawValue) : suppliedValue;

apps/web/src/utils/index.ts

@@ -237,8 +237,17 @@ export function toHex(value?: CurrencyAmount<Currency> | CurrencyAmount<Token>):
   return value ? `0x${value.quotient.toString(16)}` : '0x0';
 }
 
+/** bignumber.js `toFraction()` returns a single BigNumber for NaN/±Infinity (`!xc`), not `[n, d]`. */
+function bignumberNumeratorDenominator(amount: BigNumber): [BigNumber, BigNumber] {
+  if (!amount.isFinite()) {
+    return [new BigNumber(0), new BigNumber(1)];
+  }
+  const frac = amount.toFraction();
+  return Array.isArray(frac) ? frac : [frac, new BigNumber(1)];
+}
+
 export function toCurrencyAmount(token: Token, amount: BigNumber): CurrencyAmount<Token> {
-  const [amountNum, amountDeno] = amount.toFraction();
+  const [amountNum, amountDeno] = bignumberNumeratorDenominator(amount);
   return CurrencyAmount.fromFractionalAmount(
     token,
     amountNum.times(TEN.pow(token.decimals)).toFixed(),
@@ -247,12 +256,12 @@ export function toCurrencyAmount(token: Token, amount: BigNumber): CurrencyAmoun
 }
 
 export function toCurrencyAmountFromRawBN(token: Token, amount: BigNumber): CurrencyAmount<Token> {
-  const [amountNum, amountDeno] = amount.toFraction();
+  const [amountNum, amountDeno] = bignumberNumeratorDenominator(amount);
   return CurrencyAmount.fromFractionalAmount(token, amountNum.toFixed(), amountDeno.toFixed());
 }
 
 export function toFraction(amount: BigNumber | undefined): Fraction {
-  const [amountNum, amountDeno] = amount ? amount.toFraction() : [0, 1];
+  const [amountNum, amountDeno] = amount ? bignumberNumeratorDenominator(amount) : [new BigNumber(0), new BigNumber(1)];
   return new Fraction(amountNum.toFixed(), amountDeno.toFixed());
 }