fix: added fallback values and fixing instances where minimalInput er…

…ror could be thrown
MetaMask · Sep 4, 2024 · 59a0c9c · 59a0c9c
1 parent f936991
commit 59a0c9c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/app/components/UI/Ramp/Views/SendTransaction/SendTransaction.tsx b/app/components/UI/Ramp/Views/SendTransaction/SendTransaction.tsx
@@ -212,6 +212,7 @@ function SendTransaction() {
     tokenIcon = { uri: orderData.cryptoCurrency.logo };
   }
 
+  const cryptoAmount = (order.cryptoAmount || '0').toString(10);
   return (
     <ScreenLayout>
       <ScreenLayout.Body>
@@ -225,7 +226,7 @@ function SendTransaction() {
                 <Text variant={TextVariant.HeadingMD}>
                   {fromTokenMinimalUnitString(
                     toTokenMinimalUnit(
-                      order.cryptoAmount || '0',
+                      cryptoAmount,
                       orderData.cryptoCurrency.decimals,
                     ).toString(),
                     orderData.cryptoCurrency.decimals,

diff --git a/app/components/UI/Swaps/components/QuotesModal.js b/app/components/UI/Swaps/components/QuotesModal.js
@@ -289,7 +289,9 @@ function QuotesModal({
                     <Text small>{strings('swaps.guaranteed_amount')}</Text>
                     <Text primary>
                       {fromTokenMinimalUnitString(
-                        selectedDetailsQuote.destinationAmount,
+                        (
+                          selectedDetailsQuote.destinationAmount || '0'
+                        ).toString(10),
                         destinationToken.decimals,
                       )}{' '}
                       <Text reset bold>

diff --git a/app/components/Views/confirmations/SendFlow/Amount/index.js b/app/components/Views/confirmations/SendFlow/Amount/index.js
@@ -887,6 +887,9 @@ class Amount extends PureComponent {
       contractExchangeRates,
     } = this.props;
     const { internalPrimaryCurrencyIsCrypto, estimatedTotalGas } = this.state;
+    const tokenBalance = (
+      contractBalances[selectedAsset.address] || '0'
+    ).toString(10);
     let input;
     if (selectedAsset.isETH) {
       const balanceBN = hexToBN(accounts[selectedAddress].balance);
@@ -907,15 +910,12 @@ class Amount extends PureComponent {
         : undefined;
       if (internalPrimaryCurrencyIsCrypto || !exchangeRate) {
         input = fromTokenMinimalUnitString(
-          (contractBalances[selectedAsset.address] || '0').toString(),
+          tokenBalance,
           selectedAsset.decimals,
         );
       } else {
         input = `${balanceToFiatNumber(
-          fromTokenMinimalUnitString(
-            (contractBalances[selectedAsset.address] || '0').toString(),
-            selectedAsset.decimals,
-          ),
+          fromTokenMinimalUnitString(tokenBalance, selectedAsset.decimals),
           conversionRate,
           exchangeRate,
         )}`;