fix(suite-common): resolve formatAmount TODO in try catch block

trezor · Jan 22, 2025 · 33aa804 · 33aa804
1 parent 7bbd580
commit 33aa804
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/packages/suite/src/components/wallet/Fees/Fees.tsx b/packages/suite/src/components/wallet/Fees/Fees.tsx
@@ -90,11 +90,16 @@ export const Fees = <TFieldValues extends FormState>({
     const error = errors.selectedFee;
     const selectedLevel = feeInfo.levels.find(level => level.label === selectedOption)!;
     const transactionInfo = composedLevels?.[selectedOption];
+    const hasTransactionInfo = transactionInfo !== undefined && transactionInfo.type !== 'error';
     // Solana has only `normal` fee level, so we do not display any feeOptions since there is nothing to choose from
     const feeOptions = networkType === 'solana' ? [] : buildFeeOptions(feeInfo.levels);
 
     const shouldAnimateNormalFee = !isCustomLevel;
 
+    const networkAmount = hasTransactionInfo
+        ? formatNetworkAmount(transactionInfo.fee, symbol)
+        : null;
+
     return (
         <Column gap={spacings.xs}>
             <InfoItem
@@ -114,17 +119,17 @@ export const Fees = <TFieldValues extends FormState>({
                     )
                 }
             >
-                {transactionInfo !== undefined && transactionInfo.type !== 'error' && (
+                {networkAmount && (
                     <Row gap={spacings.md} alignItems="baseline">
                         <FormattedCryptoAmount
                             disableHiddenPlaceholder
-                            value={formatNetworkAmount(transactionInfo.fee, symbol)}
+                            value={networkAmount}
                             symbol={symbol}
                         />
                         <Text variant="tertiary" typographyStyle="label">
                             <FiatValue
                                 disableHiddenPlaceholder
-                                amount={formatNetworkAmount(transactionInfo.fee, symbol)}
+                                amount={networkAmount}
                                 symbol={symbol}
                                 showApproximationIndicator
                             />

diff --git a/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx b/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx
@@ -24,7 +24,7 @@ export const TotalSent = () => {
     const selectedFee = getValues().selectedFee || 'normal';
     const transactionInfo = composedLevels ? composedLevels[selectedFee] : undefined;
     const isTokenTransfer = networkType === 'ethereum' && !!getValues('outputs.0.token');
-    const hasTransactionInfo = transactionInfo && transactionInfo.type !== 'error';
+    const hasTransactionInfo = transactionInfo !== undefined && transactionInfo.type !== 'error';
     const tokenInfo = hasTransactionInfo ? transactionInfo.token : undefined;
 
     return (
@@ -53,6 +53,7 @@ export const TotalSent = () => {
                             />
                         )}
                     </InfoItem>
+
                     <InfoItem
                         label={<Translation id={isTokenTransfer ? 'FEE' : 'INCLUDING_FEE'} />}
                         direction="row"

diff --git a/suite-common/wallet-utils/src/__tests__/accountUtils.test.ts b/suite-common/wallet-utils/src/__tests__/accountUtils.test.ts
@@ -101,7 +101,10 @@ describe('account utils', () => {
         expect(formatNetworkAmount('1', 'eth')).toEqual('0.000000000000000001');
         expect(formatNetworkAmount('1', 'btc', true)).toEqual('0.00000001 BTC');
         expect(formatNetworkAmount('1', 'btc', true, true)).toEqual('1 sat');
-        expect(formatNetworkAmount('aaa', 'eth')).toEqual('-1');
+        expect(formatNetworkAmount('', 'btc')).toEqual('0');
+        expect(formatNetworkAmount('', 'btc', true)).toEqual('0 BTC');
+        expect(formatNetworkAmount('', 'btc', true, true)).toEqual('0 sat');
+        expect(() => formatNetworkAmount('aaa', 'eth')).toThrow();
     });
 
     it('format amount to satoshi', () => {

diff --git a/suite-common/wallet-utils/src/accountUtils.ts b/suite-common/wallet-utils/src/accountUtils.ts
@@ -287,16 +287,16 @@ export const stripNetworkAmount = (amount: string, decimals: number) =>
     new BigNumber(amount).toFixed(decimals, 1);
 
 export const formatAmount = (amount: BigNumberValue, decimals: number) => {
-    try {
-        const bAmount = new BigNumber(amount);
-        if (bAmount.isNaN()) {
-            throw new Error('Amount is not a number');
-        }
+    const safeAmount = amount || '0';
+    const bAmount = new BigNumber(safeAmount);
 
-        return bAmount.div(new BigNumber(10).exponentiatedBy(decimals)).toString(10);
-    } catch {
-        return '-1'; // TODO: this is definitely not correct return value
+    if (bAmount.isNaN()) {
+        throw new Error('Amount is not a number');
     }
+
+    const factor = new BigNumber(10).exponentiatedBy(decimals);
+
+    return bAmount.div(factor).toString(10);
 };
 
 export const amountToSmallestUnit = (amount: BigNumberValue, decimals: number) => {
@@ -353,7 +353,7 @@ export const formatNetworkAmount = (
         let formattedSymbol = getNetworkDisplaySymbol(symbol);
 
         if (isSatoshis) {
-            formattedAmount = amount;
+            formattedAmount = amount || '0';
             formattedSymbol = symbol === 'btc' ? 'sat' : `sat ${getNetworkDisplaySymbol(symbol)}`;
         }