Merge branch 'master' into nj/feat/tx-optimization

Author: nelitow

packages/app/CHANGELOG.md

@@ -1,5 +1,15 @@
 # fuels-wallet
 
+## 0.50.2
+
+### Patch Changes
+
+- [#1866](https://github.com/FuelLabs/fuels-wallet/pull/1866) [`4c201edf`](https://github.com/FuelLabs/fuels-wallet/commit/4c201edfd39b57dd0cae37da84a780e66afd99fa) Thanks [@helciofranco](https://github.com/helciofranco)! - fix: improve precision handling for USD conversion with really low rates (e.g. 0.0000007427)
+
+- Updated dependencies []:
+  - @fuel-wallet/connections@0.50.2
+  - @fuels/playwright-utils@0.50.2
+
 ## 0.50.1
 
 ### Patch Changes

packages/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fuels-wallet",
   "private": true,
-  "version": "0.50.1",
+  "version": "0.50.2",
   "type": "module",
   "database": "23",
   "scripts": {

packages/app/src/systems/Core/utils/convertToUsd.test.ts

@@ -1,8 +1,9 @@
-import { DECIMAL_FUEL, bn } from 'fuels';
+import { DECIMAL_FUEL, DECIMAL_WEI, bn } from 'fuels';
 import { convertToUsd } from './convertToUsd';
 
 const MOCK_ETH_RATE = 2742.15;
 const MOCK_FUEL_RATE = 0.01167;
+const MOCK_SCIENTIFIC_RATE = 1e-7;
 const MOCK_REALLY_LOW_RATE = 0.0000007427;
 
 describe('Convert to USD', () => {
@@ -56,6 +57,36 @@ describe('Convert to USD', () => {
     expect(value).toBe(24699091436.38);
   });
 
+  it('should be able to handle large amounts with high precision and regular rate', () => {
+    const { formatted, value } = convertToUsd(
+      bn('123456789999999999900000000000000001'),
+      DECIMAL_WEI,
+      MOCK_ETH_RATE
+    );
+    expect(formatted).toBe('$338,537,036,698,499,999,725.78');
+    expect(value).toBe(338537036698500000000);
+  });
+
+  it('should be able to handle large amounts with high precision decimal and low rate', () => {
+    const { formatted, value } = convertToUsd(
+      bn('123456789999999999900000000000000001'),
+      DECIMAL_WEI,
+      MOCK_REALLY_LOW_RATE
+    );
+    expect(formatted).toBe('$91,691,357,932.99');
+    expect(value).toBe(91691357932.99);
+  });
+
+  it('should be able to handle scientific notation', () => {
+    const { formatted, value } = convertToUsd(
+      bn('10000000'),
+      DECIMAL_WEI,
+      MOCK_SCIENTIFIC_RATE
+    );
+    expect(formatted).toBe('$0.000000000000000001');
+    expect(value).toBe(1e-18);
+  });
+
   it('should be able to handle lower rates', () => {
     const { formatted, value } = convertToUsd(
       bn(100_000_000_000),

packages/app/src/systems/Core/utils/convertToUsd.ts

@@ -10,7 +10,11 @@ function countDecimals(value: number): number {
 
   // Handle scientific notation
   if (str.includes('e-')) {
-    const [, exp] = str.split('e-');
+    const [nonExp, exp] = str.split('e-');
+    if (nonExp.includes('.')) {
+      const [, decimals] = nonExp.split('.');
+      return Number(exp) + decimals.length;
+    }
     return Number(exp);
   }
   return str.split('.')[1]?.length || 0;
@@ -31,11 +35,11 @@ export function convertToUsd(
   const rateDecimals = countDecimals(rate);
   const targetPrecision = getTargetPrecision(rateDecimals, decimals);
 
-  // Convert the rate to a fixed-point integer (truncated to avoid rounding errors).
-  // If the amount has more decimals than the rate, we need to add zeros to the rate.
-  // If not, we don't need to do anything.
-  const ratePrecision = 10 ** targetPrecision;
-  const rateFixed = Math.trunc(rate * ratePrecision);
+  // Get how many decimal places we need to apply to the rate to match the amount precision.
+  // Usually the amount has more decimals than the rate, so we need to add zeros to the rate.
+  const ratePrecision = Math.max(decimals - rateDecimals, 0);
+  const rateUnits = bn.parseUnits(rate.toFixed(rateDecimals), rateDecimals);
+  const rateFixed = rateUnits.mul(bn(10).pow(ratePrecision));
 
   // Get how many decimal places we need to apply to the amount to match the rate precision.
   // Sometimes the rate has more decimals than the amount, so we need to add zeros to the amount.

packages/connections/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @fuel-wallet/connections
 
+## 0.50.2
+
 ## 0.50.1
 
 ## 0.50.0

packages/connections/package.json

@@ -2,7 +2,7 @@
   "name": "@fuel-wallet/connections",
   "private": true,
   "description": "Fuel Wallet Connections for CRX.",
-  "version": "0.50.1",
+  "version": "0.50.2",
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "publishConfig": {

packages/playwright-utils/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @fuels/playwright-utils
 
+## 0.50.2
+
 ## 0.50.1
 
 ## 0.50.0

packages/playwright-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuels/playwright-utils",
-  "version": "0.50.1",
+  "version": "0.50.2",
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "type": "module",

packages/types/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @fuel-wallet/types
 
+## 0.50.2
+
 ## 0.50.1
 
 ## 0.50.0

packages/types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fuel-wallet/types",
   "private": true,
-  "version": "0.50.1",
+  "version": "0.50.2",
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "publishConfig": {