fix: consider erc20 decimals for the output token (#21)

* fix: get erc20 decimals from the contract * fix: consider erc20 decimals for the output token * fix: get default decimal from chain config
0xflair · Dec 15, 2022 · c4dd793 · c4dd793
1 parent 795f40f
commit c4dd793
Show file tree

Hide file tree

Showing 15 changed files with 156 additions and 371 deletions.
diff --git a/packages/react/src/core/balance-ramp/resolvers/custom-data.resolver.ts b/packages/react/src/core/balance-ramp/resolvers/custom-data.resolver.ts
@@ -30,7 +30,7 @@ export const balanceRampCustomDataResolve: BalanceResolver = async (
       return {
         idempotencyKey: txUniqueHash,
         outputTokenAddress: requiredAmounts[0]?.token,
-        outputDecimals: 18,
+        outputDecimals: requiredAmounts[0]?.decimals,
         outputAmount: BigNumber.from(requiredAmounts[0]?.value).toString(),
         estimatedGasPrice: estimatedGasPrice?.toString(),
         estimatedMaxFeePerGas: estimatedMaxFeePerGas?.toString(),

diff --git a/packages/react/src/core/balance-ramp/resolvers/native-value.resolver.ts b/packages/react/src/core/balance-ramp/resolvers/native-value.resolver.ts
@@ -32,7 +32,7 @@ export const balanceRampNativeValueResolve: BalanceResolver = async (
     return {
       idempotencyKey: txUniqueHash,
       outputTokenAddress: '0x0000000000000000000000000000000000000000',
-      outputDecimals: 18,
+      outputDecimals: 18, // TODO get from chain info for stupid chains
       outputAmount: txValue.toString(),
       estimatedGasPrice: estimatedGasPrice?.toString(),
       estimatedMaxFeePerGas: estimatedMaxFeePerGas?.toString(),

diff --git a/packages/react/src/core/balance-ramp/services/balance-ramp.client.ts b/packages/react/src/core/balance-ramp/services/balance-ramp.client.ts
@@ -195,7 +195,8 @@ export class BalanceRampClient {
 
       if (
         !message.toLowerCase().includes('insufficient funds') &&
-        !message.toLowerCase().includes('exceeds allowance')
+        !message.toLowerCase().includes('exceeds allowance') &&
+        !message.toLowerCase().includes('exceeds balance')
       ) {
         throw e;
       }
@@ -474,7 +475,7 @@ export class BalanceRampClient {
       outputTokenAddress:
         requiredBalance.outputTokenAddress || ethers.constants.AddressZero,
       outputAmount: requiredBalance.outputAmount?.toString() || '',
-      outputDecimals: requiredBalance.outputDecimals || '18',
+      outputDecimals: requiredBalance.outputDecimals,
       requiresKyc:
         requiredBalance.requiresKyc || this.config.requiresKyc || false,
       inputCurrency:

diff --git a/packages/react/src/core/crypto-currency/components/CryptoAmountField/CryptoAmountField.tsx b/packages/react/src/core/crypto-currency/components/CryptoAmountField/CryptoAmountField.tsx