Merge branch 'release/7.62.1' into release/7.62.1-Changelog

Author: joaoloureirop

CHANGELOG.md

@@ -188,7 +188,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionName "7.62.1"
-        versionCode 3527
+        versionCode 3561
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"

android/app/build.gradle

@@ -20,17 +20,6 @@ import {
 import type { IPerpsProvider } from './types';
 import { HyperLiquidProvider } from './providers/HyperLiquidProvider';
 import { createMockHyperLiquidProvider } from '../__mocks__/providerMocks';
-import Logger from '../../../../util/Logger';
-import { FeatureFlagConfigurationService } from './services/FeatureFlagConfigurationService';
-import { DepositService } from './services/DepositService';
-import { MarketDataService } from './services/MarketDataService';
-import { TradingService } from './services/TradingService';
-import { AccountService } from './services/AccountService';
-import { DataLakeService } from './services/DataLakeService';
-import {
-  ARBITRUM_MAINNET_CHAIN_ID_HEX,
-  USDC_ARBITRUM_MAINNET_ADDRESS,
-} from '../constants/hyperLiquidConfig';
 import Engine from '../../../../core/Engine';
 
 jest.mock('./providers/HyperLiquidProvider');
@@ -102,6 +91,7 @@ jest.mock('../../../../core/Engine', () => {
     getNetworkClientById: jest.fn().mockReturnValue({
       configuration: { chainId: '0x1' },
     }),
+    findNetworkClientIdByChainId: jest.fn().mockReturnValue('mainnet'),
   };
 
   const mockAccountTreeController = {
@@ -116,6 +106,10 @@ jest.mock('../../../../core/Engine', () => {
   const mockTransactionController = {
     estimateGasFee: jest.fn(),
     estimateGas: jest.fn(),
+    addTransaction: jest.fn().mockResolvedValue({
+      result: Promise.resolve('0xmocktxhash'),
+      transactionMeta: { id: 'mock-tx-id', hash: '0xmocktxhash' },
+    }),
   };
 
   const mockAccountTrackerController = {
@@ -286,6 +280,15 @@ jest.mock('./services/FeatureFlagConfigurationService', () => ({
   },
 }));
 
+// Import mocked modules - these imports get the mocked versions
+import Logger from '../../../../util/Logger';
+import { DepositService } from './services/DepositService';
+import { MarketDataService } from './services/MarketDataService';
+import { TradingService } from './services/TradingService';
+import { AccountService } from './services/AccountService';
+import { DataLakeService } from './services/DataLakeService';
+import { FeatureFlagConfigurationService } from './services/FeatureFlagConfigurationService';
+
 /**
  * Testable version of PerpsController that exposes protected methods for testing.
  * This follows the pattern used in RewardsController.test.ts
@@ -2348,50 +2351,9 @@ describe('PerpsController', () => {
         origin: 'metamask',
         type: 'perpsDeposit',
         skipInitialGasEstimate: true,
-        gasFeeToken: undefined,
       });
     });
 
-    it('adds gasFeeToken for Arbitrum USDC deposits', async () => {
-      markControllerAsInitialized();
-      controller.testSetProviders(new Map([['hyperliquid', mockProvider]]));
-
-      Engine.context.AccountTrackerController.state.accountsByChainId = {
-        [ARBITRUM_MAINNET_CHAIN_ID_HEX]: {
-          [mockTransaction.from.toLowerCase()]: {
-            balance: '0x0',
-          },
-        },
-      };
-
-      jest.spyOn(DepositService, 'prepareTransaction').mockResolvedValueOnce({
-        transaction: {
-          ...mockTransaction,
-          to: USDC_ARBITRUM_MAINNET_ADDRESS,
-        },
-        assetChainId: ARBITRUM_MAINNET_CHAIN_ID_HEX,
-        currentDepositId: mockDepositId,
-      });
-
-      await controller.depositWithConfirmation('100');
-
-      expect(
-        Engine.context.TransactionController.addTransaction,
-      ).toHaveBeenCalledWith(
-        {
-          ...mockTransaction,
-          to: USDC_ARBITRUM_MAINNET_ADDRESS,
-        },
-        {
-          networkClientId: mockNetworkClientId,
-          origin: 'metamask',
-          type: 'perpsDeposit',
-          skipInitialGasEstimate: true,
-          gasFeeToken: USDC_ARBITRUM_MAINNET_ADDRESS,
-        },
-      );
-    });
-
     it('throws error when controller not initialized', async () => {
       controller.testSetInitialized(false);
 

app/components/UI/Perps/controllers/PerpsController.test.ts

@@ -13,18 +13,13 @@ import {
   TransactionControllerTransactionSubmittedEvent,
   TransactionType,
 } from '@metamask/transaction-controller';
-import { Hex } from '@metamask/utils';
-import Engine from '../../../../core/Engine';
-import {
-  ARBITRUM_MAINNET_CHAIN_ID_HEX,
-  USDC_ARBITRUM_MAINNET_ADDRESS,
-  USDC_SYMBOL,
-} from '../constants/hyperLiquidConfig';
+import { USDC_SYMBOL } from '../constants/hyperLiquidConfig';
 import {
   LastTransactionResult,
   TransactionStatus,
 } from '../types/transactionTypes';
 import { DevLogger } from '../../../../core/SDKConnect/utils/DevLogger';
+import Engine from '../../../../core/Engine';
 import Logger, { type LoggerErrorOptions } from '../../../../util/Logger';
 import { MetaMetrics, MetaMetricsEvents } from '../../../../core/Analytics';
 import { MetricsEventBuilder } from '../../../../core/Analytics/MetricsEventBuilder';
@@ -1390,23 +1385,20 @@ export class PerpsController extends BaseController<
       const networkClientId =
         NetworkController.findNetworkClientIdByChainId(assetChainId);
 
-      const gasFeeToken =
-        transaction.to &&
-        assetChainId.toLowerCase() === ARBITRUM_MAINNET_CHAIN_ID_HEX &&
-        transaction.to.toLowerCase() ===
-          USDC_ARBITRUM_MAINNET_ADDRESS.toLowerCase()
-          ? (transaction.to as Hex)
-          : undefined;
-
+      if (!networkClientId) {
+        throw new Error(
+          `No network client found for chain ${assetChainId}. Please add the network first.`,
+        );
+      }
       // addTransaction shows the confirmation screen and returns a promise
+      // submit shows the confirmation screen and returns a promise
       // The promise will resolve when transaction completes or reject if cancelled/failed
       const { result, transactionMeta } =
         await TransactionController.addTransaction(transaction, {
           networkClientId,
           origin: 'metamask',
           type: TransactionType.perpsDeposit,
           skipInitialGasEstimate: true,
-          gasFeeToken,
         });
 
       // Store the transaction ID and try to get amount from transaction

app/components/UI/Perps/controllers/PerpsController.ts

@@ -13,7 +13,6 @@ import {
 } from '@metamask/transaction-controller';
 import type { NetworkState } from '@metamask/network-controller';
 import type { InternalAccount } from '@metamask/keyring-internal-api';
-import type { Hex } from '@metamask/utils';
 
 import Engine from '../../../../core/Engine';
 import DevLogger from '../../../../core/SDKConnect/utils/DevLogger';
@@ -22,7 +21,6 @@ import {
   addTransactionBatch,
 } from '../../../../util/transaction-controller';
 import { PolymarketProvider } from '../providers/polymarket/PolymarketProvider';
-import { MATIC_CONTRACTS } from '../providers/polymarket/constants';
 import type { OrderPreview } from '../providers/types';
 import {
   PredictBalance,
@@ -3005,7 +3003,6 @@ describe('PredictController', () => {
       mockPolymarketProvider.prepareDeposit.mockResolvedValue({
         transactions: mockTransactions,
         chainId: mockChainId,
-        gasFeeToken: MATIC_CONTRACTS.collateral as Hex,
       });
 
       (addTransactionBatch as jest.Mock).mockResolvedValue({
@@ -3073,7 +3070,6 @@ describe('PredictController', () => {
           disableUpgrade: true,
           skipInitialGasEstimate: true,
           transactions: mockTransactions,
-          gasFeeToken: MATIC_CONTRACTS.collateral,
         });
       });
     });

app/components/UI/Predict/controllers/PredictController.test.ts

@@ -1863,7 +1863,7 @@ export class PredictController extends BaseController<
         throw new Error('Deposit preparation returned undefined');
       }
 
-      const { transactions, chainId, gasFeeToken } = depositPreparation;
+      const { transactions, chainId } = depositPreparation;
 
       if (!transactions || transactions.length === 0) {
         throw new Error('No transactions returned from deposit preparation');
@@ -1896,7 +1896,6 @@ export class PredictController extends BaseController<
         disableUpgrade: true,
         skipInitialGasEstimate: true,
         transactions,
-        gasFeeToken,
       });
 
       if (!batchResult?.batchId) {

app/components/UI/Predict/controllers/PredictController.ts

@@ -1512,15 +1512,9 @@ export class PolymarketProvider implements PredictProvider {
       type: TransactionType.predictDeposit,
     });
 
-    const chainId = CHAIN_IDS.POLYGON;
-    const isPolygonChain =
-      chainId.toLowerCase() ===
-      numberToHex(POLYGON_MAINNET_CHAIN_ID).toLowerCase();
-
     return {
-      chainId,
+      chainId: CHAIN_IDS.POLYGON,
       transactions,
-      gasFeeToken: isPolygonChain ? (collateral as Hex) : undefined,
     };
   }
 

app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts

@@ -180,7 +180,6 @@ export interface PrepareDepositResponse {
     };
     type?: TransactionType;
   }[];
-  gasFeeToken?: Hex;
 }
 
 export interface GetPredictWalletParams {