Merge branch 'main' into predict/add-wold-cup

Author: caieu

.yarn/patches/@metamask-bridge-status-controller-npm-71.1.0-6140a0bdf3.patch

@@ -0,0 +1,68 @@
+diff --git a/dist/bridge-status-controller.cjs b/dist/bridge-status-controller.cjs
+index c8dcd1f18fd4395b13ac7945e533ae1a92553950..ced9b35dc96c65ffe7ac59d198f4ab2737ae24ac 100644
+--- a/dist/bridge-status-controller.cjs
++++ b/dist/bridge-status-controller.cjs
+@@ -863,16 +863,27 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
+                 };
+                 // Record in bridge history with actual transaction metadata
+                 try {
+-                    // Create a bridge transaction metadata that includes the original txId
++                    /**
++                      * Patch to fix ondo swap activity tab status issue logged at
++                      * https://consensyssoftware.atlassian.net/browse/BETR-413
++                      *
++                      */
++                    // Create a bridge transaction metadata keyed by orderUid for intent polling
+                     const bridgeTxMetaForHistory = {
+                         ...syntheticMeta,
+                         id: orderUid,
+-                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                     };
+                     // Use orderId as the history key for intent transactions
++                    // IMPORTANT: pass originalTransactionId as a top-level argument so
++                    // `getInitialHistoryItem` reads it. Setting it on `bridgeTxMeta` is a no-op
++                    // because `getInitialHistoryItem` destructures `originalTransactionId` from
++                    // the top-level args, not from `bridgeTxMeta`. Without this, the field
++                    // falls back to `bridgeTxMeta.id` (the orderUid), severing the link between
++                    // the bridge history record and the synthetic TransactionController entry.
+                     const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
+                         accountAddress,
+                         bridgeTxMeta: bridgeTxMetaForHistory,
++                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                         quoteResponse,
+                         slippagePercentage: 0,
+                         isStxEnabled: false,
+diff --git a/dist/bridge-status-controller.mjs b/dist/bridge-status-controller.mjs
+index 3c285a68a35e69b6898f5c811a000324044213c8..9e0b4ef973b167c39e142b60ca28cf32ea89f41a 100644
+--- a/dist/bridge-status-controller.mjs
++++ b/dist/bridge-status-controller.mjs
+@@ -860,16 +860,27 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
+                 };
+                 // Record in bridge history with actual transaction metadata
+                 try {
+-                    // Create a bridge transaction metadata that includes the original txId
++                    /**
++                      * Patch to fix ondo swap activity tab status issue logged at
++                      * https://consensyssoftware.atlassian.net/browse/BETR-413
++                      *
++                      */
++                    // Create a bridge transaction metadata keyed by orderUid for intent polling
+                     const bridgeTxMetaForHistory = {
+                         ...syntheticMeta,
+                         id: orderUid,
+-                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                     };
+                     // Use orderId as the history key for intent transactions
++                    // IMPORTANT: pass originalTransactionId as a top-level argument so
++                    // `getInitialHistoryItem` reads it. Setting it on `bridgeTxMeta` is a no-op
++                    // because `getInitialHistoryItem` destructures `originalTransactionId` from
++                    // the top-level args, not from `bridgeTxMeta`. Without this, the field
++                    // falls back to `bridgeTxMeta.id` (the orderUid), severing the link between
++                    // the bridge history record and the synthetic TransactionController entry.
+                     const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
+                         accountAddress,
+                         bridgeTxMeta: bridgeTxMetaForHistory,
++                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                         quoteResponse,
+                         slippagePercentage: 0,
+                         isStxEnabled: false,

app/components/UI/Card/hooks/useAssetBalances.test.ts

@@ -60,7 +60,7 @@ jest.mock('../../Ramp/Deposit/constants/networks', () => ({
     chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
   },
 }));
-jest.mock('../../../../util/number', () => ({
+jest.mock('../../../../util/number/bigint', () => ({
   balanceToFiatNumber: jest.fn((balance: string, rate: number) => {
     const bal = parseFloat(balance);
     return (bal * rate).toString();

app/components/UI/Card/hooks/useAssetBalances.tsx

@@ -8,7 +8,6 @@ import { useTokensWithBalance } from '../../Bridge/hooks/useTokensWithBalance';
 import { isSolanaChainId } from '@metamask/bridge-controller';
 import { selectCurrentCurrency } from '../../../../selectors/currencyRateController';
 import Engine from '../../../../core/Engine';
-import { balanceToFiatNumber } from '../../../../util/number';
 import { safeFormatChainIdToHex } from '../util/safeFormatChainIdToHex';
 import { TokenI } from '../../Tokens/types';
 import { MarketDataDetails } from '@metamask/assets-controllers';
@@ -17,6 +16,7 @@ import I18n from '../../../../../locales/i18n';
 import { deriveBalanceFromAssetMarketDetails } from '../../Tokens/util';
 import { buildTokenIconUrl } from '../util/buildTokenIconUrl';
 import { CARD_CHAIN_IDS } from '../constants';
+import { balanceToFiatNumber } from '../../../../util/number/bigint';
 
 const extractTrailingCurrencyCode = (value: string): string | undefined => {
   const match = value.trim().match(/([A-Za-z]{3})$/);

app/components/UI/Card/hooks/useCardDelegation.test.ts

@@ -9,7 +9,7 @@ import Logger from '../../../../util/Logger';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
 import { createMockUseAnalyticsHook } from '../../../../util/test/analyticsMock';
-import { toTokenMinimalUnit } from '../../../../util/number';
+import { toTokenMinimalUnit } from '../../../../util/number/bigint';
 import { safeToChecksumAddress } from '../../../../util/address';
 import { ARBITRARY_ALLOWANCE } from '../constants';
 import {
@@ -42,7 +42,7 @@ jest.mock('../../../../util/Logger', () => ({
   error: jest.fn(),
 }));
 
-jest.mock('../../../../util/number', () => ({
+jest.mock('../../../../util/number/bigint', () => ({
   toTokenMinimalUnit: jest.fn(),
 }));
 
@@ -223,7 +223,7 @@ describe('useCardDelegation', () => {
       });
 
     // Setup utility mocks
-    mockToTokenMinimalUnit.mockReturnValue('100000000000000000000');
+    mockToTokenMinimalUnit.mockReturnValue(100000000000000000000n);
     mockSafeToChecksumAddress.mockImplementation(
       (address?: string) => (address as `0x${string}`) || undefined,
     );
@@ -401,7 +401,7 @@ describe('useCardDelegation', () => {
       const mockToken = createMockToken({ decimals: 6 });
       const params = createMockDelegationParams();
 
-      mockToTokenMinimalUnit.mockReturnValue('100000000');
+      mockToTokenMinimalUnit.mockReturnValue(100000000n);
 
       const { result } = renderHook(() => useCardDelegation(mockToken));
 
@@ -1356,7 +1356,7 @@ describe('useCardDelegation', () => {
       };
 
       mockToTokenMinimalUnit.mockReturnValue(
-        '999999999999999999999999999000000000000000000',
+        999999999999999999999999999000000000000000000n,
       );
 
       const { result } = renderHook(() => useCardDelegation(mockToken));

app/components/UI/Card/hooks/useCardDelegation.ts

@@ -20,7 +20,7 @@ import { useAnalytics } from '../../../hooks/useAnalytics/useAnalytics';
 import { useEnsureCardNetworkExists } from './useEnsureCardNetworkExists';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { ARBITRARY_ALLOWANCE } from '../constants';
-import { toTokenMinimalUnit } from '../../../../util/number';
+import { toTokenMinimalUnit } from '../../../../util/number/bigint';
 import AppConstants from '../../../../core/AppConstants';
 import { safeToChecksumAddress } from '../../../../util/address';
 import { handleSnapRequest } from '../../../../core/Snaps/utils';

app/components/UI/Card/hooks/useNeedsGasFaucet.ts

@@ -4,13 +4,12 @@ import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller';
 import { isNonEvmChainId, isSolanaChainId } from '@metamask/bridge-controller';
 import { Hex, CaipChainId } from '@metamask/utils';
 import { BigNumber } from 'bignumber.js';
-import BN from 'bnjs4';
 import Engine from '../../../../core/Engine';
 import { useAccountNativeBalance } from '../../../Views/confirmations/hooks/useAccountNativeBalance';
 import { selectMinSolBalance } from '../../../../selectors/bridgeController';
 import { selectSelectedInternalAccountFormattedAddress } from '../../../../selectors/accountsController';
 import { decGWEIToHexWEI } from '../../../../util/conversions';
-import { hexToBN } from '../../../../util/number';
+import { hexToBigInt } from '../../../../util/number/bigint';
 import { safeFormatChainIdToHex } from '../util/safeFormatChainIdToHex';
 import { CardFundingToken } from '../types';
 import { useLatestBalance } from '../../Bridge/hooks/useLatestBalance';
@@ -93,7 +92,7 @@ export const useNeedsGasFaucet = (
   /**
    * Estimate gas fee for EVM chains
    */
-  const estimateEvmGasFee = useCallback(async (): Promise<BN> => {
+  const estimateEvmGasFee = useCallback(async (): Promise<bigint> => {
     try {
       const { GasFeeController } = Engine.context;
       const result = await GasFeeController.fetchGasFeeEstimates();
@@ -120,16 +119,16 @@ export const useNeedsGasFaucet = (
           break;
       }
 
-      const weiGasPrice = hexToBN(decGWEIToHexWEI(gasPrice));
-      return weiGasPrice.muln(gasLimitWithBuffer);
+      const weiGasPrice = hexToBigInt(decGWEIToHexWEI(gasPrice) as string);
+      return weiGasPrice * BigInt(gasLimitWithBuffer);
     } catch (err) {
       // Return a conservative fallback estimate if gas estimation fails
       // Assume ~20 Gwei gas price as fallback
-      const fallbackGasPrice = new BN('20000000000'); // 20 Gwei in Wei
+      const fallbackGasPrice = 20000000000n; // 20 Gwei in Wei
       const gasLimitWithBuffer = Math.ceil(
         ERC20_APPROVE_GAS_LIMIT * GAS_LIMIT_BUFFER,
       );
-      return fallbackGasPrice.muln(gasLimitWithBuffer);
+      return fallbackGasPrice * BigInt(gasLimitWithBuffer);
     }
   }, []);
 
@@ -144,10 +143,10 @@ export const useNeedsGasFaucet = (
 
     try {
       const estimatedGasFee = await estimateEvmGasFee();
-      const balanceBN = new BN(balanceWeiInHex.replace('0x', ''), 'hex');
+      const balance = hexToBigInt(balanceWeiInHex);
 
       // User needs faucet if balance is less than estimated gas fee
-      return balanceBN.lt(estimatedGasFee);
+      return balance < estimatedGasFee;
     } catch (err) {
       console.error('Error checking EVM faucet need:', err);
       // Assume needs faucet on error

app/components/UI/Earn/hooks/useTronClaimUnstakedTrx.test.ts

@@ -29,8 +29,6 @@ describe('useTronClaimUnstakedTrx', () => {
       name: 'Tron Account',
       snap: {
         id: 'npm:@metamask/tron-wallet-snap',
-        name: 'Tron Wallet Snap',
-        enabled: true,
       },
       importTime: 0,
       keyring: { type: 'snap' },