Merge pull request #11877 from Gamboster/fix/amountScientificNotation…

…Requests Fix: avoid scientific notation in token swap requests
lillithlynn · Sep 15, 2021 · 038dd6a · 038dd6a
2 parents 2633cb6 + 3215edc
commit 038dd6a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/pages/exchange-crypto/exchange-crypto.ts b/src/pages/exchange-crypto/exchange-crypto.ts
@@ -846,16 +846,24 @@ export class ExchangeCryptoPage {
             );
           })[0];
 
+    // workaround to prevent scientific notation
+    const _amount: number = this.amountFrom * 10 ** this.fromToken.decimals;
+    const minUnitAmount: string = _amount.toLocaleString('fullwide', {
+      useGrouping: false,
+      maximumFractionDigits: 0
+    });
+
     const data: any = {
       fromTokenAddress: this.fromToken.address,
       toTokenAddress: this.toToken.address,
-      amount: this.amountFrom * 10 ** this.fromToken.decimals // amount in minimum unit
+      amount: minUnitAmount // amount in minimum unit
     };
 
     if (this.referrerFee) {
       data.fee = this.referrerFee; // taking this fee from BWS. This percentage of fromTokenAddress token amount  will be sent to referrerAddress, the rest will be used as input for a swap | min: 0; max: 3; default: 0;
     }
 
+    this.logger.debug('quoteRequestData: ', data);
     this.oneInchProvider
       .getQuote1inch(data)
       .then(data => {

diff --git a/src/pages/token-swap/token-swap-checkout/token-swap-checkout.ts b/src/pages/token-swap/token-swap-checkout/token-swap-checkout.ts
@@ -133,20 +133,32 @@ export class TokenSwapCheckoutPage {
             // Low values increase chances that transaction will fail, high values increase chances of front running.  Set values in the range from 0 to 50
             const slippage = 0.5;
 
+            let minUnitAmount;
+            if (this.useSendMax && this.fromTokenBalance) {
+              minUnitAmount = this.fromTokenBalance;
+            } else {
+              // workaround to prevent scientific notation
+              const _amount: number =
+                this.amountFrom * 10 ** this.fromToken.decimals;
+              minUnitAmount = _amount.toLocaleString('fullwide', {
+                useGrouping: false,
+                maximumFractionDigits: 0
+              });
+            }
+
             let swapRequestData = {
               fromTokenAddress: this.fromToken.address,
               toTokenAddress: this.toToken.address,
-              amount:
-                this.useSendMax && this.fromTokenBalance
-                  ? this.fromTokenBalance
-                  : this.amountFrom * 10 ** this.fromToken.decimals, // amount in minimum unit
+              amount: minUnitAmount, // amount in minimum unit
               fromAddress, // we can use '0x0000000000000000000000000000000000000000' for testing purposes
               slippage: this.navParams.data.slippage
                 ? this.navParams.data.slippage
                 : slippage,
               destReceiver: toAddress
             };
 
+            this.logger.debug('swapRequestData: ', swapRequestData);
+
             this.oneInchProvider
               .getSwap1inch(this.fromWalletSelected, swapRequestData)
               .then(data => {