From 9e0949c2fb35d08d532a2c7bb323809cb6d7aec9 Mon Sep 17 00:00:00 2001
From: OleksiiM <omblinda@gmail.com>
Date: Thu, 9 Jan 2025 14:03:05 +0000
Subject: [PATCH] Fix Number <-> BigNumber consistency

---
 .../src/families/aptos/getFeesForTransaction.ts      | 12 ++++++------
 libs/ledger-live-common/src/families/aptos/logic.ts  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libs/ledger-live-common/src/families/aptos/getFeesForTransaction.ts b/libs/ledger-live-common/src/families/aptos/getFeesForTransaction.ts
index 0443efd29672..fe17c450b537 100644
--- a/libs/ledger-live-common/src/families/aptos/getFeesForTransaction.ts
+++ b/libs/ledger-live-common/src/families/aptos/getFeesForTransaction.ts
@@ -17,7 +17,7 @@ type IGetEstimatedGasReturnType = {
 };
 
 const CACHE = {
-  amount: BigNumber(0),
+  amount: new BigNumber(0),
   estimate: Promise.resolve({
     fees: new BigNumber(0),
     estimate: {
@@ -34,7 +34,7 @@ export const getFee = async (
   aptosClient: AptosAPI,
 ): Promise<IGetEstimatedGasReturnType> => {
   const res = {
-    fees: new BigNumber(DEFAULT_GAS * DEFAULT_GAS_PRICE),
+    fees: new BigNumber(DEFAULT_GAS).multipliedBy(DEFAULT_GAS_PRICE),
     estimate: {
       maxGasAmount: DEFAULT_GAS.toString(),
       gasUnitPrice: DEFAULT_GAS_PRICE.toString(),
@@ -55,10 +55,10 @@ export const getFee = async (
       const simulation = await aptosClient.simulateTransaction(publicKeyEd, tx);
       const completedTx = simulation[0];
 
-      gasLimit = Number(completedTx.gas_used) * ESTIMATE_GAS_MUL;
-      gasPrice = Number(completedTx.gas_unit_price);
+      gasLimit = new BigNumber(completedTx.gas_used).multipliedBy(ESTIMATE_GAS_MUL);
+      gasPrice = new BigNumber(completedTx.gas_unit_price);
 
-      const expectedGas = BigNumber(gasPrice * gasLimit);
+      const expectedGas = gasPrice.multipliedBy(gasLimit);
 
       const isUnderMaxSpendable = transaction.amount
         .plus(expectedGas)
@@ -75,7 +75,7 @@ export const getFee = async (
           }
         }
       }
-      res.fees = BigNumber(gasPrice).multipliedBy(BigNumber(gasLimit));
+      res.fees = expectedGas;
       res.estimate.maxGasAmount = gasLimit.toString();
       res.estimate.gasUnitPrice = completedTx.gas_unit_price;
     } catch (error: any) {
diff --git a/libs/ledger-live-common/src/families/aptos/logic.ts b/libs/ledger-live-common/src/families/aptos/logic.ts
index bd1ed2c41ad8..307c661031e6 100644
--- a/libs/ledger-live-common/src/families/aptos/logic.ts
+++ b/libs/ledger-live-common/src/families/aptos/logic.ts
@@ -18,9 +18,9 @@ import {
 } from "./constants";
 import type { AptosTransaction, TransactionOptions } from "./types";
 
-export const DEFAULT_GAS = 200;
-export const DEFAULT_GAS_PRICE = 100;
-export const ESTIMATE_GAS_MUL = 1.0; // define buffer for gas estimation change here, if needed
+export const DEFAULT_GAS = new BigNumber(200);
+export const DEFAULT_GAS_PRICE = new BigNumber(100);
+export const ESTIMATE_GAS_MUL = new BigNumber(1.0); // define buffer for gas estimation change here, if needed
 
 const CLEAN_HEX_REGEXP = /^0x0*|^0+/;