Merge branch 'main' into predict/clob-v2-cleanup-core

Author: ghgoodreau

.eslintrc.js

@@ -1,4 +1,136 @@
 /* eslint-disable import-x/no-commonjs */
+
+/**
+ * Files still allowed to import deprecated `app/util/number/index.js` during
+ * the BN.js → BigInt migration. Kept in one array so the default import-fence
+ * override can exclude them while the follow-up override below re-applies only
+ * the expo-haptics / perps restrictions (see comments on those overrides).
+ */
+const utilNumberImportBurndownFiles = [
+  'app/component-library/components-temp/CustomSpendCap/CustomInput/CustomInput.tsx',
+  'app/component-library/components-temp/CustomSpendCap/CustomSpendCap.tsx',
+  'app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx',
+  'app/component-library/components-temp/Price/AggregatedPercentage/utils.ts',
+  'app/components/UI/AccountInfoCard/index.js',
+  'app/components/UI/AssetOverview/Price/Price.advanced.tsx',
+  'app/components/UI/AssetOverview/Price/Price.legacy.tsx',
+  'app/components/UI/AssetOverview/utils/marketDetails.ts',
+  'app/components/UI/Bridge/components/QuoteSelectorView/QuoteRow.tsx',
+  'app/components/UI/Bridge/components/QuoteSelectorView/index.tsx',
+  'app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts',
+  'app/components/UI/Bridge/hooks/useFormattedBalanceWithThreshold/index.ts',
+  'app/components/UI/Bridge/hooks/useHasSufficientGas/index.ts',
+  'app/components/UI/Bridge/hooks/useInsufficientBalance/index.ts',
+  'app/components/UI/Bridge/hooks/useTokenBalanceInUsd/index.ts',
+  'app/components/UI/Bridge/hooks/useTokensWithBalance/index.ts',
+  'app/components/UI/Bridge/utils/exchange-rates.ts',
+  'app/components/UI/Bridge/utils/formatNetworkFee.test.ts',
+  'app/components/UI/Bridge/utils/formatNetworkFee.ts',
+  'app/components/UI/Bridge/utils/transaction-history.ts',
+  'app/components/UI/Card/hooks/useAssetBalances.tsx',
+  'app/components/UI/Card/hooks/useCardDelegation.test.ts',
+  'app/components/UI/Card/hooks/useCardDelegation.ts',
+  'app/components/UI/Card/hooks/useNeedsGasFaucet.ts',
+  'app/components/UI/Card/sdk/CardSDK.ts',
+  'app/components/UI/CollectibleOverview/index.js',
+  'app/components/UI/Earn/Views/EarnInputView/EarnInputView.test.tsx',
+  'app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/components/Erc20TokenHero/index.tsx',
+  'app/components/UI/Earn/Views/EarnLendingDepositConfirmationView/index.tsx',
+  'app/components/UI/Earn/Views/EarnLendingWithdrawalConfirmationView/index.tsx',
+  'app/components/UI/Earn/Views/EarnWithdrawInputView/EarnWithdrawInputView.tsx',
+  'app/components/UI/Earn/components/EarnLendingBalance/index.tsx',
+  'app/components/UI/Earn/components/Earnings/EarningsHistory/EarningsHistory.utils.ts',
+  'app/components/UI/Earn/components/InputDisplay/InputDisplay.test.tsx',
+  'app/components/UI/Earn/hooks/useEarnGasFee.ts',
+  'app/components/UI/Earn/hooks/useEarnInput.ts',
+  'app/components/UI/Earn/hooks/useEarnings.ts',
+  'app/components/UI/Earn/hooks/useInput.ts',
+  'app/components/UI/Earn/hooks/useMultichainInputHandlers.ts',
+  'app/components/UI/Earn/hooks/useMusdBalance.ts',
+  'app/components/UI/Earn/hooks/useMusdCtaVisibility.ts',
+  'app/components/UI/Earn/utils/number.ts',
+  'app/components/UI/Earn/utils/token/index.ts',
+  'app/components/UI/Earn/utils/tron.ts',
+  'app/components/UI/HardwareWallet/AccountDetails/index.tsx',
+  'app/components/UI/Money/constants/activityStyles.ts',
+  'app/components/UI/Money/hooks/useMoneyAccountBalance.ts',
+  'app/components/UI/Money/utils/moneyActivityFiat.ts',
+  'app/components/UI/MultichainBridgeTransactionListItem/MultichainBridgeTransactionListItem.tsx',
+  'app/components/UI/Notification/TransactionNotification/index.js',
+  'app/components/UI/Ramp/Aggregator/Views/BuildQuote/BuildQuote.test.tsx',
+  'app/components/UI/Ramp/Aggregator/Views/BuildQuote/BuildQuote.tsx',
+  'app/components/UI/Ramp/Aggregator/Views/OrdersList/OrdersList.tsx',
+  'app/components/UI/Ramp/Aggregator/Views/SendTransaction/SendTransaction.tsx',
+  'app/components/UI/Ramp/Aggregator/components/OrderDetails.tsx',
+  'app/components/UI/Ramp/Aggregator/components/OrderListItem/OrderListItem.tsx',
+  'app/components/UI/Ramp/Aggregator/components/Quote/Quote.tsx',
+  'app/components/UI/Ramp/Aggregator/hooks/useBalance.test.ts',
+  'app/components/UI/Ramp/Aggregator/hooks/useBalance.ts',
+  'app/components/UI/Ramp/Aggregator/hooks/useERC20GasLimitEstimation.ts',
+  'app/components/UI/Ramp/Aggregator/hooks/useHandleSuccessfulOrder.ts',
+  'app/components/UI/Ramp/Aggregator/hooks/useIntentAmount.ts',
+  'app/components/UI/Ramp/Aggregator/utils/index.ts',
+  'app/components/UI/Ramp/Deposit/utils/index.ts',
+  'app/components/UI/Ramp/utils/getOrderAmount.ts',
+  'app/components/UI/Ramp/utils/v2OrderToast.ts',
+  'app/components/UI/Stake/components/StakingBalance/StakingBanners/ClaimBanner/ClaimBanner.tsx',
+  'app/components/UI/Stake/components/StakingConfirmation/TokenValueStack/TokenValueStack.test.tsx',
+  'app/components/UI/Stake/components/StakingConfirmation/TokenValueStack/TokenValueStack.tsx',
+  'app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.test.tsx',
+  'app/components/UI/Stake/components/StakingConfirmation/YouReceiveCard/YouReceiveCard.tsx',
+  'app/components/UI/Stake/hooks/useBalance.ts',
+  'app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.test.ts',
+  'app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts',
+  'app/components/UI/TransactionElement/utils-gas.js',
+  'app/components/UI/TransactionElement/utils.js',
+  'app/components/UI/UrlAutocomplete/Result.tsx',
+  'app/components/Views/AssetDetails/index.tsx',
+  'app/components/Views/DetectedTokens/components/Token.tsx',
+  'app/components/Views/GasEducationCarousel/index.js',
+  'app/components/Views/NetworksManagement/NetworkDetailsView/hooks/useNetworkValidation.ts',
+  'app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyBottomSheet.ts',
+  'app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyQuotes.ts',
+  'app/components/Views/SocialLeaderboard/utils/formatters.ts',
+  'app/components/Views/UnifiedTransactionsView/useUnifiedTxActions.test.ts',
+  'app/components/Views/confirmations/components/gas/max-base-fee-input/max-base-fee-input.tsx',
+  'app/components/Views/confirmations/components/gas/priority-fee-input/priority-fee-input.tsx',
+  'app/components/Views/confirmations/components/info/typed-sign-v3v4/simulation/components/native-value-display/native-value-display.tsx',
+  'app/components/Views/confirmations/components/info/typed-sign-v3v4/simulation/components/value-display/value-display.tsx',
+  'app/components/Views/confirmations/components/transactions/custom-amount/custom-amount.tsx',
+  'app/components/Views/confirmations/context/send-context/utils.ts',
+  'app/components/Views/confirmations/external/staking/hooks/useStakingDetails.ts',
+  'app/components/Views/confirmations/hooks/earn/useCustomAmount.tsx',
+  'app/components/Views/confirmations/hooks/gas/useCancelSpeedupGas/useCancelSpeedupGas.ts',
+  'app/components/Views/confirmations/hooks/send/useBalance.ts',
+  'app/components/Views/confirmations/hooks/send/useCurrencyConversions.ts',
+  'app/components/Views/confirmations/hooks/send/usePercentageAmount.ts',
+  'app/components/Views/confirmations/hooks/useTokenAmount.ts',
+  'app/components/Views/confirmations/legacy/components/CustomNonceModal/index.js',
+  'app/components/Views/confirmations/legacy/components/WatchAssetRequest/index.js',
+  'app/components/Views/confirmations/utils/send.ts',
+  'app/components/hooks/useAddressBalance/useAddressBalance.ts',
+  'app/components/hooks/useGetFormattedTokensPerChain.tsx',
+  'app/components/hooks/useGetTotalFiatBalanceCrossChains.tsx',
+  'app/core/Engine/Engine.ts',
+  'app/core/Engine/controllers/gas-fee-controller/gas-fee-controller-init.test.ts',
+  'app/core/GasPolling/GasPolling.ts',
+  'app/core/NotificationManager.js',
+  'app/selectors/assets/assets-list.ts',
+  'app/selectors/earnController/earn/index.ts',
+  'app/selectors/multichain/evm.ts',
+  // `app/util/**` importers of `./number` or `../number` (resolves to `index.js`);
+  // same burndown contract as feature files — remove when migrated to
+  // `../number/bigint` (or `./number/bigint` from `app/util/`).
+  'app/util/confirm-tx.js',
+  'app/util/conversions.js',
+  'app/util/confirmation/gas.ts',
+  'app/util/confirmation/transactions.ts',
+  'app/util/custom-gas/index.js',
+  'app/util/networks/index.js',
+  'app/util/transactions/index.js',
+  'app/util/transactions/index.test.ts',
+];
+
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
@@ -42,6 +174,11 @@ module.exports = {
           'interface',
         ],
         '@typescript-eslint/no-explicit-any': 'error',
+        // Surface JSDoc @deprecated annotations at every use-site (warn for now;
+        // ratchet to 'error' once the BN.js → BigInt migration is complete).
+        // Pairs with the `import-x/no-restricted-paths` fence on
+        // `app/util/number/index.js` in the app import-fence override below.
+        '@typescript-eslint/no-deprecated': 'warn',
         // Under discussion
         '@typescript-eslint/no-duplicate-enum-values': 'off',
         '@typescript-eslint/no-shadow': [
@@ -466,11 +603,78 @@ module.exports = {
       },
     },
     {
-      files: ['app/**/*.{ts,tsx}'],
+      // Default app import fences (expo-haptics, perps, deprecated util/number/index.js).
+      // `excludedFiles` applies to the whole override — listing burn-down paths
+      // here would incorrectly skip expo/perps for those files, so burn-down is
+      // excluded from *this* block only and picked up by the next override.
+      files: ['app/**/*.{ts,tsx,js,jsx}'],
       excludedFiles: [
-        'app/controllers/perps/**/*.{ts,tsx}',
-        'app/util/haptics/**/*.{ts,tsx}',
+        // Perps controller is exempt from importing itself.
+        'app/controllers/perps/**/*.{ts,tsx,js,jsx}',
+        // Designated expo-haptics wrapper — only this tree may import expo-haptics.
+        'app/util/haptics/**/*.{ts,tsx,js,jsx}',
+        // Legacy number utils + parity tests.
+        'app/util/number/**',
+        // BN.js → BigInt burn-down: still allowed util/number imports; see next override.
+        ...utilNumberImportBurndownFiles,
       ],
+      rules: {
+        'no-restricted-imports': [
+          'error',
+          {
+            paths: [
+              {
+                name: 'expo-haptics',
+                message:
+                  'Import from app/util/haptics instead of expo-haptics directly.',
+              },
+            ],
+            patterns: [
+              {
+                group: ['**/controllers/perps', '**/controllers/perps/**'],
+                message:
+                  'Use @metamask/perps-controller instead of relative imports into app/controllers/perps/.',
+              },
+              {
+                group: ['expo-haptics/*'],
+                message:
+                  'Import from app/util/haptics instead of expo-haptics directly.',
+              },
+            ],
+          },
+        ],
+        // Fences the deprecated `app/util/number/index.js` module. We use
+        // `import-x/no-restricted-paths` (not `no-restricted-imports`) because
+        // it resolves each import to its absolute file, which means a single
+        // entry catches every spelling that lands on `index.js` — bare
+        // (`from '../util/number'`), explicit (`'../util/number/index'`),
+        // and explicit-with-extension. Sibling modules like `bigint`,
+        // `bignumber`, and `subscriptNotation` resolve to different files
+        // and are unaffected, so no negation list is needed. Inherits the
+        // burn-down allowlist from this override's `excludedFiles`; the
+        // burn-down override below intentionally does not re-declare this
+        // rule, so allow-listed files remain exempt.
+        'import-x/no-restricted-paths': [
+          'error',
+          {
+            zones: [
+              {
+                target: 'app',
+                from: 'app/util/number/index.js',
+                message:
+                  'app/util/number/index.js is deprecated. Import the BigInt-based replacement from app/util/number/bigint instead. See app/util/number/bigint-migration-reference.test.ts for migration patterns.',
+              },
+            ],
+          },
+        ],
+      },
+    },
+    {
+      // Re-apply expo-haptics + perps only for burn-down files. A second
+      // override is required because ESLint replaces `no-restricted-imports`
+      // when the same rule is set again — we cannot use one override with only
+      // `excludedFiles` for util/number without silently dropping other fences.
+      files: utilNumberImportBurndownFiles,
       rules: {
         'no-restricted-imports': [
           'error',

.github/CODEOWNERS

@@ -43,6 +43,10 @@ app/core/Engine/README.md                                   @MetaMask/mobile-pla
 app/core/Engine/types.ts                                    @MetaMask/mobile-platform
 app/core/Engine/controllers/remote-feature-flag-controller/ @MetaMask/mobile-platform
 app/core/DeeplinkManager                                    @MetaMask/mobile-platform
+# Deprecated BN.js helpers. Gated to discourage adding new exports; consumers
+# should migrate to app/util/number/bigint. See .eslintrc.js for the import
+# fence and bigint-migration-reference.test.ts for migration patterns.
+app/util/number/index.js                                    @MetaMask/mobile-platform
 scripts/build.sh                                            @MetaMask/mobile-platform
 fingerprint.config.js                                       @MetaMask/mobile-platform
 builds.yml                                                  @MetaMask/mobile-platform

.github/rules/filter-rules.yml

@@ -24,6 +24,10 @@ low_level_test_files: &low_level_test_files
   - '**/*.stories.*'
   - '**/*.snap'
 
+# LOCALE TRANSLATION FILES
+locale_translation_files: &locale_translation_files
+  - 'locales/languages/**/*.json'
+
 # CONFIG FILES
 config_files: &config_files
   - '.eslint*'
@@ -47,6 +51,7 @@ e2e_ignorable:
   - *documentation_files
   - *asset_files
   - *low_level_test_files
+  - *locale_translation_files
   - *config_files
   - *ci_files
 
@@ -74,6 +79,7 @@ android_or_ignorable:
   - *documentation_files
   - *asset_files
   - *low_level_test_files
+  - *locale_translation_files
   - *config_files
   - *ci_files
 
@@ -82,6 +88,7 @@ ios_or_ignorable:
   - *documentation_files
   - *asset_files
   - *low_level_test_files
+  - *locale_translation_files
   - *config_files
   - *ci_files
 

.github/workflows/build.yml

@@ -419,20 +419,14 @@ jobs:
         run: node scripts/rename-artifacts.js ${{ matrix.platform }}
 
       # Upload build artifacts (only if build succeeded)
-      # ios_simulator_path is set by scripts/rename-artifacts.js (staged under ios-simulator-upload/
-      # in CI so upload-artifact uploads a .zip file, not a .app directory).
       - name: Upload iOS simulator app
-        if: success() && matrix.platform == 'ios' && env.IS_SIM_BUILD == 'true'
+        if: matrix.platform == 'ios' && env.IS_SIM_BUILD == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: ios-app-${{ inputs.build_name }}
           path: ${{ steps.rename.outputs.ios_simulator_path }}
           if-no-files-found: error
 
-      - name: Remove iOS simulator staging directory
-        if: success() && matrix.platform == 'ios' && env.IS_SIM_BUILD == 'true'
-        run: rm -rf ios-simulator-upload
-
       - name: Upload iOS IPA
         if: matrix.platform == 'ios' && (env.IS_SIM_BUILD != 'true' || env.IS_DEVICE_BUILD == 'true')
         uses: actions/upload-artifact@v4

README.md

@@ -15,6 +15,7 @@ To learn how to contribute to the MetaMask codebase, visit our [Contributor Docs
 ## Documentation
 
 - [Architecture](./docs/readme/architecture.md)
+- [BigInt number migration](./docs/bigint-migration-guide.md) (deprecated `app/util/number/index.js` burndown and ESLint allowlist)
 - [Expo Development Environment Setup](./docs/readme/expo-environment.md)
 - [Native Development Environment Setup](./docs/readme/environment.md)
 - [Build Troubleshooting](./docs/readme/troubleshooting.md)

app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.test.tsx

@@ -277,6 +277,18 @@ describe('PerpsWithdrawView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     (useNavigation as jest.Mock).mockReturnValue(mockNavigation);
+    const mockUsePerpsLiveAccount =
+      jest.requireMock('../../hooks/stream').usePerpsLiveAccount;
+    mockUsePerpsLiveAccount.mockReturnValue({
+      account: {
+        availableBalance: '1000.00',
+        marginUsed: '0.00',
+        unrealizedPnl: '0.00',
+        returnOnEquity: '0.00',
+        totalBalance: '1000.00',
+      },
+      isInitialLoading: false,
+    });
   });
 
   describe('Component Rendering', () => {
@@ -296,6 +308,32 @@ describe('PerpsWithdrawView', () => {
       ).toBeOnTheScreen();
     });
 
+    it('uses availableToTradeBalance for the displayed Unified Account balance', () => {
+      const mockUsePerpsLiveAccount =
+        jest.requireMock('../../hooks/stream').usePerpsLiveAccount;
+      mockUsePerpsLiveAccount.mockReturnValue({
+        account: {
+          availableBalance: '0.00',
+          availableToTradeBalance: '2500.00',
+          marginUsed: '0.00',
+          unrealizedPnl: '0.00',
+          returnOnEquity: '0.00',
+          totalBalance: '2500.00',
+        },
+        isInitialLoading: false,
+      });
+
+      renderWithProviders(<PerpsWithdrawView />);
+
+      expect(
+        screen.getByText(
+          strings('perps.withdrawal.available_balance', {
+            amount: '$2,500',
+          }),
+        ),
+      ).toBeOnTheScreen();
+    });
+
     it('renders percentage buttons when focused', () => {
       renderWithProviders(<PerpsWithdrawView />);
 

app/components/UI/Perps/Views/PerpsWithdrawView/PerpsWithdrawView.tsx

@@ -106,11 +106,16 @@ const PerpsWithdrawView: React.FC = () => {
   // Get withdrawal tokens from hook
   const { destToken } = useWithdrawTokens();
 
-  // Truncate to 2 decimals so the user can withdraw exactly what they see.
+  // Release-branch bridge for Unified Account: availableToTradeBalance includes
+  // collateral HL can use in target mode. The full balance contract will replace
+  // this with an explicit withdrawableBalance field. Truncate so users can
+  // withdraw exactly the amount they see.
   const availableBalance = useMemo(() => {
-    if (!account?.availableBalance) return 0;
-    return truncateToTwoDecimals(parseCurrencyString(account.availableBalance));
-  }, [account?.availableBalance]);
+    const balance =
+      account?.availableToTradeBalance ?? account?.availableBalance;
+    if (!balance) return 0;
+    return truncateToTwoDecimals(parseCurrencyString(balance));
+  }, [account?.availableBalance, account?.availableToTradeBalance]);
 
   const formattedBalance = useMemo(
     () => formatPerpsFiat(availableBalance),
@@ -152,7 +157,7 @@ const PerpsWithdrawView: React.FC = () => {
   usePerpsMeasurement({
     traceName: TraceName.PerpsWithdrawView,
     conditions: [
-      !!account?.availableBalance,
+      !!(account?.availableToTradeBalance ?? account?.availableBalance),
       !!destToken,
       availableBalance !== undefined,
     ],