diff --git a/.js.env.example b/.js.env.example
index a6a75452422f..ec8e61873c74 100644
--- a/.js.env.example
+++ b/.js.env.example
@@ -197,6 +197,9 @@ export MM_PERPS_MYX_BROKER_ADDRESS_TESTNET=""
 export MM_PERPS_MYX_APP_ID_MAINNET=""
 export MM_PERPS_MYX_API_SECRET_MAINNET=""
 export MM_PERPS_MYX_BROKER_ADDRESS_MAINNET=""
+# HyperLiquid builder fee wallet addresses (empty = uses hardcoded defaults)
+export MM_PERPS_HL_BUILDER_ADDRESS_TESTNET=""
+export MM_PERPS_HL_BUILDER_ADDRESS_MAINNET=""
 # HIP-3 Feature Flags (remote override with local fallback)
 export MM_PERPS_HIP3_ENABLED="true"
 export MM_PERPS_HIP3_ALLOWLIST_MARKETS=""  # Allowlist: Empty = enable all markets. Examples: "xyz:XYZ100,xyz:TSLA" or "xyz:*,abc:TSLA"
diff --git a/app/components/UI/Perps/Perps.testIds.ts b/app/components/UI/Perps/Perps.testIds.ts
index a7c63e8d443b..9740c90ea71f 100644
--- a/app/components/UI/Perps/Perps.testIds.ts
+++ b/app/components/UI/Perps/Perps.testIds.ts
@@ -417,6 +417,15 @@ export const PerpsTransactionSelectorsIDs = {
   FUNDING_TRANSACTION_VIEW: 'perps-funding-transaction-view',
   ORDER_TRANSACTION_VIEW: 'perps-order-transaction-view',
 
+  // FlashList
+  FLASH_LIST: 'perps-transactions-flash-list',
+
+  // Fill tags
+  FILL_TAG_TAKE_PROFIT: 'perps-fill-tag-take-profit',
+  FILL_TAG_STOP_LOSS: 'perps-fill-tag-stop-loss',
+  FILL_TAG_LIQUIDATED: 'perps-fill-tag-liquidated',
+  FILL_TAG_ADL: 'perps-fill-tag-adl',
+
   // Common buttons
   BLOCK_EXPLORER_BUTTON: 'block-explorer-button',
 };
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.styles.ts b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.styles.ts
index 61758f7ccaa1..de9f2a783d57 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.styles.ts
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.styles.ts
@@ -56,6 +56,11 @@ export const styleSheet = (params: { theme: Theme }) => {
       fontSize: 14,
       color: colors.text.alternative,
     },
+    fillTag: {
+      flexDirection: 'row' as const,
+      alignItems: 'center' as const,
+      gap: 8,
+    },
     rightContent: {
       alignItems: 'flex-end' as const,
     },
diff --git a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.tsx b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.tsx
index 186ad0df69f5..8abce05f38ee 100644
--- a/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.tsx
+++ b/app/components/UI/Perps/Views/PerpsTransactionsView/PerpsTransactionsView.tsx
@@ -481,6 +481,7 @@ const PerpsTransactionsView: React.FC = () => {
       )}
 
       <FlashList
+        testID="perps-transactions-flash-list"
         ref={flashListRef}
         data={flatListData}
         renderItem={renderListItem}
diff --git a/app/components/UI/Perps/adapters/mobileInfrastructure.test.ts b/app/components/UI/Perps/adapters/mobileInfrastructure.test.ts
index 01922988de3f..1c85ba1fc9a5 100644
--- a/app/components/UI/Perps/adapters/mobileInfrastructure.test.ts
+++ b/app/components/UI/Perps/adapters/mobileInfrastructure.test.ts
@@ -3,7 +3,10 @@ import { AnalyticsEventBuilder } from '../../../../util/analytics/AnalyticsEvent
 import { analytics } from '../../../../util/analytics/analytics';
 import Logger from '../../../../util/Logger';
 import type { PerpsAnalyticsEvent } from '@metamask/perps-controller';
-import { createMobileInfrastructure } from './mobileInfrastructure';
+import {
+  createMobileInfrastructure,
+  createMobileClientConfig,
+} from './mobileInfrastructure';
 import Engine from '../../../../core/Engine';
 
 jest.mock('../../../../util/analytics/analytics', () => ({
@@ -212,3 +215,62 @@ describe('createMobileInfrastructure', () => {
     });
   });
 });
+
+describe('createMobileClientConfig', () => {
+  it('returns default config with empty strings and arrays when no env vars are set', () => {
+    // Arrange — ensure relevant env vars are absent
+    const envVars = [
+      'MM_PERPS_BLOCKED_REGIONS',
+      'MM_PERPS_HIP3_ENABLED',
+      'MM_PERPS_HIP3_ALLOWLIST_MARKETS',
+      'MM_PERPS_HIP3_BLOCKLIST_MARKETS',
+      'MM_PERPS_HL_BUILDER_ADDRESS_TESTNET',
+      'MM_PERPS_HL_BUILDER_ADDRESS_MAINNET',
+      'MM_PERPS_MYX_PROVIDER_ENABLED',
+      'MM_PERPS_MYX_APP_ID_TESTNET',
+      'MM_PERPS_MYX_API_SECRET_TESTNET',
+      'MM_PERPS_MYX_BROKER_ADDRESS_TESTNET',
+      'MM_PERPS_MYX_APP_ID_MAINNET',
+      'MM_PERPS_MYX_API_SECRET_MAINNET',
+      'MM_PERPS_MYX_BROKER_ADDRESS_MAINNET',
+    ];
+    const saved: Record<string, string | undefined> = {};
+    for (const key of envVars) {
+      saved[key] = process.env[key];
+      delete process.env[key];
+    }
+
+    // Act
+    const config = createMobileClientConfig();
+
+    // Assert
+    expect(config).toEqual({
+      fallbackBlockedRegions: [],
+      fallbackHip3Enabled: false,
+      fallbackHip3AllowlistMarkets: [],
+      fallbackHip3BlocklistMarkets: [],
+      providerCredentials: {
+        hyperliquid: {
+          builderAddressTestnet: '',
+          builderAddressMainnet: '',
+        },
+        myx: {
+          enabled: false,
+          appIdTestnet: '',
+          apiSecretTestnet: '',
+          brokerAddressTestnet: '',
+          appIdMainnet: '',
+          apiSecretMainnet: '',
+          brokerAddressMainnet: '',
+        },
+      },
+    });
+
+    // Restore
+    for (const key of envVars) {
+      if (saved[key] !== undefined) {
+        process.env[key] = saved[key];
+      }
+    }
+  });
+});
diff --git a/app/components/UI/Perps/adapters/mobileInfrastructure.ts b/app/components/UI/Perps/adapters/mobileInfrastructure.ts
index 5dbf7f24858d..9bd0eee51987 100644
--- a/app/components/UI/Perps/adapters/mobileInfrastructure.ts
+++ b/app/components/UI/Perps/adapters/mobileInfrastructure.ts
@@ -21,7 +21,9 @@ import { getStreamManagerInstance } from '../providers/PerpsStreamManager';
 import Engine from '../../../../core/Engine';
 import {
   PERPS_CONSTANTS,
+  parseCommaSeparatedString,
   type PerpsPlatformDependencies,
+  type PerpsControllerConfig,
   type PerpsMetrics,
   type PerpsTraceName,
   type PerpsTraceValue,
@@ -155,6 +157,44 @@ function createCacheInvalidatorAdapter() {
   };
 }
 
+/**
+ * Creates mobile-specific client config from environment variables.
+ * Centralizes all process.env reads so the Engine init file stays pure wiring.
+ */
+export function createMobileClientConfig(): PerpsControllerConfig {
+  return {
+    fallbackBlockedRegions: parseCommaSeparatedString(
+      process.env.MM_PERPS_BLOCKED_REGIONS ?? '',
+    ),
+    fallbackHip3Enabled: process.env.MM_PERPS_HIP3_ENABLED === 'true',
+    fallbackHip3AllowlistMarkets: parseCommaSeparatedString(
+      process.env.MM_PERPS_HIP3_ALLOWLIST_MARKETS ?? '',
+    ),
+    fallbackHip3BlocklistMarkets: parseCommaSeparatedString(
+      process.env.MM_PERPS_HIP3_BLOCKLIST_MARKETS ?? '',
+    ),
+    providerCredentials: {
+      hyperliquid: {
+        builderAddressTestnet:
+          process.env.MM_PERPS_HL_BUILDER_ADDRESS_TESTNET ?? '',
+        builderAddressMainnet:
+          process.env.MM_PERPS_HL_BUILDER_ADDRESS_MAINNET ?? '',
+      },
+      myx: {
+        enabled: process.env.MM_PERPS_MYX_PROVIDER_ENABLED === 'true',
+        appIdTestnet: process.env.MM_PERPS_MYX_APP_ID_TESTNET ?? '',
+        apiSecretTestnet: process.env.MM_PERPS_MYX_API_SECRET_TESTNET ?? '',
+        brokerAddressTestnet:
+          process.env.MM_PERPS_MYX_BROKER_ADDRESS_TESTNET ?? '',
+        appIdMainnet: process.env.MM_PERPS_MYX_APP_ID_MAINNET ?? '',
+        apiSecretMainnet: process.env.MM_PERPS_MYX_API_SECRET_MAINNET ?? '',
+        brokerAddressMainnet:
+          process.env.MM_PERPS_MYX_BROKER_ADDRESS_MAINNET ?? '',
+      },
+    },
+  };
+}
+
 /**
  * Creates mobile-specific platform dependencies for PerpsController.
  * Controller access uses messenger pattern (messenger.call()).
diff --git a/app/components/UI/Perps/components/PerpsFillTag/PerpsFillTag.tsx b/app/components/UI/Perps/components/PerpsFillTag/PerpsFillTag.tsx
index 29a2e47ffc79..d32afc002402 100644
--- a/app/components/UI/Perps/components/PerpsFillTag/PerpsFillTag.tsx
+++ b/app/components/UI/Perps/components/PerpsFillTag/PerpsFillTag.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { TouchableOpacity, Linking } from 'react-native';
+import { View, TouchableOpacity, Linking } from 'react-native';
 import { useSelector } from 'react-redux';
 import Text, {
   TextColor,
@@ -20,6 +20,7 @@ import {
   PERPS_EVENT_VALUE,
 } from '@metamask/perps-controller';
 import { FillType, PerpsTransaction } from '../../types/transactionHistory';
+import { PerpsTransactionSelectorsIDs } from '../../Perps.testIds';
 
 interface PerpsFillTagProps {
   transaction: PerpsTransaction;
@@ -61,6 +62,7 @@ const PerpsFillTag: React.FC<PerpsFillTagProps> = ({
         severity: TagSeverity.Info,
         textColor: TextColor.Default,
         includesBorder: false,
+        testID: PerpsTransactionSelectorsIDs.FILL_TAG_ADL,
       },
       [FillType.Liquidation]: {
         // Only show if liquidated user is current user
@@ -73,18 +75,21 @@ const PerpsFillTag: React.FC<PerpsFillTagProps> = ({
         severity: TagSeverity.Danger,
         textColor: TextColor.Error,
         includesBorder: false,
+        testID: PerpsTransactionSelectorsIDs.FILL_TAG_LIQUIDATED,
       },
       [FillType.TakeProfit]: {
         label: strings('perps.transactions.order.take_profit'),
         severity: TagSeverity.Default,
         textColor: TextColor.Alternative,
         includesBorder: true,
+        testID: PerpsTransactionSelectorsIDs.FILL_TAG_TAKE_PROFIT,
       },
       [FillType.StopLoss]: {
         label: strings('perps.transactions.order.stop_loss'),
         severity: TagSeverity.Default,
         textColor: TextColor.Alternative,
         includesBorder: true,
+        testID: PerpsTransactionSelectorsIDs.FILL_TAG_STOP_LOSS,
       },
     };
 
@@ -95,15 +100,17 @@ const PerpsFillTag: React.FC<PerpsFillTagProps> = ({
     }
 
     const tagContent = (
-      <TagBase
-        shape={TagShape.Pill}
-        severity={tagConfig.severity}
-        includesBorder={tagConfig.includesBorder}
-      >
-        <Text variant={TextVariant.BodyXSMedium} color={tagConfig.textColor}>
-          {tagConfig.label}
-        </Text>
-      </TagBase>
+      <View testID={tagConfig.testID}>
+        <TagBase
+          shape={TagShape.Pill}
+          severity={tagConfig.severity}
+          includesBorder={tagConfig.includesBorder}
+        >
+          <Text variant={TextVariant.BodyXSMedium} color={tagConfig.textColor}>
+            {tagConfig.label}
+          </Text>
+        </TagBase>
+      </View>
     );
 
     // Only wrap in TouchableOpacity for ADL fill type which has an action.
diff --git a/app/components/UI/Perps/hooks/usePerpsHomeData.test.ts b/app/components/UI/Perps/hooks/usePerpsHomeData.test.ts
index 304bab74e86a..86ad423933ef 100644
--- a/app/components/UI/Perps/hooks/usePerpsHomeData.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsHomeData.test.ts
@@ -976,6 +976,57 @@ describe('usePerpsHomeData', () => {
       });
     });
 
+    it('preserves detailedOrderType from REST fill when WS fill lacks it', async () => {
+      // Arrange — REST fill has enriched detailedOrderType
+      const restFill = createMockOrderFill({
+        orderId: 'fill-tp-1',
+        symbol: 'BTC',
+        timestamp: 1234567800,
+        detailedOrderType: 'Take Profit Limit',
+      });
+      const mockGetOrderFills = jest.fn().mockResolvedValue([restFill]);
+      (
+        Engine.context.PerpsController.getActiveProviderOrNull as jest.Mock
+      ).mockReturnValue({
+        getOrderFills: mockGetOrderFills,
+      });
+
+      // WS fill with same key but no detailedOrderType
+      const wsFill = createMockOrderFill({
+        orderId: 'fill-tp-1',
+        symbol: 'BTC',
+        timestamp: 1234567800,
+      });
+      mockUsePerpsLiveFills.mockReturnValue({
+        fills: [wsFill],
+        isInitialLoading: false,
+      });
+
+      mockUsePerpsConnection.mockReturnValue({
+        isConnected: true,
+        isInitialized: true,
+        isConnecting: false,
+        error: null,
+        connect: jest.fn(),
+        disconnect: jest.fn(),
+        resetError: jest.fn(),
+      } as never);
+
+      // Act
+      const { result } = renderHook(() => usePerpsHomeData());
+      await act(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 0));
+      });
+
+      // Assert — recentActivity contains the merged fill with preserved detailedOrderType
+      // The detailedOrderType from REST is preserved during merge, then
+      // transformFillsToTransactions converts it to FillType.TakeProfit
+      expect(result.current.recentActivity).toHaveLength(1);
+      expect(result.current.recentActivity[0].fill?.fillType).toBe(
+        FillType.TakeProfit,
+      );
+    });
+
     it('handles special characters in search query', () => {
       const { result } = renderHook(() =>
         usePerpsHomeData({ searchQuery: '$BTC*' }),
diff --git a/app/components/UI/Perps/hooks/usePerpsHomeData.ts b/app/components/UI/Perps/hooks/usePerpsHomeData.ts
index 531716bd08dd..72df7f435e97 100644
--- a/app/components/UI/Perps/hooks/usePerpsHomeData.ts
+++ b/app/components/UI/Perps/hooks/usePerpsHomeData.ts
@@ -136,9 +136,20 @@ export const usePerpsHomeData = ({
     }
 
     // Add live fills (overwrites duplicates from REST - live data is fresher)
+    // Preserve detailedOrderType from REST fills since WS fills lack it
     for (const fill of liveFills) {
       const key = `${fill.orderId}-${fill.timestamp}`;
-      fillsMap.set(key, fill);
+      const existing = fillsMap.get(key);
+      if (existing?.detailedOrderType && !fill.detailedOrderType) {
+        fillsMap.set(key, {
+          ...fill,
+          detailedOrderType: existing.detailedOrderType,
+          ...(existing.liquidation &&
+            !fill.liquidation && { liquidation: existing.liquidation }),
+        });
+      } else {
+        fillsMap.set(key, fill);
+      }
     }
 
     // Convert back to array and sort by timestamp descending (newest first)
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts b/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
index 08938264bcc3..76675819661d 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderForm.test.ts
@@ -435,9 +435,9 @@ describe('usePerpsOrderForm', () => {
       });
 
       // Assert
-      // With $2 balance and 3x leverage = $6 max amount, which is less than $10 default
-      // Should use the max possible amount ($6) instead of the default ($10)
-      expect(result.current.orderForm.amount).toBe('6');
+      // With $2 balance and 3x leverage, max is floor(6 * (1 - 0.5% buffer)) = 5 (less than $10 default)
+      // Should use the max possible amount (5) instead of the default ($10)
+      expect(result.current.orderForm.amount).toBe('5');
     });
 
     it('should use default amount when available balance times leverage is greater than default amount', () => {
@@ -468,14 +468,14 @@ describe('usePerpsOrderForm', () => {
 
   describe('useMemo and useEffect behavior', () => {
     it('should not overwrite user input when dependencies change', async () => {
-      // Arrange - Start with balance high enough that max >= 999 (e.g. 334 * 3x = 1002)
+      // Arrange - Start with balance high enough that max >= 999 after 0.5% buffer (e.g. 335 * 3x → floor(1005*0.995) = 999)
       const mockAccount = {
         account: {
-          availableBalance: '334',
+          availableBalance: '335',
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
-          totalBalance: '334',
+          totalBalance: '335',
         },
         isInitialLoading: false,
       };
@@ -490,7 +490,7 @@ describe('usePerpsOrderForm', () => {
         TRADING_DEFAULTS.amount.mainnet.toString(),
       );
 
-      // Act - User changes the amount (within current max)
+      // Act - User changes the amount (within current max; 335*3*0.995 >= 999)
       act(() => {
         result.current.setAmount('999');
       });
@@ -515,7 +515,7 @@ describe('usePerpsOrderForm', () => {
       // Test 1: Low balance scenario
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
-          availableBalance: '2', // $2 balance = $6 max with 3x leverage (less than $10 default)
+          availableBalance: '2', // $2 balance, 3x leverage: max = floor(6 * 0.995) = 5 (less than $10 default)
           marginUsed: '0',
           unrealizedPnl: '0',
           returnOnEquity: '0',
@@ -528,7 +528,7 @@ describe('usePerpsOrderForm', () => {
         wrapper: createWrapper(),
       });
 
-      expect(result1.current.orderForm.amount).toBe('6'); // Should use maxPossibleAmount
+      expect(result1.current.orderForm.amount).toBe('5'); // Should use maxPossibleAmount (with margin buffer)
 
       // Test 2: High balance scenario
       mockUsePerpsLiveAccount.mockReturnValue({
@@ -690,7 +690,8 @@ describe('usePerpsOrderForm', () => {
         result.current.handleMaxAmount();
       });
 
-      expect(result.current.orderForm.amount).toBe('3000'); // 1000 * 3x leverage
+      // 1000 * 3x leverage with 0.5% margin buffer = floor(3000 * 0.995) = 2985
+      expect(result.current.orderForm.amount).toBe('2985');
     });
 
     it('should handle min amount for mainnet', () => {
@@ -722,6 +723,27 @@ describe('usePerpsOrderForm', () => {
       );
     });
 
+    it('should clamp near-100% amounts to maxPossibleAmount', () => {
+      const { result } = renderHook(() => usePerpsOrderForm(), {
+        wrapper: createWrapper(),
+      });
+
+      act(() => {
+        result.current.handlePercentageAmount(0.999);
+      });
+
+      const at999 = Number(result.current.orderForm.amount);
+
+      act(() => {
+        result.current.handlePercentageAmount(1);
+      });
+
+      const at100 = Number(result.current.orderForm.amount);
+
+      expect(at999).toBeLessThanOrEqual(at100);
+      expect(at100).toBe(result.current.maxPossibleAmount);
+    });
+
     it('should not update amount when balance is 0', () => {
       mockUsePerpsLiveAccount.mockReturnValue({
         account: {
diff --git a/app/components/UI/Perps/hooks/usePerpsOrderForm.ts b/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
index 1efff43fb74c..05f021c00aaa 100644
--- a/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
+++ b/app/components/UI/Perps/hooks/usePerpsOrderForm.ts
@@ -317,26 +317,28 @@ export function usePerpsOrderForm(
     setOrderForm((prev) => ({ ...prev, type }));
   };
 
-  // Handle percentage-based amount selection (respects custom token amount when set)
+  // Handle percentage-based amount selection (respects custom token amount when set).
+  // Clamp to maxPossibleAmount so near-100% values never exceed the buffered max.
   const handlePercentageAmount = useCallback(
     (percentage: number) => {
       if (balanceForMax === 0) return;
-      const newAmount = Math.floor(
-        balanceForMax * orderForm.leverage * percentage,
-      ).toString();
+      const raw = balanceForMax * orderForm.leverage * percentage;
+      const clamped = Math.min(raw, maxPossibleAmount);
+      const newAmount = Math.floor(clamped).toString();
       setOrderForm((prev) => ({ ...prev, amount: newAmount }));
     },
-    [balanceForMax, orderForm.leverage],
+    [balanceForMax, orderForm.leverage, maxPossibleAmount],
   );
 
-  // Handle max amount selection (respects custom token amount when set)
+  // Handle max amount selection (respects custom token amount when set).
+  // Uses maxPossibleAmount (includes margin buffer) to avoid "Insufficient margin" rejections.
   const handleMaxAmount = useCallback(() => {
     if (balanceForMax === 0) return;
     setOrderForm((prev) => ({
       ...prev,
-      amount: Math.floor(balanceForMax * prev.leverage).toString(),
+      amount: Math.floor(maxPossibleAmount).toString(),
     }));
-  }, [balanceForMax]);
+  }, [balanceForMax, maxPossibleAmount]);
 
   // Handle min amount selection
   const handleMinAmount = useCallback(() => {
diff --git a/app/components/UI/Perps/hooks/usePerpsTransactionHistory.test.ts b/app/components/UI/Perps/hooks/usePerpsTransactionHistory.test.ts
index 6494d03506ad..548acd84f90b 100644
--- a/app/components/UI/Perps/hooks/usePerpsTransactionHistory.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsTransactionHistory.test.ts
@@ -1077,6 +1077,72 @@ describe('usePerpsTransactionHistory', () => {
     });
   });
 
+  describe('WS fill merge preserves fillType from REST', () => {
+    it('preserves non-standard fillType when WS fill has standard', async () => {
+      // Arrange — REST returns a trade with stop_loss fillType
+      const restTrade = {
+        ...mockTransformedTransactions[0],
+        id: 'rest-sl-1',
+        asset: 'BTC',
+        timestamp: 1641000000000,
+        fill: {
+          ...mockTransformedTransactions[0].fill,
+          fillType: FillType.StopLoss,
+        },
+      };
+      // Live fill with same asset+timestamp(seconds) but standard fillType
+      const wsFill = {
+        ...mockTransformedTransactions[0],
+        id: 'ws-sl-1',
+        asset: 'BTC',
+        timestamp: 1641000000000,
+        fill: {
+          ...mockTransformedTransactions[0].fill,
+          fillType: FillType.Standard,
+        },
+      };
+
+      // Call order: (1) useMemo on initial render with liveFills,
+      // (2) fetchAllTransactions with REST fills (sets state),
+      // (3) useMemo re-runs with liveFills after state update
+      mockTransformFillsToTransactions
+        .mockReturnValueOnce([wsFill]) // initial render: live fills
+        .mockReturnValueOnce([restTrade]) // fetchAllTransactions: REST fills
+        .mockReturnValue([wsFill]); // re-render: live fills again
+
+      mockUsePerpsLiveFills.mockReturnValue({
+        fills: [
+          {
+            orderId: 'ws-1',
+            timestamp: 1641000000000,
+            symbol: 'BTC',
+            side: 'buy',
+            size: '0.1',
+            price: '50000',
+            pnl: '0',
+            direction: 'Open Long',
+            fee: '5',
+            feeToken: 'USDC',
+          },
+        ],
+        isInitialLoading: false,
+      });
+
+      // Act
+      const { result } = renderHook(() => usePerpsTransactionHistory());
+      await act(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 0));
+      });
+
+      // Assert — merged trade preserves the stop_loss fillType
+      const trades = result.current.transactions.filter(
+        (tx) => tx.type === 'trade',
+      );
+      expect(trades).toHaveLength(1);
+      expect(trades[0].fill?.fillType).toBe(FillType.StopLoss);
+    });
+  });
+
   describe('connection state transitions', () => {
     it('triggers fetch when skipInitialFetch transitions from true to false', async () => {
       // Reset mocks to track calls clearly
diff --git a/app/components/UI/Perps/hooks/usePerpsTransactionHistory.ts b/app/components/UI/Perps/hooks/usePerpsTransactionHistory.ts
index 3db153d84f6c..1a1b371e2322 100644
--- a/app/components/UI/Perps/hooks/usePerpsTransactionHistory.ts
+++ b/app/components/UI/Perps/hooks/usePerpsTransactionHistory.ts
@@ -9,7 +9,7 @@ import type { CaipAccountId } from '@metamask/utils';
 import { areAddressesEqual } from '../../../../util/address';
 import { selectNonReplacedTransactions } from '../../../../selectors/transactionController';
 import { selectSelectedInternalAccountFormattedAddress } from '../../../../selectors/accountsController';
-import { PerpsTransaction } from '../types/transactionHistory';
+import { FillType, PerpsTransaction } from '../types/transactionHistory';
 import { useUserHistory } from './useUserHistory';
 import { usePerpsLiveFills } from './stream/usePerpsLiveFills';
 import {
@@ -288,10 +288,30 @@ export const usePerpsTransactionHistory = ({
     }
 
     // Add live fills (overwrites REST duplicates - live data is fresher)
+    // Preserve fillType from REST when WS fill lacks enrichment (TP/SL pills)
     for (const tx of liveTransactions) {
       const timestampSeconds = Math.floor(tx.timestamp / 1000);
       const dedupKey = `${tx.asset}-${timestampSeconds}`;
-      tradeMap.set(dedupKey, tx);
+      const existing = tradeMap.get(dedupKey);
+      if (
+        existing?.fill?.fillType &&
+        existing.fill.fillType !== FillType.Standard &&
+        tx.fill?.fillType === FillType.Standard
+      ) {
+        tradeMap.set(dedupKey, {
+          ...tx,
+          fill: {
+            ...tx.fill,
+            fillType: existing.fill.fillType,
+            ...(existing.fill.liquidation &&
+              !tx.fill.liquidation && {
+                liquidation: existing.fill.liquidation,
+              }),
+          },
+        });
+      } else {
+        tradeMap.set(dedupKey, tx);
+      }
     }
 
     // Combine deduplicated trades with non-trade transactions (including wallet deposits)
diff --git a/app/components/UI/Perps/utils/orderCalculations.test.ts b/app/components/UI/Perps/utils/orderCalculations.test.ts
index 02d3aa478568..fcec7b020622 100644
--- a/app/components/UI/Perps/utils/orderCalculations.test.ts
+++ b/app/components/UI/Perps/utils/orderCalculations.test.ts
@@ -355,6 +355,27 @@ describe('orderCalculations', () => {
       expect(result).toBeGreaterThanOrEqual(0);
       expect(result).toBeLessThanOrEqual(50); // 10 * 5 leverage
     });
+
+    it('should apply margin buffer so result is below theoretical max', () => {
+      // Arrange - case where theoretical max is 1000 (100 * 10)
+      const params = {
+        availableBalance: 100,
+        assetPrice: 50000,
+        assetSzDecimals: 6,
+        leverage: 10,
+      };
+
+      // Act
+      const result = getMaxAllowedAmount(params);
+      const theoreticalMax = params.availableBalance * params.leverage;
+
+      // Assert - buffer (0.5%) reduces max to avoid "Insufficient margin" rejections
+      expect(result).toBeGreaterThan(0);
+      expect(result).toBeLessThanOrEqual(theoreticalMax);
+      expect(result).toBeLessThanOrEqual(
+        Math.floor(theoreticalMax * (1 - 0.005)),
+      );
+    });
   });
 
   describe('buildOrdersArray', () => {
diff --git a/app/components/UI/Rewards/Views/CampaignMechanicsView.test.tsx b/app/components/UI/Rewards/Views/CampaignMechanicsView.test.tsx
index 2af0dd41c571..68cded2bef7a 100644
--- a/app/components/UI/Rewards/Views/CampaignMechanicsView.test.tsx
+++ b/app/components/UI/Rewards/Views/CampaignMechanicsView.test.tsx
@@ -140,7 +140,6 @@ const createTestCampaign = (
   endDate: '2027-12-31T23:59:59.999Z',
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: true,
   ...overrides,
@@ -185,10 +184,6 @@ describe('CampaignMechanicsView', () => {
         campaigns: [
           createTestCampaign({
             details: {
-              image: {
-                lightModeUrl: 'https://example.com/light.png',
-                darkModeUrl: 'https://example.com/dark.png',
-              },
               howItWorks: {
                 title: 'How it works',
                 description: 'Earn rewards',
@@ -246,10 +241,6 @@ describe('CampaignMechanicsView', () => {
         campaigns: [
           createTestCampaign({
             details: {
-              image: {
-                lightModeUrl: 'https://example.com/light.png',
-                darkModeUrl: 'https://example.com/dark.png',
-              },
               howItWorks: {
                 title: 'How it works',
                 description: 'Earn rewards',
@@ -272,10 +263,6 @@ describe('CampaignMechanicsView', () => {
         campaigns: [
           createTestCampaign({
             details: {
-              image: {
-                lightModeUrl: 'https://example.com/light.png',
-                darkModeUrl: 'https://example.com/dark.png',
-              },
               howItWorks: {
                 title: 'How it works',
                 description: 'Earn rewards',
@@ -298,10 +285,6 @@ describe('CampaignMechanicsView', () => {
         campaigns: [
           createTestCampaign({
             details: {
-              image: {
-                lightModeUrl: 'https://example.com/light.png',
-                darkModeUrl: 'https://example.com/dark.png',
-              },
               howItWorks: {
                 title: 'How it works',
                 description: 'Earn rewards',
@@ -323,10 +306,6 @@ describe('CampaignMechanicsView', () => {
         campaigns: [
           createTestCampaign({
             details: {
-              image: {
-                lightModeUrl: 'https://example.com/light.png',
-                darkModeUrl: 'https://example.com/dark.png',
-              },
               howItWorks: {
                 title: 'How it works',
                 description: 'Earn rewards',
@@ -349,10 +328,6 @@ describe('CampaignMechanicsView', () => {
         campaigns: [
           createTestCampaign({
             details: {
-              image: {
-                lightModeUrl: 'https://example.com/light.png',
-                darkModeUrl: 'https://example.com/dark.png',
-              },
               howItWorks: {
                 title: 'How it works',
                 description: 'Earn rewards',
diff --git a/app/components/UI/Rewards/Views/CampaignsView.test.tsx b/app/components/UI/Rewards/Views/CampaignsView.test.tsx
index 625c5c7360b5..6e37c8fa434a 100644
--- a/app/components/UI/Rewards/Views/CampaignsView.test.tsx
+++ b/app/components/UI/Rewards/Views/CampaignsView.test.tsx
@@ -143,7 +143,6 @@ const createTestCampaign = (
   endDate: '2027-12-31T23:59:59.999Z',
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: true,
   ...overrides,
diff --git a/app/components/UI/Rewards/Views/OndoCampaignDetailsView.test.tsx b/app/components/UI/Rewards/Views/OndoCampaignDetailsView.test.tsx
index 101a99d9f746..7d4fcd088e23 100644
--- a/app/components/UI/Rewards/Views/OndoCampaignDetailsView.test.tsx
+++ b/app/components/UI/Rewards/Views/OndoCampaignDetailsView.test.tsx
@@ -206,7 +206,6 @@ const createTestCampaign = (
     endDate: nextMonth.toISOString(),
     termsAndConditions: null,
     excludedRegions: [],
-    statusLabel: 'Active',
     details: null,
     featured: true,
     ...overrides,
@@ -317,10 +316,6 @@ describe('OndoCampaignDetailsView', () => {
         campaigns: [
           createTestCampaign({
             details: {
-              image: {
-                lightModeUrl: 'https://example.com/light.png',
-                darkModeUrl: 'https://example.com/dark.png',
-              },
               howItWorks: {
                 title: 'How it works',
                 description: 'Description',
diff --git a/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.test.tsx b/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.test.tsx
index b2be68e48160..5714e553e609 100644
--- a/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.test.tsx
+++ b/app/components/UI/Rewards/Views/SeasonOneCampaignDetailsView.test.tsx
@@ -148,7 +148,6 @@ const createTestCampaign = (
     endDate: nextMonth.toISOString(),
     termsAndConditions: null,
     excludedRegions: [],
-    statusLabel: 'Active',
     details: null,
     featured: true,
     ...overrides,
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignOptInSheet.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignOptInSheet.test.tsx
index 4b30daf03c9d..c5a5f1d241a2 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignOptInSheet.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignOptInSheet.test.tsx
@@ -165,7 +165,6 @@ const createTestCampaign = (
   endDate: '2027-12-31T23:59:59.999Z',
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: true,
   ...overrides,
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignStatus.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignStatus.test.tsx
index e779437e9100..65bf77634dfb 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignStatus.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignStatus.test.tsx
@@ -33,7 +33,6 @@ const createTestCampaign = (overrides = {}): CampaignDto => ({
   endDate: '2027-12-31T23:59:59.999Z',
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: true,
   ...overrides,
@@ -58,12 +57,9 @@ describe('CampaignStatus', () => {
 
   it('renders campaign image', () => {
     const campaign = createTestCampaign({
-      details: {
-        image: {
-          lightModeUrl: 'https://example.com/light.png',
-          darkModeUrl: 'https://example.com/dark.png',
-        },
-        howItWorks: { title: '', description: '', phases: [] },
+      image: {
+        lightModeUrl: 'https://example.com/light.png',
+        darkModeUrl: 'https://example.com/dark.png',
       },
     });
     const { getByTestId } = render(<CampaignStatus campaign={campaign} />);
@@ -89,10 +85,6 @@ describe('CampaignStatus', () => {
   it('renders howItWorks title when available', () => {
     const campaign = createTestCampaign({
       details: {
-        image: {
-          lightModeUrl: 'https://example.com/light.png',
-          darkModeUrl: 'https://example.com/dark.png',
-        },
         howItWorks: {
           title: 'How it works',
           description: 'Description',
@@ -117,10 +109,6 @@ describe('CampaignStatus', () => {
   it('does not render howItWorks title when title is empty', () => {
     const campaign = createTestCampaign({
       details: {
-        image: {
-          lightModeUrl: 'https://example.com/light.png',
-          darkModeUrl: 'https://example.com/dark.png',
-        },
         howItWorks: { title: '', description: '', phases: [] },
       },
     });
@@ -133,10 +121,6 @@ describe('CampaignStatus', () => {
   it('renders howItWorks description when available', () => {
     const campaign = createTestCampaign({
       details: {
-        image: {
-          lightModeUrl: 'https://example.com/light.png',
-          darkModeUrl: 'https://example.com/dark.png',
-        },
         howItWorks: {
           title: 'How it works',
           description: 'Hold ONDO tokens to earn rewards',
@@ -161,10 +145,6 @@ describe('CampaignStatus', () => {
   it('does not render howItWorks description when description is empty', () => {
     const campaign = createTestCampaign({
       details: {
-        image: {
-          lightModeUrl: 'https://example.com/light.png',
-          darkModeUrl: 'https://example.com/dark.png',
-        },
         howItWorks: { title: 'Title', description: '', phases: [] },
       },
     });
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignStatus.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignStatus.tsx
index 2ca2e5ac7c9b..b1fdeaa75af7 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignStatus.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignStatus.tsx
@@ -37,8 +37,8 @@ const CampaignStatus: React.FC<CampaignStatusProps> = ({ campaign }) => {
 
   const backgroundImageUrl =
     colorScheme === 'dark'
-      ? campaign.details?.image?.darkModeUrl
-      : campaign.details?.image?.lightModeUrl;
+      ? campaign.image?.darkModeUrl
+      : campaign.image?.lightModeUrl;
 
   const howItWorksTitle = campaign.details?.howItWorks?.title;
   const howItWorksDescription = campaign.details?.howItWorks?.description;
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignTile.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignTile.test.tsx
index 2b23a5b5e410..541d9db5cc37 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignTile.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignTile.test.tsx
@@ -88,7 +88,6 @@ const createTestCampaign = (overrides = {}): CampaignDto => ({
   endDate: '2027-12-31T23:59:59.999Z',
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: true,
   ...overrides,
@@ -161,16 +160,9 @@ describe('CampaignTile', () => {
 
   it('renders background image via campaign-tile-background testID', () => {
     const campaign = createTestCampaign({
-      details: {
-        image: {
-          lightModeUrl: 'https://example.com/light.png',
-          darkModeUrl: 'https://example.com/dark.png',
-        },
-        howItWorks: {
-          title: '',
-          description: '',
-          phases: [],
-        },
+      image: {
+        lightModeUrl: 'https://example.com/light.png',
+        darkModeUrl: 'https://example.com/dark.png',
       },
     });
 
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignTile.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignTile.tsx
index 4950e938f807..79fd04a03a11 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignTile.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignTile.tsx
@@ -74,8 +74,8 @@ const CampaignTile: React.FC<CampaignTileProps> = ({ campaign, onPress }) => {
 
   const backgroundImageUrl =
     colorScheme === 'dark'
-      ? campaign.details?.image?.darkModeUrl
-      : campaign.details?.image?.lightModeUrl;
+      ? campaign.image?.darkModeUrl
+      : campaign.image?.lightModeUrl;
 
   const handlePress = () => {
     if (!isInteractive) return;
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts b/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts
index 663855acaaa8..abec4ec03e07 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignTile.utils.test.ts
@@ -42,7 +42,6 @@ function buildCampaignDto(overrides: Partial<CampaignDto> = {}): CampaignDto {
     endDate: '2025-12-31T23:59:59.999Z',
     termsAndConditions: null,
     excludedRegions: [],
-    statusLabel: 'Active',
     details: null,
     featured: true,
     ...overrides,
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignsGroup.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignsGroup.test.tsx
index 267f1c86f0ac..235f30603d84 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignsGroup.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignsGroup.test.tsx
@@ -16,7 +16,6 @@ const createTestCampaign = (
   endDate: '2027-12-31T23:59:59.999Z',
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: true,
   ...overrides,
diff --git a/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.test.tsx b/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.test.tsx
index 8adae8d1a656..dc1eb911605b 100644
--- a/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.test.tsx
+++ b/app/components/UI/Rewards/components/Campaigns/CampaignsPreview.test.tsx
@@ -80,7 +80,6 @@ const createTestCampaign = (
   endDate: futureDate.toISOString(),
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: true,
   ...overrides,
diff --git a/app/components/UI/Rewards/hooks/useRewardCampaigns.test.ts b/app/components/UI/Rewards/hooks/useRewardCampaigns.test.ts
index 5cc5d2fe0cf5..7f9ea8bc1b5c 100644
--- a/app/components/UI/Rewards/hooks/useRewardCampaigns.test.ts
+++ b/app/components/UI/Rewards/hooks/useRewardCampaigns.test.ts
@@ -81,7 +81,6 @@ const createTestCampaign = (
   endDate: '2027-01-01T00:00:00.000Z',
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: true,
   ...overrides,
diff --git a/app/components/Views/ManualBackupStep1/__snapshots__/index.test.tsx.snap b/app/components/Views/ManualBackupStep1/__snapshots__/index.test.tsx.snap
index 8844e0c4c6e3..fba420e36c64 100644
--- a/app/components/Views/ManualBackupStep1/__snapshots__/index.test.tsx.snap
+++ b/app/components/Views/ManualBackupStep1/__snapshots__/index.test.tsx.snap
@@ -331,7 +331,8 @@ exports[`ManualBackupStep1 matches snapshot 1`] = `
                   accessibilityIgnoresInvertColors={true}
                   style={
                     [
-                      "absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1 opacity-50",
+                      "absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1",
+                      "opacity-50",
                     ]
                   }
                 >
@@ -361,11 +362,12 @@ exports[`ManualBackupStep1 matches snapshot 1`] = `
                     [
                       [
                         "flex",
-                        "flex-col",
+                        undefined,
+                        undefined,
+                        false,
+                        undefined,
                         undefined,
                         false,
-                        "items-center",
-                        "justify-center",
                         false,
                         false,
                         false,
@@ -378,12 +380,11 @@ exports[`ManualBackupStep1 matches snapshot 1`] = `
                         false,
                         false,
                         false,
-                        "px-6",
                         false,
                         false,
                         undefined,
                         undefined,
-                        "rounded-lg py-[45px] gap-y-4 h-full flex-1",
+                        "items-center justify-center rounded-lg px-6 py-[45px] gap-y-4 h-full flex-1",
                       ],
                       undefined,
                     ]
@@ -885,7 +886,8 @@ exports[`ManualBackupStep1 theme appearance renders with dark theme 1`] = `
                   accessibilityIgnoresInvertColors={true}
                   style={
                     [
-                      "absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1 opacity-50",
+                      "absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1",
+                      "opacity-50",
                     ]
                   }
                 >
@@ -915,11 +917,12 @@ exports[`ManualBackupStep1 theme appearance renders with dark theme 1`] = `
                     [
                       [
                         "flex",
-                        "flex-col",
+                        undefined,
+                        undefined,
+                        false,
+                        undefined,
                         undefined,
                         false,
-                        "items-center",
-                        "justify-center",
                         false,
                         false,
                         false,
@@ -932,12 +935,11 @@ exports[`ManualBackupStep1 theme appearance renders with dark theme 1`] = `
                         false,
                         false,
                         false,
-                        "px-6",
                         false,
                         false,
                         undefined,
                         undefined,
-                        "rounded-lg py-[45px] gap-y-4 h-full flex-1",
+                        "items-center justify-center rounded-lg px-6 py-[45px] gap-y-4 h-full flex-1",
                       ],
                       undefined,
                     ]
@@ -1439,7 +1441,8 @@ exports[`ManualBackupStep1 theme appearance renders with light theme on Android
                   accessibilityIgnoresInvertColors={true}
                   style={
                     [
-                      "absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1 opacity-50",
+                      "absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1",
+                      "opacity-50",
                     ]
                   }
                 >
@@ -1469,11 +1472,12 @@ exports[`ManualBackupStep1 theme appearance renders with light theme on Android
                     [
                       [
                         "flex",
-                        "flex-col",
+                        undefined,
+                        undefined,
+                        false,
+                        undefined,
                         undefined,
                         false,
-                        "items-center",
-                        "justify-center",
                         false,
                         false,
                         false,
@@ -1486,12 +1490,11 @@ exports[`ManualBackupStep1 theme appearance renders with light theme on Android
                         false,
                         false,
                         false,
-                        "px-6",
                         false,
                         false,
                         undefined,
                         undefined,
-                        "rounded-lg py-[45px] gap-y-4 h-full flex-1",
+                        "items-center justify-center rounded-lg px-6 py-[45px] gap-y-4 h-full flex-1",
                       ],
                       undefined,
                     ]
diff --git a/app/components/Views/ManualBackupStep1/index.tsx b/app/components/Views/ManualBackupStep1/index.tsx
index 5282d7af51d4..d96ae6530a99 100644
--- a/app/components/Views/ManualBackupStep1/index.tsx
+++ b/app/components/Views/ManualBackupStep1/index.tsx
@@ -10,7 +10,6 @@ import {
   KeyboardAvoidingView,
   FlatList,
   TouchableOpacity,
-  ImageBackground,
   Platform,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -37,7 +36,6 @@ import {
   TextButton,
   TextButtonSize,
   BoxAlignItems,
-  BoxFlexDirection,
   BoxJustifyContent,
 } from '@metamask/design-system-react-native';
 import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';
@@ -58,8 +56,8 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 import type { ITrackingEvent } from '../../../core/Analytics/MetaMetrics.types';
 import { Authentication } from '../../../core';
 import { ManualBackUpStepsSelectorsIDs } from './ManualBackUpSteps.testIds';
+import SeedPhraseConcealer from '../RevealPrivateCredential/components/SeedPhraseConcealer';
 import { saveOnboardingEvent as saveEvent } from '../../../actions/onboarding';
-import { AppThemeKey } from '../../../util/theme/models';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import {
   createTrackFunction,
@@ -67,9 +65,6 @@ import {
   showSeedphraseDefinition,
 } from '../../../util/onboarding/backupUtils';
 import type { ManualBackupStep1RouteProp } from './ManualBackupStep1.types';
-import darkBlurImage from '../../../images/dark-blur.png';
-import lightBlurImage from '../../../images/blur.png';
-
 /**
  * View that's shown during the second step of
  * the backup seed phrase flow
@@ -298,50 +293,10 @@ const ManualBackupStep1 = () => {
   };
 
   const renderSeedPhraseConcealer = () => (
-    <Box twClassName="flex-1 rounded-lg">
-      <TouchableOpacity
-        onPress={revealSeedPhrase}
-        style={tw.style(
-          'absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1',
-        )}
-        testID={ManualBackUpStepsSelectorsIDs.BLUR_BUTTON}
-      >
-        <ImageBackground
-          source={
-            themeAppearance === AppThemeKey.dark
-              ? darkBlurImage
-              : lightBlurImage
-          }
-          style={tw.style(
-            'absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1 opacity-50',
-          )}
-          resizeMode="cover"
-        />
-        <Box
-          alignItems={BoxAlignItems.Center}
-          flexDirection={BoxFlexDirection.Column}
-          justifyContent={BoxJustifyContent.Center}
-          paddingHorizontal={6}
-          twClassName="rounded-lg py-[45px] gap-y-4 h-full flex-1"
-        >
-          <Icon
-            name={IconName.EyeSlash}
-            size={IconSize.Xl}
-            color={IconColor.IconDefault}
-          />
-          <Text
-            variant={TextVariant.BodyMd}
-            fontWeight={FontWeight.Medium}
-            color={TextColor.TextDefault}
-          >
-            {strings('manual_backup_step_1.reveal')}
-          </Text>
-          <Text variant={TextVariant.BodySm} color={TextColor.TextDefault}>
-            {strings('manual_backup_step_1.watching')}
-          </Text>
-        </Box>
-      </TouchableOpacity>
-    </Box>
+    <SeedPhraseConcealer
+      onReveal={revealSeedPhrase}
+      testID={ManualBackUpStepsSelectorsIDs.BLUR_BUTTON}
+    />
   );
 
   const renderConfirmPassword = () => (
diff --git a/app/components/Views/NftDetails/NftDetails.tsx b/app/components/Views/NftDetails/NftDetails.tsx
index f4479c41e84f..26d39d292462 100644
--- a/app/components/Views/NftDetails/NftDetails.tsx
+++ b/app/components/Views/NftDetails/NftDetails.tsx
@@ -15,7 +15,7 @@ import styleSheet from './NftDetails.styles';
 import Routes from '../../../constants/navigation/Routes';
 import { NftDetailsParams } from './NftDetails.types';
 import { ScrollView } from 'react-native-gesture-handler';
-import StyledButton from '../../../components/UI/StyledButton';
+import { Button, ButtonVariant } from '@metamask/design-system-react-native';
 import NftDetailsBox from './NftDetailsBox';
 import NftDetailsInformationRow from './NftDetailsInformationRow';
 import { renderShortAddress } from '../../../util/address';
@@ -47,9 +47,6 @@ import { renderShortText } from '../../../util/general';
 import { prefixUrlWithProtocol } from '../../../util/browser';
 import { formatTimestampToYYYYMMDD } from '../../../util/date';
 import MAX_TOKEN_ID_LENGTH from './nftDetails.utils';
-import Engine from '../../../core/Engine';
-import { toHex } from '@metamask/controller-utils';
-import { Hex } from '@metamask/utils';
 import { InitSendLocation } from '../confirmations/constants/send';
 import { useSendNavigation } from '../confirmations/hooks/useSendNavigation';
 
@@ -170,31 +167,17 @@ const NftDetails = () => {
     return Math.floor(date.getTime() / 1000);
   };
 
-  const onSend = useCallback(async () => {
-    const chainIdHex = toHex(collectible?.chainId as number) as Hex;
-    if (chainIdHex !== chainId) {
-      const { NetworkController, MultichainNetworkController } = Engine.context;
-      const networkConfiguration =
-        NetworkController.getNetworkConfigurationByChainId(chainIdHex);
-
-      const networkClientId =
-        networkConfiguration?.rpcEndpoints?.[
-          networkConfiguration.defaultRpcEndpointIndex
-        ]?.networkClientId;
-
-      await MultichainNetworkController.setActiveNetwork(
-        networkClientId as string,
-      );
-    }
+  const onSend = useCallback(() => {
     navigateToSendPage({
       location: InitSendLocation.NftDetails,
       asset: collectible,
     });
-  }, [collectible, chainId, navigateToSendPage]);
+  }, [collectible, navigateToSendPage]);
 
   const isTradable = useCallback(
     () =>
-      collectible.standard === 'ERC721' &&
+      (collectible.standard === 'ERC721' ||
+        collectible.standard === 'ERC1155') &&
       collectible.isCurrentlyOwned === true,
     [collectible],
   );
@@ -665,14 +648,13 @@ const NftDetails = () => {
 
       {isTradable() ? (
         <View style={styles.buttonSendWrapper}>
-          <StyledButton
-            type={'confirm'}
-            containerStyle={styles.buttonSend}
+          <Button
+            variant={ButtonVariant.Primary}
+            twClassName="flex-1"
             onPress={onSend}
-            disabled={false} // TODO check why ERC1155 is still disabled on mobile
           >
             {strings('transaction.send')}
-          </StyledButton>
+          </Button>
         </View>
       ) : null}
     </SafeAreaView>
diff --git a/app/components/Views/NftDetails/__snapshots__/NftDetails.test.ts.snap b/app/components/Views/NftDetails/__snapshots__/NftDetails.test.ts.snap
index 9471a3bf83f3..59830404c0f8 100644
--- a/app/components/Views/NftDetails/__snapshots__/NftDetails.test.ts.snap
+++ b/app/components/Views/NftDetails/__snapshots__/NftDetails.test.ts.snap
@@ -1315,60 +1315,93 @@ exports[`NftDetails renders correctly 1`] = `
                           }
                         }
                       >
-                        <TouchableOpacity
+                        <View
+                          accessibilityLabel="Send"
                           accessibilityRole="button"
+                          accessibilityState={
+                            {
+                              "busy": undefined,
+                              "checked": undefined,
+                              "disabled": false,
+                              "expanded": undefined,
+                              "selected": undefined,
+                            }
+                          }
+                          accessibilityValue={
+                            {
+                              "max": undefined,
+                              "min": undefined,
+                              "now": undefined,
+                              "text": undefined,
+                            }
+                          }
                           accessible={true}
-                          activeOpacity={0.2}
-                          disabled={false}
-                          onPress={[Function]}
+                          collapsable={false}
+                          focusable={true}
+                          onBlur={[Function]}
+                          onClick={[Function]}
+                          onFocus={[Function]}
+                          onResponderGrant={[Function]}
+                          onResponderMove={[Function]}
+                          onResponderRelease={[Function]}
+                          onResponderTerminate={[Function]}
+                          onResponderTerminationRequest={[Function]}
+                          onStartShouldSetResponder={[Function]}
                           style={
                             [
-                              [
-                                {
-                                  "borderRadius": 12,
-                                  "justifyContent": "center",
-                                  "padding": 15,
-                                },
-                                {
-                                  "backgroundColor": "#4459ff",
-                                  "minHeight": 50,
-                                },
-                                {
-                                  "flexGrow": 1,
-                                },
-                              ],
-                              null,
+                              {
+                                "alignItems": "center",
+                                "alignSelf": "flex-start",
+                                "backgroundColor": "#131416",
+                                "borderRadius": 12,
+                                "columnGap": 8,
+                                "flexBasis": "0%",
+                                "flexDirection": "row",
+                                "flexGrow": 1,
+                                "flexShrink": 1,
+                                "height": 48,
+                                "justifyContent": "center",
+                                "minWidth": 80,
+                                "opacity": 1,
+                                "overflow": "hidden",
+                                "paddingLeft": 16,
+                                "paddingRight": 16,
+                              },
+                              {
+                                "transform": [
+                                  {
+                                    "scale": 1,
+                                  },
+                                ],
+                              },
                             ]
                           }
                         >
                           <Text
+                            accessibilityRole="text"
+                            ellipsizeMode="clip"
+                            numberOfLines={1}
                             style={
                               [
                                 {
-                                  "color": "#007aff",
-                                  "fontSize": 17,
-                                  "fontWeight": "500",
+                                  "color": "#ffffff",
+                                  "flexGrow": 0,
+                                  "flexShrink": 1,
+                                  "flexWrap": "wrap",
+                                  "fontFamily": "Geist-Medium",
+                                  "fontSize": 16,
+                                  "fontWeight": 400,
+                                  "letterSpacing": 0,
+                                  "lineHeight": 24,
                                   "textAlign": "center",
                                 },
-                                null,
-                                [
-                                  {
-                                    "fontFamily": "Geist-Bold",
-                                    "fontSize": 14,
-                                    "textAlign": "center",
-                                  },
-                                  {
-                                    "color": "#ffffff",
-                                  },
-                                  undefined,
-                                ],
-                                null,
+                                undefined,
                               ]
                             }
                           >
                             Send
                           </Text>
-                        </TouchableOpacity>
+                        </View>
                       </View>
                     </RCTSafeAreaView>
                   </View>
diff --git a/app/components/Views/OAuthRehydration/index.test.tsx b/app/components/Views/OAuthRehydration/index.test.tsx
index 04ed0b58c6a5..736439227b1a 100644
--- a/app/components/Views/OAuthRehydration/index.test.tsx
+++ b/app/components/Views/OAuthRehydration/index.test.tsx
@@ -36,6 +36,7 @@ const mockReauthenticate = jest.fn();
 const mockRevealSRP = jest.fn();
 const mockRevealPrivateKey = jest.fn();
 const mockRequestBiometricsAccessControlForIOS = jest.fn();
+const mockUpdateAuthPreference = jest.fn();
 
 jest.mock('../../../core/Authentication/hooks/useAuthentication', () => ({
   __esModule: true,
@@ -49,6 +50,7 @@ jest.mock('../../../core/Authentication/hooks/useAuthentication', () => ({
     revealPrivateKey: mockRevealPrivateKey,
     requestBiometricsAccessControlForIOS:
       mockRequestBiometricsAccessControlForIOS,
+    updateAuthPreference: mockUpdateAuthPreference,
   }),
 }));
 
@@ -191,6 +193,7 @@ describe('OAuthRehydration', () => {
     mockRequestBiometricsAccessControlForIOS.mockResolvedValue(
       AUTHENTICATION_TYPE.PASSWORD,
     );
+    mockUpdateAuthPreference.mockResolvedValue(undefined);
     mockUseNetInfo.mockReturnValue({
       isConnected: true,
       isInternetReachable: true,
@@ -220,6 +223,9 @@ describe('OAuthRehydration', () => {
       await waitFor(() => {
         expect(mockReplace).toHaveBeenCalledWith(Routes.ONBOARDING.HOME_NAV);
       });
+      expect(mockUnlockWallet.mock.invocationCallOrder[0]).toBeLessThan(
+        mockRequestBiometricsAccessControlForIOS.mock.invocationCallOrder[0],
+      );
       expect(mockRequestBiometricsAccessControlForIOS).toHaveBeenCalledWith(
         AUTHENTICATION_TYPE.DEVICE_AUTHENTICATION,
       );
@@ -233,6 +239,47 @@ describe('OAuthRehydration', () => {
         expect(mockTrackOnboarding).toHaveBeenCalled();
       });
     });
+
+    it('logs error when post-unlock biometric prompt fails', async () => {
+      const biometricError = new Error('Biometric prompt failed');
+      mockRequestBiometricsAccessControlForIOS.mockRejectedValueOnce(
+        biometricError,
+      );
+
+      const { getByTestId } = renderWithProvider(<OAuthRehydration />);
+      await enterPasswordAndSubmit(getByTestId);
+
+      await waitFor(() => {
+        expect(mockUnlockWallet).toHaveBeenCalled();
+      });
+      await waitFor(() => {
+        expect(Logger.error).toHaveBeenCalledWith(
+          biometricError,
+          'OAuthRehydration: post-unlock biometric preference',
+        );
+      });
+    });
+
+    it('logs error when updateAuthPreference fails after choosing device auth', async () => {
+      mockRequestBiometricsAccessControlForIOS.mockResolvedValueOnce(
+        AUTHENTICATION_TYPE.DEVICE_AUTHENTICATION,
+      );
+      const preferenceError = new Error('Keychain preference update failed');
+      mockUpdateAuthPreference.mockRejectedValueOnce(preferenceError);
+
+      const { getByTestId } = renderWithProvider(<OAuthRehydration />);
+      await enterPasswordAndSubmit(getByTestId);
+
+      await waitFor(() => {
+        expect(mockUpdateAuthPreference).toHaveBeenCalled();
+      });
+      await waitFor(() => {
+        expect(Logger.error).toHaveBeenCalledWith(
+          preferenceError,
+          'OAuthRehydration: post-unlock biometric preference',
+        );
+      });
+    });
   });
 
   describe('Password validation', () => {
@@ -246,6 +293,18 @@ describe('OAuthRehydration', () => {
       });
     });
 
+    it('does not prompt biometrics when password unlock fails', async () => {
+      mockUnlockWallet.mockRejectedValue(new Error('Error: Decrypt failed'));
+      const { getByTestId } = renderWithProvider(<OAuthRehydration />);
+      await enterPasswordAndSubmit(getByTestId, 'wrongPassword');
+
+      await waitFor(() => {
+        expect(getByTestId(LoginViewSelectors.PASSWORD_ERROR)).toBeTruthy();
+      });
+      expect(mockRequestBiometricsAccessControlForIOS).not.toHaveBeenCalled();
+      expect(mockUpdateAuthPreference).not.toHaveBeenCalled();
+    });
+
     it('clears error when user types new password', async () => {
       mockUnlockWallet.mockRejectedValue(new Error('Error: Decrypt failed'));
       const { getByTestId } = renderWithProvider(<OAuthRehydration />);
@@ -858,10 +917,28 @@ describe('OAuthRehydration', () => {
           expect.objectContaining({
             authPreference: expect.objectContaining({
               oauth2Login: false,
+              currentAuthType: AUTHENTICATION_TYPE.PASSWORD,
             }),
           }),
         );
       });
+      expect(mockUnlockWallet.mock.invocationCallOrder[0]).toBeLessThan(
+        mockRequestBiometricsAccessControlForIOS.mock.invocationCallOrder[0],
+      );
+      expect(mockRequestBiometricsAccessControlForIOS).toHaveBeenCalledWith(
+        AUTHENTICATION_TYPE.DEVICE_AUTHENTICATION,
+      );
+    });
+
+    it('does not prompt biometrics before unlock when password is wrong (outdated password flow)', async () => {
+      mockUnlockWallet.mockRejectedValue(new Error('Error: Decrypt failed'));
+      const { getByTestId } = renderWithProvider(<OAuthRehydration />);
+      await enterPasswordAndSubmit(getByTestId, 'wrongPassword');
+
+      await waitFor(() => {
+        expect(getByTestId(LoginViewSelectors.PASSWORD_ERROR)).toBeTruthy();
+      });
+      expect(mockRequestBiometricsAccessControlForIOS).not.toHaveBeenCalled();
     });
 
     it('navigates to DELETE_WALLET modal on forgot password press', () => {
diff --git a/app/components/Views/OAuthRehydration/index.tsx b/app/components/Views/OAuthRehydration/index.tsx
index 28361a07ad7c..b5af10540764 100644
--- a/app/components/Views/OAuthRehydration/index.tsx
+++ b/app/components/Views/OAuthRehydration/index.tsx
@@ -150,8 +150,38 @@ const OAuthRehydration: React.FC<OAuthRehydrationProps> = ({
 
   const passwordLoginAttemptTraceCtxRef = useRef<TraceContext | null>(null);
 
-  const { unlockWallet, getAuthType, requestBiometricsAccessControlForIOS } =
-    useAuthentication();
+  const {
+    unlockWallet,
+    getAuthType,
+    requestBiometricsAccessControlForIOS,
+    updateAuthPreference,
+  } = useAuthentication();
+
+  /**
+   * After a successful password unlock, offer device auth / biometrics for keychain storage.
+   */
+  const upgradeKeychainAuthAfterSuccessfulUnlock = useCallback(async () => {
+    try {
+      const upgradeAuthType = await requestBiometricsAccessControlForIOS(
+        AUTHENTICATION_TYPE.DEVICE_AUTHENTICATION,
+      );
+      if (upgradeAuthType !== AUTHENTICATION_TYPE.PASSWORD) {
+        await updateAuthPreference({
+          authType: upgradeAuthType,
+          password,
+          fallbackToPassword: true,
+        });
+      }
+    } catch (postUnlockAuthErr) {
+      Logger.error(
+        ensureError(
+          postUnlockAuthErr,
+          'Post-unlock auth preference update failed',
+        ),
+        'OAuthRehydration: post-unlock biometric preference',
+      );
+    }
+  }, [password, requestBiometricsAccessControlForIOS, updateAuthPreference]);
 
   const track = useCallback(
     (
@@ -485,14 +515,9 @@ const OAuthRehydration: React.FC<OAuthRehydrationProps> = ({
 
       setLoading(true);
 
-      // Ask user to allow biometrics access control
-      const authType = await requestBiometricsAccessControlForIOS(
-        AUTHENTICATION_TYPE.DEVICE_AUTHENTICATION,
-      );
-
-      // Only set oauth2Login for normal rehydration, not when password is outdated
+      // Password first: do not prompt biometrics until unlock succeeds
       const authData: AuthData = {
-        currentAuthType: authType,
+        currentAuthType: AUTHENTICATION_TYPE.PASSWORD,
         oauth2Login: true,
       };
 
@@ -506,6 +531,8 @@ const OAuthRehydration: React.FC<OAuthRehydrationProps> = ({
         },
       );
 
+      await upgradeKeychainAuthAfterSuccessfulUnlock();
+
       // Best-effort post-unlock UX: show biometric cancelled alert if needed.
       // Failure here must not be treated as a login error — unlock already succeeded.
       try {
@@ -542,7 +569,7 @@ const OAuthRehydration: React.FC<OAuthRehydrationProps> = ({
     track,
     promptBiometricFailedAlert,
     unlockWallet,
-    requestBiometricsAccessControlForIOS,
+    upgradeKeychainAuthAfterSuccessfulUnlock,
   ]);
 
   const newGlobalPasswordLogin = useCallback(async () => {
@@ -551,14 +578,9 @@ const OAuthRehydration: React.FC<OAuthRehydrationProps> = ({
 
       setLoading(true);
 
-      // Ask user to allow biometrics access control
-      const authType = await requestBiometricsAccessControlForIOS(
-        AUTHENTICATION_TYPE.DEVICE_AUTHENTICATION,
-      );
-
-      // Only set oauth2Login for normal rehydration, not when password is outdated
+      // biometrics/passcode preference is applied only after sync succeeds
       const authData: AuthData = {
-        currentAuthType: authType,
+        currentAuthType: AUTHENTICATION_TYPE.PASSWORD,
         oauth2Login: false,
       };
 
@@ -572,6 +594,8 @@ const OAuthRehydration: React.FC<OAuthRehydrationProps> = ({
         },
       );
 
+      await upgradeKeychainAuthAfterSuccessfulUnlock();
+
       // Best-effort post-unlock UX: show biometric cancelled alert if needed.
       // Failure here must not be treated as a login error — unlock already succeeded.
       try {
@@ -593,7 +617,7 @@ const OAuthRehydration: React.FC<OAuthRehydrationProps> = ({
     handleLoginError,
     promptBiometricFailedAlert,
     unlockWallet,
-    requestBiometricsAccessControlForIOS,
+    upgradeKeychainAuthAfterSuccessfulUnlock,
   ]);
 
   // Cleanup for isMountedRef tracking
diff --git a/app/components/Views/RevealPrivateCredential/RevealPrivateCredential.tsx b/app/components/Views/RevealPrivateCredential/RevealPrivateCredential.tsx
index d7a4559d0a5d..ab03dc24c886 100644
--- a/app/components/Views/RevealPrivateCredential/RevealPrivateCredential.tsx
+++ b/app/components/Views/RevealPrivateCredential/RevealPrivateCredential.tsx
@@ -18,13 +18,11 @@ import ActionView from '../../UI/ActionView';
 import { ScreenshotDeterrent } from '../../UI/ScreenshotDeterrent';
 import { SRP_GUIDE_URL } from '../../../constants/urls';
 import ClipboardManager from '../../../core/ClipboardManager';
-import { useTheme } from '../../../util/theme';
 import { MetaMetricsEvents } from '../../../core/Analytics/MetaMetrics.events';
 import { passwordRequirementsMet } from '../../../util/password';
 import Device from '../../../util/device';
 import { strings } from '../../../../locales/i18n';
 import AppConstants from '../../../core/AppConstants';
-import { createStyles } from './styles';
 import { RevealSeedViewSelectorsIDs } from './RevealSeedView.testIds';
 import { selectSelectedInternalAccountFormattedAddress } from '../../../selectors/accountsController';
 import { useAnalytics } from '../../../components/hooks/useAnalytics/useAnalytics';
@@ -48,6 +46,7 @@ import {
 import { useRevealCredential, useSRPQuiz } from './hooks';
 import { IRevealPrivateCredentialProps, RevealSrpStage } from './types';
 import HeaderCompactStandard from '../../../component-library/components-temp/HeaderCompactStandard';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 
 const RevealPrivateCredential = ({
   navigation,
@@ -68,11 +67,8 @@ const RevealPrivateCredential = ({
   const checkSummedAddress = useSelector(
     selectSelectedInternalAccountFormattedAddress,
   );
-
-  const theme = useTheme();
   const { trackEvent, createEventBuilder } = useAnalytics();
-  const { colors } = theme;
-  const styles = createStyles(theme, colors);
+  const tw = useTailwind();
 
   const selectedAddress =
     route?.params?.selectedAccount?.address || checkSummedAddress;
@@ -281,7 +277,7 @@ const RevealPrivateCredential = ({
             {strings('reveal_credential.seed_phrase_warning_explanation')}
           </Text>
         }
-        style={styles.warningWrapper}
+        style={tw.style('text-body-sm mt-6')}
       />
     </Box>
   );
@@ -335,7 +331,6 @@ const RevealPrivateCredential = ({
             onRevealSeedPhrase={() => setShowSeedPhrase(!showSeedPhrase)}
             onCopyToClipboard={copyPrivateCredentialToClipboard}
             onTabChange={onTabBarChange}
-            styles={styles}
           />
         ) : (
           <Box twClassName="p-5 pb-0">
@@ -345,7 +340,6 @@ const RevealPrivateCredential = ({
               warningMessage={warningIncorrectPassword}
               showPassword={showPassword}
               onToggleShowPassword={() => setShowPassword(!showPassword)}
-              styles={styles}
             />
           </Box>
         )}
@@ -359,7 +353,6 @@ const RevealPrivateCredential = ({
         <SRPQuizIntroduction
           onGetStarted={handleGetStartedClick}
           onLearnMore={handleLearnMoreClick}
-          styles={styles}
         />
       );
     }
@@ -372,7 +365,6 @@ const RevealPrivateCredential = ({
           onAnswerClick={handleQuestionAnswerClick}
           onContinueClick={handleAnsweredQuestionClick}
           onLearnMore={handleLearnMoreClick}
-          styles={styles}
         />
       );
     }
diff --git a/app/components/Views/RevealPrivateCredential/components/PasswordEntry.tsx b/app/components/Views/RevealPrivateCredential/components/PasswordEntry.tsx
index 5852f054a72c..8b5b6f1486f8 100644
--- a/app/components/Views/RevealPrivateCredential/components/PasswordEntry.tsx
+++ b/app/components/Views/RevealPrivateCredential/components/PasswordEntry.tsx
@@ -1,13 +1,19 @@
 import React from 'react';
-import { ButtonIcon, IconName } from '@metamask/design-system-react-native';
-import Text, {
+import {
+  TextField,
+  IconName,
   TextVariant,
-} from '../../../../component-library/components/Texts/Text';
-import TextField from '../../../../component-library/components/Form/TextField/TextField';
+  Text,
+  TextFieldSize,
+  FontWeight,
+  ButtonIcon,
+  TextColor,
+} from '@metamask/design-system-react-native';
 import { strings } from '../../../../../locales/i18n';
 import { RevealSeedViewSelectorsIDs } from '../RevealSeedView.testIds';
 import { useTheme } from '../../../../util/theme';
 import { PasswordEntryProps } from '../types';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 
 const PasswordEntry = ({
   onPasswordChange,
@@ -15,13 +21,18 @@ const PasswordEntry = ({
   warningMessage,
   showPassword,
   onToggleShowPassword,
-  styles,
 }: PasswordEntryProps) => {
+  const tw = useTailwind();
   const { colors, themeAppearance } = useTheme();
 
   return (
     <>
-      <Text style={styles.enterPassword} variant={TextVariant.BodyMDMedium}>
+      <Text
+        twClassName="mb-1"
+        color={TextColor.TextDefault}
+        variant={TextVariant.BodyMd}
+        fontWeight={FontWeight.Medium}
+      >
         {strings('reveal_credential.enter_password')}
       </Text>
       <TextField
@@ -33,6 +44,7 @@ const PasswordEntry = ({
         onSubmitEditing={onSubmit}
         keyboardAppearance={themeAppearance}
         testID={RevealSeedViewSelectorsIDs.PASSWORD_INPUT_BOX_ID}
+        accessibilityLabel={RevealSeedViewSelectorsIDs.PASSWORD_INPUT_BOX_ID}
         returnKeyType="done"
         autoComplete="password"
         endAccessory={
@@ -41,9 +53,12 @@ const PasswordEntry = ({
             onPress={onToggleShowPassword}
           />
         }
+        size={TextFieldSize.Lg}
       />
       <Text
-        style={styles.warningText}
+        twClassName="mt-2"
+        color={TextColor.ErrorDefault}
+        variant={TextVariant.BodySm}
         testID={RevealSeedViewSelectorsIDs.PASSWORD_WARNING_ID}
       >
         {warningMessage}
diff --git a/app/components/Views/RevealPrivateCredential/components/SRPQuizIntroduction.tsx b/app/components/Views/RevealPrivateCredential/components/SRPQuizIntroduction.tsx
index e73d7cd02989..4a4ae529c8b3 100644
--- a/app/components/Views/RevealPrivateCredential/components/SRPQuizIntroduction.tsx
+++ b/app/components/Views/RevealPrivateCredential/components/SRPQuizIntroduction.tsx
@@ -1,74 +1,85 @@
 import React from 'react';
 import { Image } from 'react-native';
-import { ButtonSize } from '../../../../component-library/components/Buttons/Button';
-import ButtonPrimary from '../../../../component-library/components/Buttons/Button/variants/ButtonPrimary';
-import ButtonLink from '../../../../component-library/components/Buttons/Button/variants/ButtonLink';
-import Text, {
+import {
+  Box,
+  Text,
   TextColor,
   TextVariant,
-} from '../../../../component-library/components/Texts/Text';
-import { Box } from '../../../UI/Box/Box';
-import {
-  AlignItems,
-  FlexDirection,
-  JustifyContent,
-} from '../../../UI/Box/box.types';
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  BoxFlexDirection,
+  BoxAlignItems,
+  BoxJustifyContent,
+  TextButton,
+} from '@metamask/design-system-react-native';
 import SecurityQuizLockImage from '../../../../images/reveal_srp_intro.png';
 import { strings } from '../../../../../locales/i18n';
 import { ExportCredentialsIds } from '../../MultichainAccounts/AccountDetails/ExportCredentials.testIds';
 import { SrpQuizGetStartedSelectorsIDs } from '../../Quiz/SRPQuiz/SrpQuizModal.testIds';
 import { SRPQuizIntroductionProps } from '../types';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 
 const SRPQuizIntroduction = ({
   onGetStarted,
   onLearnMore,
-  styles,
-}: SRPQuizIntroductionProps) => (
-  <Box
-    testID={ExportCredentialsIds.CONTAINER}
-    style={styles.quizContainer}
-    flexDirection={FlexDirection.Column}
-    alignItems={AlignItems.center}
-    justifyContent={JustifyContent.spaceBetween}
-  >
+}: SRPQuizIntroductionProps) => {
+  const tw = useTailwind();
+
+  return (
     <Box
-      flexDirection={FlexDirection.Column}
-      alignItems={AlignItems.center}
-      justifyContent={JustifyContent.center}
+      testID={ExportCredentialsIds.CONTAINER}
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.Center}
+      justifyContent={BoxJustifyContent.Between}
+      paddingTop={8}
+      paddingHorizontal={4}
+      paddingBottom={6}
+      twClassName="flex-1 w-full"
     >
-      <Image
-        source={SecurityQuizLockImage}
-        style={styles.securityQuizLockImage}
-      />
-      <Text
-        variant={TextVariant.BodyMD}
-        color={TextColor.Alternative}
-        style={styles.quizDescription}
+      <Box
+        flexDirection={BoxFlexDirection.Column}
+        alignItems={BoxAlignItems.Center}
+        justifyContent={BoxJustifyContent.Center}
       >
-        {strings('multichain_accounts.reveal_srp.description')}
-      </Text>
-    </Box>
-    <Box
-      flexDirection={FlexDirection.Column}
-      alignItems={AlignItems.center}
-      style={styles.quizButtonContainer}
-      gap={16}
-    >
-      <ButtonPrimary
-        onPress={onGetStarted}
-        size={ButtonSize.Lg}
-        label={strings('multichain_accounts.reveal_srp.get_started')}
-        testID={SrpQuizGetStartedSelectorsIDs.BUTTON}
-        style={styles.button}
-      />
-      <ButtonLink
-        onPress={onLearnMore}
-        label={strings('multichain_accounts.reveal_srp.learn_more')}
-        testID={ExportCredentialsIds.LEARN_MORE_BUTTON}
-        style={styles.button}
-      />
+        <Image
+          source={SecurityQuizLockImage}
+          style={tw.style('h-[184px] w-[205px]')}
+        />
+        <Text
+          variant={TextVariant.BodyMd}
+          color={TextColor.TextAlternative}
+          twClassName="mt-6"
+        >
+          {strings('multichain_accounts.reveal_srp.description')}
+        </Text>
+      </Box>
+      <Box
+        flexDirection={BoxFlexDirection.Column}
+        alignItems={BoxAlignItems.Center}
+        justifyContent={BoxJustifyContent.Center}
+        gap={4}
+        twClassName="w-full"
+      >
+        <Button
+          variant={ButtonVariant.Primary}
+          onPress={onGetStarted}
+          size={ButtonSize.Lg}
+          testID={SrpQuizGetStartedSelectorsIDs.BUTTON}
+          twClassName="w-full text-center"
+        >
+          {strings('multichain_accounts.reveal_srp.get_started')}
+        </Button>
+        <TextButton
+          onPress={onLearnMore}
+          testID={ExportCredentialsIds.LEARN_MORE_BUTTON}
+          twClassName="w-full text-center flex items-center justify-center self-center"
+        >
+          {strings('multichain_accounts.reveal_srp.learn_more')}
+        </TextButton>
+      </Box>
     </Box>
-  </Box>
-);
+  );
+};
 
 export default SRPQuizIntroduction;
diff --git a/app/components/Views/RevealPrivateCredential/components/SRPSecurityQuiz.tsx b/app/components/Views/RevealPrivateCredential/components/SRPSecurityQuiz.tsx
index 0f9aed1d69f3..ecb487882dd9 100644
--- a/app/components/Views/RevealPrivateCredential/components/SRPSecurityQuiz.tsx
+++ b/app/components/Views/RevealPrivateCredential/components/SRPSecurityQuiz.tsx
@@ -1,23 +1,20 @@
 import React from 'react';
-import { ButtonSize } from '../../../../component-library/components/Buttons/Button';
-import ButtonPrimary from '../../../../component-library/components/Buttons/Button/variants/ButtonPrimary';
-import ButtonSecondary from '../../../../component-library/components/Buttons/Button/variants/ButtonSecondary';
-import ButtonLink from '../../../../component-library/components/Buttons/Button/variants/ButtonLink';
-import Text, {
+import {
+  Box,
+  Text,
   TextColor,
   TextVariant,
-} from '../../../../component-library/components/Texts/Text';
-import { Box } from '../../../UI/Box/Box';
-import {
-  AlignItems,
-  FlexDirection,
-  JustifyContent,
-} from '../../../UI/Box/box.types';
-import {
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  IconName,
+  BoxFlexDirection,
+  BoxAlignItems,
+  BoxJustifyContent,
   Icon,
   IconColor,
-  IconName,
   IconSize,
+  TextButton,
 } from '@metamask/design-system-react-native';
 import { strings } from '../../../../../locales/i18n';
 import { ExportCredentialsIds } from '../../MultichainAccounts/AccountDetails/ExportCredentials.testIds';
@@ -34,20 +31,19 @@ const SRPSecurityQuiz = ({
   onAnswerClick,
   onContinueClick,
   onLearnMore,
-  styles,
 }: SRPSecurityQuizProps) => {
   const renderQuestionResult = () => (
     <Box
-      flexDirection={FlexDirection.Column}
-      alignItems={AlignItems.flexStart}
-      justifyContent={JustifyContent.flexStart}
-      gap={16}
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.Start}
+      justifyContent={BoxJustifyContent.Start}
+      gap={4}
     >
       <Box
-        flexDirection={FlexDirection.Row}
-        alignItems={AlignItems.center}
-        justifyContent={JustifyContent.center}
-        gap={8}
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        justifyContent={BoxJustifyContent.Center}
+        gap={1}
       >
         <Icon
           name={correctAnswer ? IconName.Confirmation : IconName.CircleX}
@@ -57,8 +53,10 @@ const SRPSecurityQuiz = ({
           }
         />
         <Text
-          variant={TextVariant.HeadingLG}
-          color={correctAnswer ? TextColor.Success : TextColor.Error}
+          variant={TextVariant.HeadingLg}
+          color={
+            correctAnswer ? TextColor.SuccessDefault : TextColor.ErrorDefault
+          }
         >
           {strings(
             correctAnswer
@@ -69,19 +67,19 @@ const SRPSecurityQuiz = ({
       </Box>
       {currentQuestionIndex === 1 && (
         <Box
-          flexDirection={FlexDirection.Column}
-          alignItems={AlignItems.flexStart}
-          justifyContent={JustifyContent.flexStart}
-          gap={16}
+          flexDirection={BoxFlexDirection.Column}
+          alignItems={BoxAlignItems.Start}
+          justifyContent={BoxJustifyContent.Start}
+          gap={4}
         >
-          <Text variant={TextVariant.HeadingLG} color={TextColor.Default}>
+          <Text variant={TextVariant.HeadingLg} color={TextColor.TextDefault}>
             {strings(
               correctAnswer
                 ? 'srp_security_quiz.question_one.right_answer_title'
                 : 'srp_security_quiz.question_one.wrong_answer_title',
             )}
           </Text>
-          <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
+          <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
             {strings(
               correctAnswer
                 ? 'srp_security_quiz.question_one.right_answer_description'
@@ -92,19 +90,19 @@ const SRPSecurityQuiz = ({
       )}
       {currentQuestionIndex === 2 && (
         <Box
-          flexDirection={FlexDirection.Column}
-          alignItems={AlignItems.flexStart}
-          justifyContent={JustifyContent.flexStart}
-          gap={16}
+          flexDirection={BoxFlexDirection.Column}
+          alignItems={BoxAlignItems.Start}
+          justifyContent={BoxJustifyContent.Start}
+          gap={4}
         >
-          <Text variant={TextVariant.HeadingLG} color={TextColor.Default}>
+          <Text variant={TextVariant.HeadingLg} color={TextColor.TextDefault}>
             {strings(
               correctAnswer
                 ? 'srp_security_quiz.question_two.right_answer_title'
                 : 'srp_security_quiz.question_two.wrong_answer_title',
             )}
           </Text>
-          <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
+          <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
             {strings(
               correctAnswer
                 ? 'srp_security_quiz.question_two.right_answer_description'
@@ -118,64 +116,68 @@ const SRPSecurityQuiz = ({
 
   const renderAnswerButtons = () => (
     <Box
-      flexDirection={FlexDirection.Column}
-      alignItems={AlignItems.center}
-      style={styles.quizButtonContainer}
-      gap={16}
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.End}
+      justifyContent={BoxJustifyContent.End}
+      twClassName="w-full flex-1"
+      gap={4}
     >
-      <ButtonSecondary
+      <Button
+        variant={ButtonVariant.Secondary}
         onPress={() => onAnswerClick(1)}
         size={ButtonSize.Lg}
-        label={strings(
-          currentQuestionIndex === 1
-            ? 'srp_security_quiz.question_one.wrong_answer'
-            : 'srp_security_quiz.question_two.right_answer',
-        )}
         testID={
           currentQuestionIndex === 1
             ? SrpSecurityQuestionOneSelectorsIDs.WRONG_ANSWER
             : SrpSecurityQuestionTwoSelectorsIDs.RIGHT_ANSWER
         }
-        style={styles.button}
-      />
-      <ButtonSecondary
-        onPress={() => onAnswerClick(2)}
-        size={ButtonSize.Lg}
-        label={strings(
+        twClassName="w-full text-center"
+      >
+        {strings(
           currentQuestionIndex === 1
-            ? 'srp_security_quiz.question_one.right_answer'
-            : 'srp_security_quiz.question_two.wrong_answer',
+            ? 'srp_security_quiz.question_one.wrong_answer'
+            : 'srp_security_quiz.question_two.right_answer',
         )}
+      </Button>
+      <Button
+        variant={ButtonVariant.Secondary}
+        onPress={() => onAnswerClick(2)}
+        size={ButtonSize.Lg}
         testID={
           currentQuestionIndex === 1
             ? SrpSecurityQuestionOneSelectorsIDs.RIGHT_ANSWER
             : SrpSecurityQuestionTwoSelectorsIDs.WRONG_ANSWER
         }
-        style={styles.button}
-      />
-      <ButtonLink
+        twClassName="w-full text-center"
+      >
+        {strings(
+          currentQuestionIndex === 1
+            ? 'srp_security_quiz.question_one.right_answer'
+            : 'srp_security_quiz.question_two.wrong_answer',
+        )}
+      </Button>
+      <TextButton
         onPress={onLearnMore}
-        label={strings('multichain_accounts.reveal_srp.learn_more')}
         testID={ExportCredentialsIds.LEARN_MORE_BUTTON}
-        style={styles.button}
-      />
+        twClassName="w-full text-center flex items-center justify-center"
+      >
+        {strings('multichain_accounts.reveal_srp.learn_more')}
+      </TextButton>
     </Box>
   );
 
   const renderAnsweredButtons = () => (
     <Box
-      flexDirection={FlexDirection.Column}
-      style={styles.quizAnsweredContainer}
-      gap={16}
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.End}
+      justifyContent={BoxJustifyContent.End}
+      twClassName="w-full flex-1"
+      gap={4}
     >
-      <ButtonPrimary
+      <Button
+        variant={ButtonVariant.Primary}
         onPress={onContinueClick}
         size={ButtonSize.Lg}
-        label={strings(
-          correctAnswer
-            ? 'srp_security_quiz.continue'
-            : 'srp_security_quiz.try_again',
-        )}
         testID={
           correctAnswer
             ? currentQuestionIndex === 1
@@ -185,28 +187,38 @@ const SRPSecurityQuiz = ({
               ? SrpSecurityQuestionOneSelectorsIDs.WRONG_ANSWER_TRY_AGAIN_BUTTON
               : SrpSecurityQuestionTwoSelectorsIDs.WRONG_ANSWER_TRY_AGAIN_BUTTON
         }
-        style={styles.button}
-      />
-      <ButtonLink
+        twClassName="w-full text-center"
+      >
+        {strings(
+          correctAnswer
+            ? 'srp_security_quiz.continue'
+            : 'srp_security_quiz.try_again',
+        )}
+      </Button>
+      <TextButton
         onPress={onLearnMore}
-        label={strings('multichain_accounts.reveal_srp.learn_more')}
         testID={ExportCredentialsIds.LEARN_MORE_BUTTON}
-        style={styles.button}
-      />
+        twClassName="w-full text-center flex items-center justify-center"
+      >
+        {strings('multichain_accounts.reveal_srp.learn_more')}
+      </TextButton>
     </Box>
   );
 
   return (
     <Box
-      style={styles.quizQuestionContainer}
-      flexDirection={FlexDirection.Column}
-      alignItems={AlignItems.flexStart}
-      justifyContent={JustifyContent.flexStart}
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.Start}
+      justifyContent={BoxJustifyContent.Start}
+      twClassName="w-full flex-1"
+      paddingHorizontal={4}
+      paddingTop={2}
+      paddingBottom={6}
     >
       <Text
-        variant={TextVariant.BodyMD}
-        color={TextColor.Alternative}
-        style={styles.stepIndicatorContainer}
+        variant={TextVariant.BodyMd}
+        color={TextColor.TextAlternative}
+        twClassName="mb-2"
       >
         {strings('srp_security_quiz.question_step', {
           step: currentQuestionIndex,
@@ -218,9 +230,9 @@ const SRPSecurityQuiz = ({
 
       {!questionAnswered && (
         <Text
-          variant={TextVariant.HeadingLG}
-          color={TextColor.Default}
-          style={styles.quizQuestion}
+          variant={TextVariant.HeadingLg}
+          color={TextColor.TextDefault}
+          twClassName="w-[90%] mb-6"
         >
           {strings(
             currentQuestionIndex === 1
diff --git a/app/components/Views/RevealPrivateCredential/components/SRPTabView.tsx b/app/components/Views/RevealPrivateCredential/components/SRPTabView.tsx
index efe15d918c93..66d79a7b2e9d 100644
--- a/app/components/Views/RevealPrivateCredential/components/SRPTabView.tsx
+++ b/app/components/Views/RevealPrivateCredential/components/SRPTabView.tsx
@@ -1,5 +1,11 @@
 import React from 'react';
-import { Dimensions, ScrollView, View } from 'react-native';
+import { Dimensions, ScrollView, Platform } from 'react-native';
+import {
+  Box,
+  BoxJustifyContent,
+  BoxAlignItems,
+  BoxFlexDirection,
+} from '@metamask/design-system-react-native';
 import ScrollableTabView from '@tommasini/react-native-scrollable-tab-view';
 import QRCode from 'react-native-qrcode-svg';
 import TabBar from '../../../../component-library/components-temp/TabBar/TabBar';
@@ -10,6 +16,7 @@ import logo from '../../../../images/branding/fox.png';
 import SeedPhraseDisplay from './SeedPhraseDisplay';
 import SeedPhraseConcealer from './SeedPhraseConcealer';
 import { SRPTabViewProps } from '../types';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const CustomTabView = ScrollView as any;
@@ -21,7 +28,6 @@ const SRPTabView = ({
   onRevealSeedPhrase,
   onCopyToClipboard,
   onTabChange,
-  styles,
 }: SRPTabViewProps) => {
   const { colors } = useTheme();
   const trimmedCredential = clipboardPrivateCredential.trim();
@@ -29,42 +35,44 @@ const SRPTabView = ({
   const hasCredential = words.length > 0;
 
   const renderTabBar = () => <TabBar />;
+  const tw = useTailwind();
 
   return (
-    <View style={styles.tabContainer}>
+    <Box paddingHorizontal={4}>
       <ScrollableTabView
         renderTabBar={() => renderTabBar()}
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         onChangeTab={(event: any) => onTabChange(event)}
-        style={styles.tabContentContainer}
+        style={tw.style(
+          `min-h-[${Platform.OS === 'android' ? 320 : 0}px] flex-grow flex-shrink-0 mb-[${Platform.OS === 'android' ? 20 : 0}px]`,
+        )}
       >
         <CustomTabView
           tabLabel={strings(`reveal_credential.text`)}
           testID={RevealSeedViewSelectorsIDs.TAB_SCROLL_VIEW_TEXT}
         >
-          <View style={styles.seedPhraseView}>
+          <Box marginTop={4} twClassName="flex-1 w-full h-full min-h-[232px]">
             {showSeedPhrase ? (
               <SeedPhraseDisplay
                 words={words}
                 clipboardEnabled={clipboardEnabled && hasCredential}
                 onCopyToClipboard={onCopyToClipboard}
-                styles={styles}
                 showSeedPhrase={showSeedPhrase}
               />
             ) : (
-              <SeedPhraseConcealer
-                onReveal={onRevealSeedPhrase}
-                styles={styles}
-              />
+              <SeedPhraseConcealer onReveal={onRevealSeedPhrase} />
             )}
-          </View>
+          </Box>
         </CustomTabView>
         <CustomTabView
           tabLabel={strings(`reveal_credential.qr_code`)}
           testID={RevealSeedViewSelectorsIDs.TAB_SCROLL_VIEW_QR_CODE}
         >
-          <View
-            style={styles.qrCodeWrapper}
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Center}
+            marginTop={4}
             testID={
               RevealSeedViewSelectorsIDs.REVEAL_CREDENTIAL_QR_CODE_IMAGE_ID
             }
@@ -79,10 +87,10 @@ const SRPTabView = ({
                 color={colors.text.default}
               />
             ) : null}
-          </View>
+          </Box>
         </CustomTabView>
       </ScrollableTabView>
-    </View>
+    </Box>
   );
 };
 
diff --git a/app/components/Views/RevealPrivateCredential/components/SeedPhraseConcealer.tsx b/app/components/Views/RevealPrivateCredential/components/SeedPhraseConcealer.tsx
index 51a5b832686f..e22a707c9f88 100644
--- a/app/components/Views/RevealPrivateCredential/components/SeedPhraseConcealer.tsx
+++ b/app/components/Views/RevealPrivateCredential/components/SeedPhraseConcealer.tsx
@@ -1,15 +1,16 @@
 import React from 'react';
-import { ImageBackground, TouchableOpacity, View } from 'react-native';
+import { ImageBackground, TouchableOpacity } from 'react-native';
 import {
   Icon,
   IconColor,
   IconName,
   IconSize,
-} from '@metamask/design-system-react-native';
-import Text, {
+  Box,
+  Text,
   TextColor,
   TextVariant,
-} from '../../../../component-library/components/Texts/Text';
+  FontWeight,
+} from '@metamask/design-system-react-native';
 import { strings } from '../../../../../locales/i18n';
 import { RevealSeedViewSelectorsIDs } from '../RevealSeedView.testIds';
 import { AppThemeKey } from '../../../../util/theme/models';
@@ -17,42 +18,51 @@ import { useTheme } from '../../../../util/theme';
 import blurImage from '../../../../images/blur.png';
 import darkBlurImage from '../../../../images/dark-blur.png';
 import { SeedPhraseConcealerProps } from '../types';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+
+const FILL_STYLE =
+  'absolute top-0 left-0 bottom-0 right-0 h-full rounded-lg flex-1';
 
 const SeedPhraseConcealer = ({
   onReveal,
-  styles,
+  testID = RevealSeedViewSelectorsIDs.REVEAL_CREDENTIAL_BUTTON_ID,
 }: SeedPhraseConcealerProps) => {
   const { themeAppearance } = useTheme();
+  const tw = useTailwind();
 
   return (
-    <View style={styles.seedPhraseConcealerContainer}>
+    <Box twClassName="flex-1 rounded-lg">
       <TouchableOpacity
         onPress={onReveal}
-        style={styles.blurContainer}
-        testID={RevealSeedViewSelectorsIDs.REVEAL_CREDENTIAL_BUTTON_ID}
+        style={tw.style(FILL_STYLE)}
+        testID={testID}
       >
         <ImageBackground
           source={
             themeAppearance === AppThemeKey.dark ? darkBlurImage : blurImage
           }
-          style={styles.blurView}
+          style={tw.style(FILL_STYLE, 'opacity-50')}
           resizeMode="cover"
         />
-        <View style={styles.seedPhraseConcealer}>
+        <Box twClassName="items-center justify-center rounded-lg px-6 py-[45px] gap-y-4 h-full flex-1">
           <Icon
             name={IconName.EyeSlash}
             size={IconSize.Xl}
             color={IconColor.IconDefault}
           />
-          <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
+          <Text
+            variant={TextVariant.BodyMd}
+            fontWeight={FontWeight.Medium}
+            color={TextColor.TextDefault}
+          >
             {strings('manual_backup_step_1.reveal')}
           </Text>
-          <Text variant={TextVariant.BodySM} color={TextColor.Default}>
+          <Text variant={TextVariant.BodySm} color={TextColor.TextDefault}>
             {strings('manual_backup_step_1.watching')}
           </Text>
-        </View>
+        </Box>
       </TouchableOpacity>
-    </View>
+    </Box>
   );
 };
 
diff --git a/app/components/Views/RevealPrivateCredential/components/SeedPhraseDisplay.tsx b/app/components/Views/RevealPrivateCredential/components/SeedPhraseDisplay.tsx
index d4ec703f5cb7..8f17ff50a56e 100644
--- a/app/components/Views/RevealPrivateCredential/components/SeedPhraseDisplay.tsx
+++ b/app/components/Views/RevealPrivateCredential/components/SeedPhraseDisplay.tsx
@@ -1,20 +1,20 @@
 import React from 'react';
-import { FlatList, View } from 'react-native';
-import Button, {
-  ButtonSize,
-  ButtonVariants,
-} from '../../../../component-library/components/Buttons/Button';
-import Text, {
+import { FlatList } from 'react-native';
+import {
+  Box,
+  Text,
   TextColor,
   TextVariant,
-} from '../../../../component-library/components/Texts/Text';
-import { Box } from '../../../UI/Box/Box';
-import {
-  AlignItems,
-  FlexDirection,
-  JustifyContent,
-} from '../../../UI/Box/box.types';
-import { IconName as IconNameLibrary } from '../../../../component-library/components/Icons/Icon';
+  TextButton,
+  TextButtonSize,
+  IconName,
+  BoxFlexDirection,
+  BoxAlignItems,
+  BoxJustifyContent,
+  BoxBorderColor,
+  BoxBackgroundColor,
+  IconSize,
+} from '@metamask/design-system-react-native';
 import { strings } from '../../../../../locales/i18n';
 import { ManualBackUpStepsSelectorsIDs } from '../../ManualBackupStep1/ManualBackUpSteps.testIds';
 import { RevealSeedViewSelectorsIDs } from '../RevealSeedView.testIds';
@@ -25,58 +25,69 @@ const SeedPhraseDisplay = ({
   showSeedPhrase,
   clipboardEnabled,
   onCopyToClipboard,
-  styles,
 }: SeedPhraseDisplayProps) => (
   <Box
-    style={styles.seedPhraseListContainer}
-    flexDirection={FlexDirection.Column}
-    alignItems={AlignItems.center}
-    justifyContent={JustifyContent.center}
-    gap={12}
+    twClassName="flex-1 w-full h-full gap-y-4"
+    flexDirection={BoxFlexDirection.Column}
+    alignItems={BoxAlignItems.Center}
+    justifyContent={BoxJustifyContent.Center}
   >
-    <View style={styles.seedPhraseContainer}>
+    <Box twClassName="min-h-[200px] flex-1 w-full h-full">
       <FlatList
         data={words}
         numColumns={3}
         keyExtractor={(_, index) => index.toString()}
         renderItem={({ item, index }) => (
-          <View style={[styles.inputContainer]}>
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            borderWidth={1}
+            borderColor={BoxBorderColor.BorderMuted}
+            paddingHorizontal={2}
+            paddingVertical={1}
+            backgroundColor={BoxBackgroundColor.BackgroundMuted}
+            margin={1}
+            twClassName="flex-1 rounded-lg h-10 gap-x-1.5"
+          >
             <Text
-              variant={TextVariant.BodyMD}
-              color={TextColor.Alternative}
+              variant={TextVariant.BodyMd}
+              color={TextColor.TextAlternative}
               maxFontSizeMultiplier={1}
             >
               {index + 1}.
             </Text>
             <Text
-              variant={TextVariant.BodyMD}
-              color={TextColor.Default}
+              variant={TextVariant.BodyMd}
+              color={TextColor.TextDefault}
               key={index}
               ellipsizeMode="tail"
               numberOfLines={1}
               maxFontSizeMultiplier={1}
-              style={styles.word}
+              twClassName="flex-1"
               testID={`${ManualBackUpStepsSelectorsIDs.WORD_ITEM}-${index}`}
             >
               {item}
             </Text>
-          </View>
+          </Box>
         )}
       />
-    </View>
+    </Box>
     {clipboardEnabled ? (
-      <Button
-        label={strings('reveal_credential.copy_to_clipboard')}
-        variant={ButtonVariants.Link}
-        size={ButtonSize.Sm}
+      <TextButton
+        size={TextButtonSize.BodyMd}
         onPress={onCopyToClipboard}
         testID={
           RevealSeedViewSelectorsIDs.REVEAL_CREDENTIAL_COPY_TO_CLIPBOARD_BUTTON
         }
-        style={styles.clipboardButton}
-        startIconName={IconNameLibrary.Copy}
-        disabled={!showSeedPhrase}
-      />
+        twClassName="self-center w-full flex-1 items-center justify-center mb-2"
+        startIconName={IconName.Copy}
+        startIconProps={{
+          size: IconSize.Md,
+        }}
+        isDisabled={!showSeedPhrase}
+      >
+        {strings('reveal_credential.copy_to_clipboard')}
+      </TextButton>
     ) : null}
   </Box>
 );
diff --git a/app/components/Views/RevealPrivateCredential/styles.ts b/app/components/Views/RevealPrivateCredential/styles.ts
deleted file mode 100644
index d3da28f30413..000000000000
--- a/app/components/Views/RevealPrivateCredential/styles.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-/* eslint-disable import-x/prefer-default-export */
-import { Platform, StyleSheet } from 'react-native';
-import { fontStyles } from '../../../styles/common';
-import { Colors, Theme } from '../../../util/theme/models';
-
-export const createStyles = (theme: Theme, colors: Colors) =>
-  StyleSheet.create({
-    wrapper: {
-      backgroundColor: theme.colors.background.default,
-      flex: 1,
-      paddingBottom: 16,
-      height: '100%',
-    },
-    quizContainer: {
-      flex: 1,
-      justifyContent: 'center',
-      alignItems: 'center',
-      paddingTop: 32,
-      paddingHorizontal: 16,
-      paddingBottom: 24,
-    },
-    stepIndicatorContainer: {
-      marginBottom: 8,
-    },
-    quizButtonContainer: {
-      flex: 1,
-      alignItems: 'flex-end',
-      justifyContent: 'flex-end',
-      width: '100%',
-    },
-    quizAnsweredContainer: {
-      flex: 1,
-      alignItems: 'flex-end',
-      justifyContent: 'flex-end',
-      width: '100%',
-    },
-    quizDescription: {
-      marginTop: 24,
-    },
-    securityQuizLockImage: {
-      height: 184,
-      width: 205,
-    },
-    quizQuestion: {
-      width: '90%',
-      marginBottom: 24,
-    },
-    quizQuestionContainer: {
-      flex: 1,
-      justifyContent: 'center',
-      alignItems: 'center',
-      paddingHorizontal: 16,
-      paddingVertical: 24,
-    },
-    seedPhrase: {
-      backgroundColor: theme.colors.background.default,
-      marginTop: 10,
-      paddingBottom: 20,
-      paddingLeft: 20,
-      paddingRight: 20,
-      fontSize: 20,
-      textAlign: 'center',
-      color: theme.colors.text.default,
-      ...fontStyles.normal,
-    },
-    seedPhraseView: {
-      marginTop: 16,
-      flex: 1,
-      width: '100%',
-      height: '100%',
-      minHeight: 232,
-    },
-    clipboardButton: {
-      alignSelf: 'center',
-      width: '100%',
-    },
-    revealButton: {
-      alignSelf: 'center',
-      width: '100%',
-      marginVertical: 5,
-    },
-    tabContentContainer: {
-      minHeight: Platform.OS === 'android' ? 320 : 0,
-      flexGrow: 1,
-      flexShrink: 0,
-      marginBottom: Platform.OS === 'android' ? 20 : 0,
-    },
-    warningWrapper: {
-      fontSize: 14,
-      marginTop: 24,
-    },
-    warningText: {
-      marginTop: 10,
-      color: theme.colors.error.default,
-      ...fontStyles.normal,
-    },
-    enterPassword: {
-      marginBottom: 4,
-      color: theme.colors.text.default,
-    },
-    tabContainer: {
-      paddingHorizontal: 16,
-    },
-    qrCodeWrapper: {
-      alignSelf: 'center',
-      justifyContent: 'center',
-      marginTop: 16,
-    },
-    button: {
-      width: '100%',
-      textAlign: 'center',
-    },
-    seedPhraseConcealerContainer: {
-      flex: 1,
-      borderRadius: 8,
-    },
-    seedPhraseConcealer: {
-      alignItems: 'center',
-      borderRadius: 8,
-      paddingHorizontal: 24,
-      paddingVertical: 45,
-      flexDirection: 'column',
-      rowGap: 16,
-      height: '100%',
-      flex: 1,
-      justifyContent: 'center',
-    },
-    blurContainer: {
-      position: 'absolute',
-      top: 0,
-      left: 0,
-      bottom: 0,
-      right: 0,
-      height: '100%',
-      borderRadius: 8,
-      flex: 1,
-    },
-    blurView: {
-      position: 'absolute',
-      top: 0,
-      left: 0,
-      bottom: 0,
-      right: 0,
-      height: '100%',
-      borderRadius: 8,
-      flex: 1,
-      opacity: 0.5,
-    },
-    seedPhraseContainer: {
-      minHeight: 200,
-      flex: 1,
-      width: '100%',
-      height: '100%',
-    },
-    seedPhraseListContainer: {
-      flex: 1,
-      width: '100%',
-      height: '100%',
-    },
-    word: {
-      flex: 1,
-    },
-    inputContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      height: 40,
-      borderWidth: 1,
-      borderColor: colors.border.muted,
-      borderRadius: 8,
-      paddingHorizontal: 8,
-      paddingVertical: 4,
-      backgroundColor: colors.background.muted,
-      flex: 1,
-      margin: 4,
-      columnGap: 6,
-    },
-  });
diff --git a/app/components/Views/RevealPrivateCredential/types.ts b/app/components/Views/RevealPrivateCredential/types.ts
index 26bab8127d72..6b015fe44a54 100644
--- a/app/components/Views/RevealPrivateCredential/types.ts
+++ b/app/components/Views/RevealPrivateCredential/types.ts
@@ -1,5 +1,4 @@
 import { RouteProp } from '@react-navigation/native';
-import { createStyles } from './styles';
 import type { RevealPrivateCredentialParams } from './RevealPrivateCredential.types';
 
 export enum RevealSrpStage {
@@ -8,8 +7,6 @@ export enum RevealSrpStage {
   ActionViewScreen = 'actionViewScreen',
 }
 
-export type RevealPrivateCredentialStyleSheet = ReturnType<typeof createStyles>;
-
 /** Route prop for RevealPrivateCredential screen; params come from canonical RevealPrivateCredentialParams. */
 export type RevealPrivateCredentialRouteProp = RouteProp<
   { RevealPrivateCredential: RevealPrivateCredentialParams },
@@ -28,7 +25,6 @@ export interface IRevealPrivateCredentialProps {
 export interface SRPQuizIntroductionProps {
   onGetStarted: () => void;
   onLearnMore: () => void;
-  styles: RevealPrivateCredentialStyleSheet;
 }
 
 export interface SRPSecurityQuizProps {
@@ -38,7 +34,6 @@ export interface SRPSecurityQuizProps {
   onAnswerClick: (buttonIndex: number) => void;
   onContinueClick: () => void;
   onLearnMore: () => void;
-  styles: RevealPrivateCredentialStyleSheet;
 }
 
 export interface SeedPhraseDisplayProps {
@@ -46,12 +41,11 @@ export interface SeedPhraseDisplayProps {
   showSeedPhrase: boolean;
   clipboardEnabled: boolean;
   onCopyToClipboard: () => void;
-  styles: RevealPrivateCredentialStyleSheet;
 }
 
 export interface SeedPhraseConcealerProps {
   onReveal: () => void;
-  styles: RevealPrivateCredentialStyleSheet;
+  testID?: string;
 }
 
 export interface PasswordEntryProps {
@@ -60,7 +54,6 @@ export interface PasswordEntryProps {
   warningMessage: string;
   showPassword: boolean;
   onToggleShowPassword: () => void;
-  styles: RevealPrivateCredentialStyleSheet;
 }
 
 export interface SRPTabViewProps {
@@ -70,5 +63,4 @@ export interface SRPTabViewProps {
   onRevealSeedPhrase: () => void;
   onCopyToClipboard: () => void;
   onTabChange: (event: { i: number }) => void;
-  styles: RevealPrivateCredentialStyleSheet;
 }
diff --git a/app/components/Views/confirmations/__mocks__/send.mock.ts b/app/components/Views/confirmations/__mocks__/send.mock.ts
index 117086004ab7..266512a4c3d2 100644
--- a/app/components/Views/confirmations/__mocks__/send.mock.ts
+++ b/app/components/Views/confirmations/__mocks__/send.mock.ts
@@ -62,6 +62,18 @@ export const MOCK_NFT1155 = {
   balance: '2',
 };
 
+export const MOCK_NFT721 = {
+  address: '0xBC4CA0EdA7647A8aB7C2061c2E118A18a936f13D',
+  chainId: 1,
+  description: 'A collection of 10,000 unique Bored Ape NFTs.',
+  favorite: false,
+  image: 'https://example.com/bayc/1.png',
+  isCurrentlyOwned: true,
+  name: 'Bored Ape Yacht Club #1',
+  standard: 'ERC721',
+  tokenId: '1',
+};
+
 export const evmSendStateMock = {
   engine: {
     backgroundState: {
diff --git a/app/components/Views/confirmations/components/send/amount/amount.test.tsx b/app/components/Views/confirmations/components/send/amount/amount.test.tsx
index 33321ab46cc0..79c410e3fcba 100644
--- a/app/components/Views/confirmations/components/send/amount/amount.test.tsx
+++ b/app/components/Views/confirmations/components/send/amount/amount.test.tsx
@@ -8,6 +8,7 @@ import renderWithProvider, {
 import {
   ETHEREUM_ADDRESS,
   MOCK_NFT1155,
+  MOCK_NFT721,
   SOLANA_ASSET,
   TOKEN_ADDRESS_MOCK_1,
   evmSendStateMock,
@@ -27,7 +28,9 @@ jest.mock('../../../context/send-context', () => ({
 
 jest.mock('../../../hooks/send/useCurrencyConversions');
 
-jest.mock('../../../hooks/send/useRouteParams');
+jest.mock('../../../hooks/send/useRouteParams', () => ({
+  useRouteParams: jest.fn().mockReturnValue({ isLoading: false }),
+}));
 
 jest.mock('../../../../../../util/navigation/navUtils', () => ({
   useParams: jest.fn().mockReturnValue({}),
@@ -320,6 +323,23 @@ describe('Amount', () => {
     expect(getByText('17')).toBeTruthy();
   });
 
+  it('displays NFT image and details for ERC721 asset', async () => {
+    mockUseSendContext.mockReturnValue({
+      asset: MOCK_NFT721,
+      updateValue: jest.fn(),
+    } as unknown as ReturnType<typeof useSendContext>);
+
+    const { getByTestId, getByText, queryByText } = renderComponent();
+
+    await waitFor(() => {
+      expect(getByTestId('nft-image')).toBeTruthy();
+    });
+
+    expect(getByText('Bored Ape Yacht Club #1')).toBeTruthy();
+    // ERC721 has no ticker/symbol — display symbol must be 'NFT', not empty
+    expect(queryByText('NFT')).toBeTruthy();
+  });
+
   // it('display total balance correctly for ERC20 token', () => {
   //   mockUseRoute.mockReturnValue({
   //     params: {
diff --git a/app/components/Views/confirmations/components/send/amount/amount.tsx b/app/components/Views/confirmations/components/send/amount/amount.tsx
index 2173933ecf1e..d15caff45451 100644
--- a/app/components/Views/confirmations/components/send/amount/amount.tsx
+++ b/app/components/Views/confirmations/components/send/amount/amount.tsx
@@ -19,6 +19,7 @@ import Text, {
 } from '../../../../../../component-library/components/Texts/Text';
 import { selectPrimaryCurrency } from '../../../../../../selectors/settings';
 import CollectibleMedia from '../../../../../UI/CollectibleMedia';
+import { Skeleton } from '../../../../../../component-library/components-temp/Skeleton';
 import { useStyles } from '../../../../../hooks/useStyles';
 import Device from '../../../../../../util/device';
 import { AssetType, TokenStandard } from '../../../types/token';
@@ -50,7 +51,9 @@ export const Amount = () => {
     getFiatValue,
     getFiatDisplayValue,
   } = useCurrencyConversions();
-  const isNFT = asset?.standard === TokenStandard.ERC1155;
+  const isNFT =
+    asset?.standard === TokenStandard.ERC721 ||
+    asset?.standard === TokenStandard.ERC1155;
   const assetSymbol = isNFT
     ? undefined
     : ((asset as AssetType)?.ticker ?? (asset as AssetType)?.symbol);
@@ -61,7 +64,7 @@ export const Amount = () => {
   const isIos = Device.isIos();
   const { setAmountInputTypeFiat, setAmountInputTypeToken } =
     useAmountSelectionMetrics();
-  useRouteParams();
+  const { isLoading: isNftLoading } = useRouteParams();
 
   useEffect(() => {
     setFiatMode(primaryCurrency === 'Fiat');
@@ -149,6 +152,13 @@ export const Amount = () => {
             </Text>
           </View>
         )}
+        {isNftLoading && (
+          <View style={styles.nftImageWrapper}>
+            <Skeleton twClassName="h-[100px] w-[100px] rounded-lg mb-2" />
+            <Skeleton twClassName="h-4 w-32 rounded mb-1" />
+            <Skeleton twClassName="h-3 w-20 rounded" />
+          </View>
+        )}
         <View style={styles.inputSection}>
           <View style={styles.inputWrapper}>
             <Text
@@ -183,9 +193,13 @@ export const Amount = () => {
             </TagBase>
           </TouchableOpacity>
         )}
-        <Text style={styles.balanceText} color={TextColor.Alternative}>
-          {balanceDisplayValue}
-        </Text>
+        {isNftLoading ? (
+          <Skeleton twClassName="h-4 w-40 rounded self-center mt-4" />
+        ) : (
+          <Text style={styles.balanceText} color={TextColor.Alternative}>
+            {balanceDisplayValue}
+          </Text>
+        )}
       </View>
       <AmountKeyboard
         amount={amount}
diff --git a/app/components/Views/confirmations/components/send/asset/asset.test.tsx b/app/components/Views/confirmations/components/send/asset/asset.test.tsx
index 69ffcae911e6..d9583a4bbf22 100644
--- a/app/components/Views/confirmations/components/send/asset/asset.test.tsx
+++ b/app/components/Views/confirmations/components/send/asset/asset.test.tsx
@@ -248,7 +248,7 @@ describe('Asset', () => {
     jest.clearAllMocks();
 
     mockUseSendTokens.mockReturnValue(mockTokens);
-    mockUseEVMNfts.mockReturnValue(mockNfts);
+    mockUseEVMNfts.mockReturnValue({ nfts: mockNfts, isLoading: false });
 
     mockUseTokenSearch.mockReturnValue({
       searchQuery: '',
@@ -699,7 +699,7 @@ describe('Asset', () => {
   });
 
   it('works correctly with empty nfts from useEVMNfts', () => {
-    mockUseEVMNfts.mockReturnValue([]);
+    mockUseEVMNfts.mockReturnValue({ nfts: [], isLoading: false });
     mockUseTokenSearch.mockReturnValue({
       searchQuery: '',
       setSearchQuery: mockSetSearchQuery,
diff --git a/app/components/Views/confirmations/components/send/asset/asset.tsx b/app/components/Views/confirmations/components/send/asset/asset.tsx
index 26e7d1cd0f3b..8924198b79a3 100644
--- a/app/components/Views/confirmations/components/send/asset/asset.tsx
+++ b/app/components/Views/confirmations/components/send/asset/asset.tsx
@@ -89,7 +89,7 @@ export const Asset: React.FC<AssetProps> = (props = {}) => {
     };
   }, [tokenItems]);
 
-  const nfts = useEVMNfts();
+  const { nfts } = useEVMNfts();
   const [filteredTokensByNetwork, setFilteredTokensByNetwork] =
     useState<AssetType[]>(tokens);
   const [selectedNetworkFilter, setSelectedNetworkFilter] =
diff --git a/app/components/Views/confirmations/hooks/send/useNfts.test.tsx b/app/components/Views/confirmations/hooks/send/useNfts.test.tsx
index dd4261d69862..716f0029eb72 100644
--- a/app/components/Views/confirmations/hooks/send/useNfts.test.tsx
+++ b/app/components/Views/confirmations/hooks/send/useNfts.test.tsx
@@ -15,6 +15,9 @@ import {
 import BigNumber from 'bignumber.js';
 
 import Engine from '../../../../../core/Engine';
+import Logger from '../../../../../util/Logger';
+
+jest.mock('../../../../../util/Logger');
 import { selectSelectedAccountGroup } from '../../../../../selectors/multichainAccounts/accountTreeController';
 import { selectInternalAccountsById } from '../../../../../selectors/accountsController';
 import { selectAllNfts } from '../../../../../selectors/nftController';
@@ -258,7 +261,7 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toEqual([]);
+      expect(result.current.nfts).toEqual([]);
     });
   });
 
@@ -278,7 +281,7 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toEqual([]);
+      expect(result.current.nfts).toEqual([]);
     });
   });
 
@@ -296,7 +299,7 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toEqual([]);
+      expect(result.current.nfts).toEqual([]);
     });
   });
 
@@ -320,8 +323,8 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toHaveLength(1);
-      expect(result.current[0]).toEqual({
+      expect(result.current.nfts).toHaveLength(1);
+      expect(result.current.nfts[0]).toEqual({
         address: mockNft.address,
         standard: 'ERC721',
         name: mockNft.name,
@@ -361,9 +364,9 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toHaveLength(1);
-      expect(result.current[0].standard).toBe('ERC1155');
-      expect(result.current[0].balance).toBe('1');
+      expect(result.current.nfts).toHaveLength(1);
+      expect(result.current.nfts[0].standard).toBe('ERC1155');
+      expect(result.current.nfts[0].balance).toBe('1');
     });
   });
 
@@ -396,8 +399,8 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toHaveLength(1);
-      expect(result.current[0].name).toBe('Test NFT');
+      expect(result.current.nfts).toHaveLength(1);
+      expect(result.current.nfts[0].name).toBe('Test NFT');
     });
   });
 
@@ -427,7 +430,9 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current[0].image).toBe('https://example.com/fallback.png');
+      expect(result.current.nfts[0].image).toBe(
+        'https://example.com/fallback.png',
+      );
     });
   });
 
@@ -457,7 +462,9 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current[0].image).toBe('https://example.com/valid.png');
+      expect(result.current.nfts[0].image).toBe(
+        'https://example.com/valid.png',
+      );
     });
   });
 
@@ -471,7 +478,7 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toEqual([]);
+      expect(result.current.nfts).toEqual([]);
     });
   });
 
@@ -489,7 +496,7 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toEqual([]);
+      expect(result.current.nfts).toEqual([]);
     });
   });
 
@@ -522,8 +529,8 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toHaveLength(1);
-      expect(result.current[0].accountId).toBe(mockAccount.id);
+      expect(result.current.nfts).toHaveLength(1);
+      expect(result.current.nfts[0].accountId).toBe(mockAccount.id);
     });
   });
 
@@ -551,9 +558,9 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toHaveLength(2);
-      expect(result.current[0].chainId).toBe('0x1');
-      expect(result.current[1].chainId).toBe('0x89');
+      expect(result.current.nfts).toHaveLength(2);
+      expect(result.current.nfts[0].chainId).toBe('0x1');
+      expect(result.current.nfts[1].chainId).toBe('0x89');
     });
   });
 
@@ -583,8 +590,8 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current).toHaveLength(1);
-      expect(result.current[0].name).toBe('Test NFT');
+      expect(result.current.nfts).toHaveLength(1);
+      expect(result.current.nfts[0].name).toBe('Test NFT');
     });
   });
 
@@ -622,7 +629,9 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current[0].image).toBe('https://example.com/sample1.png');
+      expect(result.current.nfts[0].image).toBe(
+        'https://example.com/sample1.png',
+      );
     });
   });
 
@@ -657,7 +666,7 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current[0].image).toBeUndefined();
+      expect(result.current.nfts[0].image).toBeUndefined();
     });
   });
 
@@ -688,7 +697,7 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current[0].image).toBe(
+      expect(result.current.nfts[0].image).toBe(
         'https://example.com/valid-fallback.png',
       );
     });
@@ -725,7 +734,7 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current[0].image).toBe(
+      expect(result.current.nfts[0].image).toBe(
         'https://example.com/collection-fallback.png',
       );
     });
@@ -756,8 +765,8 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current[0].name).toBeUndefined();
-      expect(result.current[0].collectionName).toBe('Test Collection');
+      expect(result.current.nfts[0].name).toBeUndefined();
+      expect(result.current.nfts[0].collectionName).toBe('Test Collection');
     });
   });
 
@@ -789,7 +798,90 @@ describe('useEVMNfts', () => {
     const { result } = renderHookWithStore(() => useEVMNfts());
 
     await waitFor(() => {
-      expect(result.current[0].collectionName).toBeUndefined();
+      expect(result.current.nfts[0].collectionName).toBeUndefined();
+    });
+  });
+
+  describe('isLoading', () => {
+    it('does not update state when the effect is cancelled before processNfts completes', async () => {
+      // Simulate a slow async transform so the effect cleanup fires mid-flight.
+      let resolveTransform: () => void;
+      const transformStarted = new Promise<void>((res) => {
+        resolveTransform = res;
+      });
+      let resolveSlowTransform: ((value: string) => void) | undefined;
+      const slowTransformPromise = new Promise<string>((res) => {
+        resolveSlowTransform = res;
+      });
+
+      mockGetFormattedIpfsUrl.mockImplementation(async () => {
+        resolveTransform();
+        return slowTransformPromise;
+      });
+
+      const ipfsNft = {
+        ...mockNft,
+        image: 'ipfs://QmTest/image.png',
+      };
+
+      mockSelectSelectedAccountGroup.mockReturnValue(
+        createMockAccountGroup(['account-1']),
+      );
+      mockSelectInternalAccountsById.mockReturnValue(
+        createMockInternalAccountsById({ 'account-1': mockAccount }),
+      );
+      mockSelectAllNfts.mockReturnValue(
+        createMockAllNfts({
+          [mockAccount.address]: { '0x1': [ipfsNft] },
+        }),
+      );
+
+      const { unmount, result } = renderHookWithStore(() => useEVMNfts());
+
+      // Wait until processNfts has started the async transform, then unmount
+      // (simulates a dependency change that re-fires the effect).
+      await transformStarted;
+      unmount();
+
+      // Unblock the slow transform after the cleanup has run.
+      resolveSlowTransform?.('https://gateway/QmTest/image.png');
+
+      // State must not have been updated — isLoading stays true (initial value)
+      // and nfts stays empty because the cancelled run's setters were skipped.
+      expect(result.current.isLoading).toBe(true);
+      expect(result.current.nfts).toEqual([]);
+    });
+
+    it('settles to false and logs error when processNfts throws', async () => {
+      mockSelectSelectedAccountGroup.mockReturnValue(
+        createMockAccountGroup(['account-1']),
+      );
+      mockSelectInternalAccountsById.mockReturnValue(
+        createMockInternalAccountsById({
+          'account-1': mockAccount,
+        }),
+      );
+      mockSelectAllNfts.mockReturnValue(
+        createMockAllNfts({
+          [mockAccount.address]: { '0x1': [mockNft] },
+        }),
+      );
+      const processingError = new Error('transform failed');
+      // getNetworkBadgeSource is called inside transformNft without a try-catch,
+      // so throwing here propagates out of processNfts to the .catch() handler.
+      mockGetNetworkBadgeSource.mockImplementation(() => {
+        throw processingError;
+      });
+
+      const { result } = renderHookWithStore(() => useEVMNfts());
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+      expect(Logger.error).toHaveBeenCalledWith(
+        processingError,
+        'useEVMNfts: processNfts failed',
+      );
     });
   });
 });
diff --git a/app/components/Views/confirmations/hooks/send/useNfts.ts b/app/components/Views/confirmations/hooks/send/useNfts.ts
index 911ccf5cd4da..7bb10c34a9f3 100644
--- a/app/components/Views/confirmations/hooks/send/useNfts.ts
+++ b/app/components/Views/confirmations/hooks/send/useNfts.ts
@@ -14,13 +14,19 @@ import { getFormattedIpfsUrl } from '@metamask/assets-controllers';
 import useIpfsGateway from '../../../../hooks/useIpfsGateway';
 import Logger from '../../../../../util/Logger';
 
-export function useEVMNfts(): Nft[] {
+export interface UseEVMNftsResult {
+  nfts: Nft[];
+  isLoading: boolean;
+}
+
+export function useEVMNfts(): UseEVMNftsResult {
   const { NftController, AssetsContractController, NetworkController } =
     Engine.context;
   const selectedAccountGroup = useSelector(selectSelectedAccountGroup);
   const internalAccountsById = useSelector(selectInternalAccountsById);
   const allNFTS = useSelector(selectAllNfts);
   const [transformedNfts, setTransformedNfts] = useState<Nft[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
   const { isSolanaOnly } = useSendScope();
   const ipfsGateway = useIpfsGateway();
 
@@ -29,8 +35,12 @@ export function useEVMNfts(): Nft[] {
     .filter((account) => isEvmAddress(account.address))?.[0];
 
   useEffect(() => {
+    let cancelled = false;
+
+    setIsLoading(true);
     if (!evmAccount || !allNFTS) {
       setTransformedNfts([]);
+      setIsLoading(false);
       return;
     }
 
@@ -73,10 +83,22 @@ export function useEVMNfts(): Nft[] {
         }
       }
 
-      setTransformedNfts(transformedResults);
+      if (!cancelled) {
+        setTransformedNfts(transformedResults);
+        setIsLoading(false);
+      }
     };
 
-    processNfts();
+    processNfts().catch((error) => {
+      if (!cancelled) {
+        Logger.error(error, 'useEVMNfts: processNfts failed');
+        setIsLoading(false);
+      }
+    });
+
+    return () => {
+      cancelled = true;
+    };
   }, [
     ipfsGateway,
     evmAccount,
@@ -87,10 +109,10 @@ export function useEVMNfts(): Nft[] {
   ]);
 
   if (isSolanaOnly) {
-    return [];
+    return { nfts: [], isLoading: false };
   }
 
-  return transformedNfts;
+  return { nfts: transformedNfts, isLoading };
 }
 
 async function getValidImageUrl(
diff --git a/app/components/Views/confirmations/hooks/send/useRouteParams.test.ts b/app/components/Views/confirmations/hooks/send/useRouteParams.test.ts
index 780ecdd877cd..ca6612ef980e 100644
--- a/app/components/Views/confirmations/hooks/send/useRouteParams.test.ts
+++ b/app/components/Views/confirmations/hooks/send/useRouteParams.test.ts
@@ -59,7 +59,7 @@ describe('useRouteParams', () => {
         return { '0x1': [] };
       }
     });
-    mockUseNfts.mockReturnValue([]);
+    mockUseNfts.mockReturnValue({ nfts: [], isLoading: false });
 
     renderHookWithProvider(() => useRouteParams(), mockState);
 
@@ -87,7 +87,7 @@ describe('useRouteParams', () => {
         return { '0x1': [] };
       }
     });
-    mockUseNfts.mockReturnValue([]);
+    mockUseNfts.mockReturnValue({ nfts: [], isLoading: false });
 
     renderHookWithProvider(() => useRouteParams(), mockState);
 
@@ -119,7 +119,7 @@ describe('useRouteParams', () => {
         return { '0x1': [] };
       }
     });
-    mockUseNfts.mockReturnValue([]);
+    mockUseNfts.mockReturnValue({ nfts: [], isLoading: false });
 
     renderHookWithProvider(() => useRouteParams(), mockState);
 
@@ -149,7 +149,7 @@ describe('useRouteParams', () => {
         return { '0x1': [] };
       }
     });
-    mockUseNfts.mockReturnValue([]);
+    mockUseNfts.mockReturnValue({ nfts: [], isLoading: false });
 
     renderHookWithProvider(() => useRouteParams(), mockState);
 
@@ -179,7 +179,7 @@ describe('useRouteParams', () => {
         return { '0x1': [assetToken] };
       }
     });
-    mockUseNfts.mockReturnValue([]);
+    mockUseNfts.mockReturnValue({ nfts: [], isLoading: false });
 
     renderHookWithProvider(() => useRouteParams(), mockState);
 
@@ -193,11 +193,13 @@ describe('useRouteParams', () => {
       id: '123',
       address: 'dummy_address',
       chainId: 'summy_chainId',
+      tokenId: '1',
     };
     const assetNft = {
       id: '123',
       address: 'dummy_address',
       chainId: 'summy_chainId',
+      tokenId: '1',
     };
     mockUseParams.mockReturnValue({ asset });
     const mockUpdateAsset = jest.fn();
@@ -209,7 +211,10 @@ describe('useRouteParams', () => {
         return { '0x1': [] };
       }
     });
-    mockUseNfts.mockReturnValue([assetNft as unknown as Nft]);
+    mockUseNfts.mockReturnValue({
+      nfts: [assetNft as unknown as Nft],
+      isLoading: false,
+    });
 
     renderHookWithProvider(() => useRouteParams(), mockState);
 
@@ -217,4 +222,131 @@ describe('useRouteParams', () => {
       expect(mockUpdateAsset).toHaveBeenCalledWith(assetNft);
     });
   });
+
+  it('matches ERC1155 token by tokenId when multiple tokens share the same contract and chain', async () => {
+    const targetTokenId = '42';
+    const paramsAsset = {
+      address: '0xcontract',
+      chainId: '0x1',
+      tokenId: targetTokenId,
+    };
+    const wrongNft = {
+      address: '0xcontract',
+      chainId: '0x1',
+      tokenId: '1',
+      standard: 'ERC1155',
+      balance: '5',
+    };
+    const correctNft = {
+      address: '0xcontract',
+      chainId: '0x1',
+      tokenId: targetTokenId,
+      standard: 'ERC1155',
+      balance: '2',
+    };
+    mockUseParams.mockReturnValue({ asset: paramsAsset });
+    const mockUpdateAsset = jest.fn();
+    mockUseSendContext.mockReturnValue({
+      updateAsset: mockUpdateAsset,
+    } as unknown as ReturnType<typeof useSendContext>);
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectAssetsBySelectedAccountGroup) {
+        return { '0x1': [] };
+      }
+    });
+    mockUseNfts.mockReturnValue({
+      nfts: [wrongNft, correctNft] as unknown as Nft[],
+      isLoading: false,
+    });
+
+    renderHookWithProvider(() => useRouteParams(), mockState);
+
+    await waitFor(() => {
+      expect(mockUpdateAsset).toHaveBeenCalledWith(correctNft);
+      expect(mockUpdateAsset).not.toHaveBeenCalledWith(wrongNft);
+    });
+  });
+
+  describe('isLoading', () => {
+    it('returns true while NFTs are loading and NFT asset is not resolved yet', async () => {
+      const asset = {
+        id: '123',
+        address: 'dummy_address',
+        chainId: 'dummy_chainId',
+        tokenId: '42',
+      };
+      mockUseParams.mockReturnValue({ asset });
+      mockUseSendContext.mockReturnValue({
+        asset: undefined,
+        updateAsset: jest.fn(),
+      } as unknown as ReturnType<typeof useSendContext>);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectAssetsBySelectedAccountGroup) {
+          return { '0x1': [] };
+        }
+      });
+      mockUseNfts.mockReturnValue({ nfts: [], isLoading: true });
+
+      const { result } = renderHookWithProvider(
+        () => useRouteParams(),
+        mockState,
+      );
+
+      expect(result.current.isLoading).toBe(true);
+    });
+
+    it('returns false when NFTs finish loading and the asset is resolved', async () => {
+      const asset = {
+        id: '123',
+        address: 'dummy_address',
+        chainId: 'dummy_chainId',
+        tokenId: '42',
+      };
+      mockUseParams.mockReturnValue({ asset });
+      mockUseSendContext.mockReturnValue({
+        asset,
+        updateAsset: jest.fn(),
+      } as unknown as ReturnType<typeof useSendContext>);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectAssetsBySelectedAccountGroup) {
+          return { '0x1': [] };
+        }
+      });
+      mockUseNfts.mockReturnValue({ nfts: [], isLoading: false });
+
+      const { result } = renderHookWithProvider(
+        () => useRouteParams(),
+        mockState,
+      );
+
+      expect(result.current.isLoading).toBe(false);
+    });
+
+    it('returns false when the params asset has no tokenId (non-NFT flow)', async () => {
+      const asset = {
+        id: '123',
+        address: 'dummy_address',
+        chainId: 'dummy_chainId',
+        symbol: 'ETH',
+      };
+      mockUseParams.mockReturnValue({ asset });
+      mockUseSendContext.mockReturnValue({
+        asset: undefined,
+        updateAsset: jest.fn(),
+      } as unknown as ReturnType<typeof useSendContext>);
+      mockUseSelector.mockImplementation((selector) => {
+        if (selector === selectAssetsBySelectedAccountGroup) {
+          return { '0x1': [] };
+        }
+      });
+      mockUseNfts.mockReturnValue({ nfts: [], isLoading: true });
+
+      const { result } = renderHookWithProvider(
+        () => useRouteParams(),
+        mockState,
+      );
+
+      expect(result.current.isLoading).toBe(false);
+    });
+  });
 });
diff --git a/app/components/Views/confirmations/hooks/send/useRouteParams.ts b/app/components/Views/confirmations/hooks/send/useRouteParams.ts
index 7509070b1988..9e6eda6a3e79 100644
--- a/app/components/Views/confirmations/hooks/send/useRouteParams.ts
+++ b/app/components/Views/confirmations/hooks/send/useRouteParams.ts
@@ -22,7 +22,7 @@ const createAssetFromParams = (paramsAsset: AssetType): AssetType => ({
 export const useRouteParams = () => {
   const assets = useSelector(selectAssetsBySelectedAccountGroup);
   const flatAssets = useMemo(() => Object.values(assets).flat(), [assets]);
-  const nfts = useEVMNfts();
+  const { nfts, isLoading: isNftsLoading } = useEVMNfts();
 
   const { asset: paramsAsset } = useParams<{
     asset: AssetType;
@@ -49,9 +49,10 @@ export const useRouteParams = () => {
 
       if (!filteredAsset && nfts.length) {
         filteredAsset = nfts.find(
-          ({ address, chainId }) =>
+          ({ address, chainId, tokenId }) =>
             address === paramsAsset.address &&
-            chainId?.toLowerCase() === paramChainId,
+            chainId?.toLowerCase() === paramChainId &&
+            tokenId === paramsAsset.tokenId,
         );
       }
 
@@ -66,4 +67,10 @@ export const useRouteParams = () => {
       }
     }
   }, [asset, paramsAsset, nfts, flatAssets, updateAsset]);
+
+  // True while NFT processing is in progress and the asset hasn't been
+  // resolved into the send context yet (i.e. navigated from NftDetails).
+  const isLoading = Boolean(paramsAsset?.tokenId && isNftsLoading && !asset);
+
+  return { isLoading };
 };
diff --git a/app/controllers/perps/PerpsController-method-action-types.ts b/app/controllers/perps/PerpsController-method-action-types.ts
index 6231b294c9f8..4237da1c649f 100644
--- a/app/controllers/perps/PerpsController-method-action-types.ts
+++ b/app/controllers/perps/PerpsController-method-action-types.ts
@@ -175,6 +175,11 @@ export type PerpsControllerStartEligibilityMonitoringAction = {
   handler: PerpsController['startEligibilityMonitoring'];
 };
 
+export type PerpsControllerStopEligibilityMonitoringAction = {
+  type: 'PerpsController:stopEligibilityMonitoring';
+  handler: PerpsController['stopEligibilityMonitoring'];
+};
+
 export type PerpsControllerMethodActions =
   | PerpsControllerPlaceOrderAction
   | PerpsControllerEditOrderAction
@@ -210,4 +215,5 @@ export type PerpsControllerMethodActions =
   | PerpsControllerSaveOrderBookGroupingAction
   | PerpsControllerSetSelectedPaymentTokenAction
   | PerpsControllerResetSelectedPaymentTokenAction
-  | PerpsControllerStartEligibilityMonitoringAction;
+  | PerpsControllerStartEligibilityMonitoringAction
+  | PerpsControllerStopEligibilityMonitoringAction;
diff --git a/app/controllers/perps/PerpsController.test.ts b/app/controllers/perps/PerpsController.test.ts
index 9d190be63216..7856676af954 100644
--- a/app/controllers/perps/PerpsController.test.ts
+++ b/app/controllers/perps/PerpsController.test.ts
@@ -24,6 +24,8 @@ import {
   PerpsController,
   getDefaultPerpsControllerState,
   InitializationState,
+  firstNonEmpty,
+  resolveMyxAuthConfig,
 } from './PerpsController';
 import type { PerpsControllerState } from './PerpsController';
 import { PERPS_ERROR_CODES } from './perpsErrorCodes';
@@ -387,6 +389,16 @@ class TestablePerpsController extends PerpsController {
   public testHasStandaloneProvider(): boolean {
     return this.hasStandaloneProvider();
   }
+
+  public testRegisterMYXProvider(
+    MYXProvider: new (opts: Record<string, unknown>) => PerpsProvider,
+  ) {
+    this.registerMYXProvider(MYXProvider as never);
+  }
+
+  public testHandleMYXImportError(error: unknown) {
+    this.handleMYXImportError(error);
+  }
 }
 
 describe('PerpsController', () => {
@@ -800,6 +812,35 @@ describe('PerpsController', () => {
         }),
       );
     });
+
+    it('stopEligibilityMonitoring defers subsequent refreshEligibility calls', async () => {
+      // Arrange — controller without deferral
+      const testMockCall = jest.fn().mockImplementation((action: string) => {
+        if (action === 'RemoteFeatureFlagController:getState') {
+          return { remoteFeatureFlags: {} };
+        }
+        if (action === 'GeolocationController:getGeolocation') {
+          return 'US';
+        }
+        return undefined;
+      });
+
+      const testController = new TestablePerpsController({
+        messenger: createMockMessenger({ call: testMockCall }),
+        state: getDefaultPerpsControllerState(),
+        infrastructure: createMockInfrastructure(),
+      });
+      testMockCall.mockClear();
+
+      // Act
+      testController.stopEligibilityMonitoring();
+      await testController.refreshEligibility();
+
+      // Assert — geolocation was never called
+      expect(testMockCall).not.toHaveBeenCalledWith(
+        'GeolocationController:getGeolocation',
+      );
+    });
   });
 
   describe('HIP-3 Configuration Integration', () => {
@@ -4551,6 +4592,17 @@ describe('PerpsController', () => {
       providers.set('myx', mockMYXProvider as any);
       myxController.testSetProviders(providers);
 
+      // Mock init on the reinit call inside switchProvider.
+      // Dynamic import() rejects in Jest (no --experimental-vm-modules),
+      // so MYX can't register via #createProviders. Mock init to
+      // simulate successful reinitialization while preserving our
+      // manually-injected MYX provider in the map.
+      jest.spyOn(myxController, 'init').mockImplementationOnce(async () => {
+        myxController.testUpdate((state) => {
+          state.initializationState = InitializationState.Initialized;
+        });
+      });
+
       const result = await myxController.switchProvider('myx');
 
       expect(result.success).toBe(true);
@@ -4643,6 +4695,59 @@ describe('PerpsController', () => {
       // The init path should detect MYX is not available and fall back
       expect(controller.state.activeProvider).toBe('hyperliquid');
     });
+
+    it('registerMYXProvider creates and registers the MYX provider', () => {
+      // Arrange
+      const mockMYXInstance = createMockHyperLiquidProvider();
+      const MockMYXConstructor = jest.fn(() => mockMYXInstance);
+
+      // Act
+      controller.testRegisterMYXProvider(
+        MockMYXConstructor as unknown as new (
+          opts: Record<string, unknown>,
+        ) => PerpsProvider,
+      );
+
+      // Assert
+      const providers = controller.testGetProviders();
+      expect(providers.get('myx')).toBe(mockMYXInstance);
+      expect(MockMYXConstructor).toHaveBeenCalledWith(
+        expect.objectContaining({ isTestnet: false }),
+      );
+    });
+
+    it('handleMYXImportError logs debug for MODULE_NOT_FOUND errors', () => {
+      // Arrange — Node sets code: 'MODULE_NOT_FOUND' on missing modules
+      const moduleError = Object.assign(
+        new Error('Cannot find module ./providers/MYXProvider'),
+        { code: 'MODULE_NOT_FOUND' },
+      );
+
+      // Act
+      controller.testHandleMYXImportError(moduleError);
+
+      // Assert
+      expect(mockInfrastructure.debugLogger.log).toHaveBeenCalledWith(
+        'PerpsController: MYX provider module not available, skipping registration',
+      );
+    });
+
+    it('handleMYXImportError routes runtime errors to logError', () => {
+      // Act — error without MODULE_NOT_FOUND code goes to Sentry
+      controller.testHandleMYXImportError(new Error('Invalid auth config'));
+
+      // Assert
+      expect(mockInfrastructure.logger.error).toHaveBeenCalledWith(
+        expect.objectContaining({ message: 'Invalid auth config' }),
+        expect.objectContaining({
+          context: expect.objectContaining({
+            data: expect.objectContaining({
+              method: 'createProviders.myx',
+            }),
+          }),
+        }),
+      );
+    });
   });
 
   describe('getOpenOrders with standalone mode', () => {
@@ -5675,3 +5780,93 @@ describe('PerpsController', () => {
     });
   });
 });
+
+describe('firstNonEmpty', () => {
+  it('returns the first non-empty string', () => {
+    expect(firstNonEmpty('', undefined, 'hello', 'world')).toBe('hello');
+  });
+
+  it('returns empty string when all values are empty or undefined', () => {
+    expect(firstNonEmpty('', undefined, '')).toBe('');
+  });
+
+  it('returns the first value if it is non-empty', () => {
+    expect(firstNonEmpty('first', 'second')).toBe('first');
+  });
+
+  it('skips empty strings and returns the fallback', () => {
+    expect(firstNonEmpty('', 'fallback')).toBe('fallback');
+  });
+});
+
+describe('resolveMyxAuthConfig', () => {
+  it('uses testnet credentials on testnet', () => {
+    // Arrange
+    const myx = {
+      appIdTestnet: 'test-app',
+      apiSecretTestnet: 'test-secret',
+      brokerAddressTestnet: '0xTestBroker',
+      appIdMainnet: 'main-app',
+      apiSecretMainnet: 'main-secret',
+      brokerAddressMainnet: '0xMainBroker',
+    };
+
+    // Act
+    const result = resolveMyxAuthConfig(myx, true);
+
+    // Assert
+    expect(result.appId).toBe('test-app');
+    expect(result.apiSecret).toBe('test-secret');
+    expect(result.brokerAddress).toBe('0xTestBroker');
+  });
+
+  it('uses mainnet credentials on mainnet', () => {
+    // Arrange
+    const myx = {
+      appIdTestnet: 'test-app',
+      apiSecretTestnet: 'test-secret',
+      brokerAddressTestnet: '0xTestBroker',
+      appIdMainnet: 'main-app',
+      apiSecretMainnet: 'main-secret',
+      brokerAddressMainnet: '0xMainBroker',
+    };
+
+    // Act
+    const result = resolveMyxAuthConfig(myx, false);
+
+    // Assert
+    expect(result.appId).toBe('main-app');
+    expect(result.apiSecret).toBe('main-secret');
+    expect(result.brokerAddress).toBe('0xMainBroker');
+  });
+
+  it('falls back to testnet credentials when mainnet are empty', () => {
+    // Arrange
+    const myx = {
+      appIdTestnet: 'test-app',
+      apiSecretTestnet: 'test-secret',
+      brokerAddressTestnet: '0xTestBroker',
+      appIdMainnet: '',
+      apiSecretMainnet: '',
+      brokerAddressMainnet: '',
+    };
+
+    // Act
+    const result = resolveMyxAuthConfig(myx, false);
+
+    // Assert
+    expect(result.appId).toBe('test-app');
+    expect(result.apiSecret).toBe('test-secret');
+    expect(result.brokerAddress).toBe('0xTestBroker');
+  });
+
+  it('returns empty strings when no credentials are set', () => {
+    // Act
+    const result = resolveMyxAuthConfig({}, true);
+
+    // Assert
+    expect(result.appId).toBe('');
+    expect(result.apiSecret).toBe('');
+    expect(result.brokerAddress).toBe('');
+  });
+});
diff --git a/app/controllers/perps/PerpsController.ts b/app/controllers/perps/PerpsController.ts
index 904c8130860a..d22438bb3a4b 100644
--- a/app/controllers/perps/PerpsController.ts
+++ b/app/controllers/perps/PerpsController.ts
@@ -27,7 +27,6 @@ import type { PerpsControllerMethodActions } from './PerpsController-method-acti
 import { PERPS_ERROR_CODES } from './perpsErrorCodes';
 import { AggregatedPerpsProvider } from './providers/AggregatedPerpsProvider';
 import { HyperLiquidProvider } from './providers/HyperLiquidProvider';
-import { MYXProvider } from './providers/MYXProvider';
 import { AccountService } from './services/AccountService';
 import { DataLakeService } from './services/DataLakeService';
 import { DepositService } from './services/DepositService';
@@ -107,6 +106,7 @@ import type {
   PerpsRemoteFeatureFlagState,
   PerpsTransactionParams,
   PerpsAddTransactionOptions,
+  MYXCredentials,
 } from './types';
 import type {
   PerpsControllerAllowedActions,
@@ -124,6 +124,45 @@ import { wait } from './utils/wait';
 
 /** Derived type for logger options from PerpsLogger interface */
 type PerpsLoggerOptions = Parameters<PerpsLogger['error']>[1];
+
+/**
+ * Returns the first non-empty string from the given values.
+ * Env vars default to '' (not null/undefined), so ?? wouldn't fall through.
+ *
+ * @param vals - String values to check in order.
+ * @returns The first non-empty string, or '' if all are empty/undefined.
+ */
+export function firstNonEmpty(...vals: (string | undefined)[]): string {
+  return (
+    vals.find((val) => val !== null && val !== undefined && val !== '') ?? ''
+  );
+}
+
+/**
+ * Resolves MYX auth config from provider credentials, handling
+ * testnet/mainnet fallback logic.
+ *
+ * @param myx - MYX provider credentials.
+ * @param isTestnet - Whether the controller is in testnet mode.
+ * @returns Resolved appId, apiSecret, and brokerAddress.
+ */
+export function resolveMyxAuthConfig(
+  myx: MYXCredentials,
+  isTestnet: boolean,
+): { appId: string; apiSecret: string; brokerAddress: string } {
+  return {
+    appId: isTestnet
+      ? (myx.appIdTestnet ?? '')
+      : firstNonEmpty(myx.appIdMainnet, myx.appIdTestnet),
+    apiSecret: isTestnet
+      ? (myx.apiSecretTestnet ?? '')
+      : firstNonEmpty(myx.apiSecretMainnet, myx.apiSecretTestnet),
+    brokerAddress: isTestnet
+      ? (myx.brokerAddressTestnet ?? '')
+      : firstNonEmpty(myx.brokerAddressMainnet, myx.brokerAddressTestnet),
+  };
+}
+
 // PaymentToken: minimal interface for deposit flow (replaces mobile-only AssetType)
 
 /**
@@ -639,6 +678,7 @@ const MESSENGER_EXPOSED_METHODS = [
   'setSelectedPaymentToken',
   'resetSelectedPaymentToken',
   'startEligibilityMonitoring',
+  'stopEligibilityMonitoring',
 ] as const;
 
 /**
@@ -662,6 +702,9 @@ export class PerpsController extends BaseController<
 
   #isReinitializing = false;
 
+  /** Tracks the async MYX dynamic import so performInitialization can await it. */
+  #myxRegistrationPromise: Promise<void> | null = null;
+
   protected blockedRegionList: BlockedRegionList = {
     list: [],
     source: 'fallback',
@@ -691,12 +734,12 @@ export class PerpsController extends BaseController<
    * @returns True if the condition is met.
    */
   #isMYXProviderEnabled(): boolean {
-    const config = this.#options.clientConfig ?? {};
+    const myx = this.#options.clientConfig?.providerCredentials?.myx;
 
     // Local env-var override (MM_PERPS_MYX_PROVIDER_ENABLED) always wins —
     // matches the UI selector (resolvePerpsMyxProviderEnabled) so controller
     // and UI agree on whether MYX is available.
-    if (config.myxProviderEnabled) {
+    if (myx?.enabled) {
       return true;
     }
 
@@ -704,7 +747,7 @@ export class PerpsController extends BaseController<
     // Use || so empty-string env vars (default '') fall through.
     const hasCredentials = Boolean(
       // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-      config.myxAppIdTestnet || config.myxAppIdMainnet,
+      myx?.appIdTestnet || myx?.appIdMainnet,
     );
 
     if (hasCredentials) {
@@ -1107,6 +1150,12 @@ export class PerpsController extends BaseController<
       blocklistMarkets: this.#hip3BlocklistMarkets,
       platformDependencies: this.#options.infrastructure,
       messenger: this.messenger,
+      builderAddressTestnet:
+        this.#options.clientConfig?.providerCredentials?.hyperliquid
+          ?.builderAddressTestnet,
+      builderAddressMainnet:
+        this.#options.clientConfig?.providerCredentials?.hyperliquid
+          ?.builderAddressMainnet,
     });
     this.#standaloneProviderIsTestnet = currentIsTestnet;
     this.#standaloneProviderHip3Version = currentHip3Version;
@@ -1444,8 +1493,16 @@ export class PerpsController extends BaseController<
 
         this.#createProviders();
 
-        // Wait for WebSocket transport to be ready before marking as initialized
-        await wait(PERPS_CONSTANTS.ReconnectionCleanupDelayMs);
+        // Await MYX dynamic import (if started) so MYX is in the providers
+        // map before we assign the active provider. Runs concurrently with
+        // the WebSocket readiness delay for zero additional latency.
+        await Promise.all([
+          wait(PERPS_CONSTANTS.ReconnectionCleanupDelayMs),
+          this.#myxRegistrationPromise,
+        ]);
+        this.#myxRegistrationPromise = null;
+
+        this.#assignActiveProvider();
 
         this.isInitialized = true;
         this.update((state) => {
@@ -1533,53 +1590,106 @@ export class PerpsController extends BaseController<
       blocklistMarkets: this.#hip3BlocklistMarkets,
       platformDependencies: this.#options.infrastructure,
       messenger: this.messenger,
+      builderAddressTestnet:
+        this.#options.clientConfig?.providerCredentials?.hyperliquid
+          ?.builderAddressTestnet,
+      builderAddressMainnet:
+        this.#options.clientConfig?.providerCredentials?.hyperliquid
+          ?.builderAddressMainnet,
     });
     this.providers.set('hyperliquid', hyperLiquidProvider);
 
-    // Register MYX provider if enabled via feature flag
+    // Register MYX provider if enabled via feature flag.
+    // Dynamic import because the MYX package pulls in heavy dependencies we
+    // don't want bundled in extension. Until MYX fixes their package, extension
+    // doesn't ship it — the catch branch silently skips registration.
+    // Uses .then()/.catch() instead of await because #createProviders is not async;
+    // MYX registration completing asynchronously is fine since it's only used when
+    // explicitly enabled and selected.
     const isMYXEnabled = this.#isMYXProviderEnabled();
     if (isMYXEnabled) {
-      const myxIsTestnet =
-        PROVIDER_CONFIG.MYX_TESTNET_ONLY || this.state.isTestnet;
-      const config = this.#options.clientConfig ?? {};
-      // When on mainnet, fall back to testnet credentials if mainnet ones are empty.
-      // Uses firstNonEmpty because env vars default to '' (not null/undefined),
-      // so ?? would not fall through on empty strings.
-      const firstNonEmpty = (...vals: (string | undefined)[]): string =>
-        vals.find((val) => val !== null && val !== undefined && val !== '') ??
-        '';
-      const myxAppId = myxIsTestnet
-        ? (config.myxAppIdTestnet ?? '')
-        : firstNonEmpty(config.myxAppIdMainnet, config.myxAppIdTestnet);
-      const myxApiSecret = myxIsTestnet
-        ? (config.myxApiSecretTestnet ?? '')
-        : firstNonEmpty(config.myxApiSecretMainnet, config.myxApiSecretTestnet);
-      const myxBrokerAddress = myxIsTestnet
-        ? (config.myxBrokerAddressTestnet ?? '')
-        : firstNonEmpty(
-            config.myxBrokerAddressMainnet,
-            config.myxBrokerAddressTestnet,
-          );
-      const myxProvider = new MYXProvider({
-        isTestnet: myxIsTestnet,
-        platformDependencies: this.#options.infrastructure,
-        messenger: this.messenger,
-        myxAuthConfig: {
-          appId: myxAppId,
-          apiSecret: myxApiSecret,
-          brokerAddress: myxBrokerAddress,
-        },
-      });
-      this.providers.set('myx', myxProvider);
-      this.#debugLog('PerpsController: MYX provider registered', {
-        isTestnet: myxIsTestnet,
-      });
+      // IMPORTANT: Must use import() — NOT require() — for core/extension tree-shaking.
+      // require() is synchronous and bundlers include it in the main bundle.
+      // import() enables true code splitting so MYX is excluded when not enabled.
+      this.#myxRegistrationPromise = import('./providers/MYXProvider')
+        .then(({ MYXProvider }) => {
+          this.registerMYXProvider(MYXProvider);
+          return undefined;
+        })
+        .catch((error: unknown) => this.handleMYXImportError(error));
+    }
+  }
+
+  /**
+   * Registers the MYX provider after dynamic import resolves.
+   *
+   * Extracted from the import().then() callback so it can be tested directly
+   * (Jest cannot resolve dynamic imports without --experimental-vm-modules).
+   *
+   * @param MYXProvider - Constructor class for the MYX provider.
+   */
+  protected registerMYXProvider(
+    MYXProvider: new (opts: {
+      isTestnet: boolean;
+      platformDependencies: PerpsPlatformDependencies;
+      messenger: PerpsControllerMessenger;
+      myxAuthConfig: ReturnType<typeof resolveMyxAuthConfig>;
+    }) => PerpsProvider,
+  ): void {
+    const myxIsTestnet =
+      PROVIDER_CONFIG.MYX_TESTNET_ONLY || this.state.isTestnet;
+    const myx = this.#options.clientConfig?.providerCredentials?.myx ?? {};
+    const myxAuthConfig = resolveMyxAuthConfig(myx, myxIsTestnet);
+    const myxProvider = new MYXProvider({
+      isTestnet: myxIsTestnet,
+      platformDependencies: this.#options.infrastructure,
+      messenger: this.messenger,
+      myxAuthConfig,
+    });
+    this.providers.set('myx', myxProvider);
+    this.#debugLog('PerpsController: MYX provider registered', {
+      isTestnet: myxIsTestnet,
+    });
+  }
+
+  /**
+   * Handles errors from the MYX dynamic import.
+   *
+   * Module-not-found errors are expected (extension doesn't ship MYX) → debug log.
+   * Other errors indicate constructor/config problems → Sentry via logError.
+   *
+   * @param error - The caught error from the dynamic import or constructor.
+   */
+  protected handleMYXImportError(error: unknown): void {
+    const isModuleError =
+      (error as Record<string, unknown>)?.code === 'MODULE_NOT_FOUND';
+    if (isModuleError) {
+      this.#debugLog(
+        'PerpsController: MYX provider module not available, skipping registration',
+      );
+    } else {
+      this.#logError(
+        error instanceof Error ? error : new Error(String(error)),
+        this.#getErrorContext('createProviders.myx'),
+      );
+    }
+  }
+
+  /**
+   * Assigns the active provider instance based on the current activeProvider state.
+   * Separated from #createProviders so it runs after async MYX registration settles.
+   */
+  #assignActiveProvider(): void {
+    const { activeProvider } = this.state;
+    const hyperLiquidProvider = this.providers.get('hyperliquid');
+
+    if (!hyperLiquidProvider) {
+      throw new Error(
+        'HyperLiquid provider not registered — cannot assign active provider',
+      );
     }
 
-    // Set up active provider based on activeProvider value in state
-    // 'aggregated' is treated as just another provider that wraps others
     if (activeProvider === 'aggregated') {
-      // Aggregated mode: wrap in AggregatedPerpsProvider for multi-provider support
       this.activeProviderInstance = new AggregatedPerpsProvider({
         providers: this.providers,
         defaultProvider: 'hyperliquid',
@@ -1590,20 +1700,17 @@ export class PerpsController extends BaseController<
         { registeredProviders: Array.from(this.providers.keys()) },
       );
     } else if (activeProvider === 'hyperliquid') {
-      // Direct provider mode: use HyperLiquid provider directly
       this.activeProviderInstance = hyperLiquidProvider;
       this.#debugLog(
         `PerpsController: Using direct provider (${activeProvider})`,
       );
     } else if (activeProvider === 'myx') {
-      // MYX provider mode
       const myxProvider = this.providers.get('myx');
       if (myxProvider) {
         this.activeProviderInstance = myxProvider;
       } else {
-        // MYX feature flag is disabled — fall back to HyperLiquid
         this.#debugLog(
-          'PerpsController: MYX provider not available (feature flag disabled), falling back to hyperliquid',
+          'PerpsController: MYX provider not available, falling back to hyperliquid',
         );
         this.activeProviderInstance = hyperLiquidProvider;
         this.update((state) => {
@@ -1614,7 +1721,6 @@ export class PerpsController extends BaseController<
         `PerpsController: Using direct provider (${this.activeProviderInstance === hyperLiquidProvider ? 'hyperliquid' : activeProvider})`,
       );
     } else {
-      // Unsupported provider - throw error to prevent silent misconfiguration
       throw new Error(
         `Unsupported provider: ${String(activeProvider)}. Currently only 'hyperliquid', 'myx', and 'aggregated' are supported.`,
       );
@@ -1687,7 +1793,7 @@ export class PerpsController extends BaseController<
       },
       stateManager: {
         update: (updater: (state: PerpsControllerState) => void) =>
-          // @ts-expect-error TS2589 - excessively deep instantiation when inferring stateManager from BaseController
+          // @ts-expect-error TS2589 - excessively deep instantiation from BaseController generic
           this.update(updater),
         getState: (): PerpsControllerState => this.#getControllerState(),
       },
@@ -3952,6 +4058,16 @@ export class PerpsController extends BaseController<
     }
   }
 
+  /**
+   * Stops geo-blocking eligibility monitoring.
+   * Call this when the user disables basic functionality (e.g. useExternalServices becomes false).
+   * Prevents geolocation calls until startEligibilityMonitoring() is called again.
+   * Safe to call multiple times.
+   */
+  stopEligibilityMonitoring(): void {
+    this.#eligibilityCheckDeferred = true;
+  }
+
   async refreshEligibility(): Promise<void> {
     if (this.#eligibilityCheckDeferred) {
       return;
diff --git a/app/controllers/perps/constants/perpsConfig.ts b/app/controllers/perps/constants/perpsConfig.ts
index b1b76be7e718..9cb44b94c736 100644
--- a/app/controllers/perps/constants/perpsConfig.ts
+++ b/app/controllers/perps/constants/perpsConfig.ts
@@ -105,6 +105,14 @@ export const ORDER_SLIPPAGE_CONFIG = {
   DefaultLimitSlippageBps: 100,
 } as const;
 
+/**
+ * Max order amount buffer to reduce "Insufficient margin" rejections from the exchange.
+ * When the user selects 100% (slider or Max), we cap the order at (1 - this) of the
+ * theoretical max so that fees, rounding, and exchange-side margin checks are covered.
+ * Value as decimal (e.g. 0.005 = 0.5%).
+ */
+export const MAX_ORDER_MARGIN_BUFFER = 0.005; // 0.5%
+
 /**
  * Performance optimization constants
  * These values control debouncing and throttling for better performance
diff --git a/app/controllers/perps/providers/HyperLiquidProvider.test.ts b/app/controllers/perps/providers/HyperLiquidProvider.test.ts
index 6cc73a93b899..444c5b48df42 100644
--- a/app/controllers/perps/providers/HyperLiquidProvider.test.ts
+++ b/app/controllers/perps/providers/HyperLiquidProvider.test.ts
@@ -5,7 +5,10 @@ import {
   createMockMessenger,
 } from '../../../components/UI/Perps/__mocks__/serviceMocks';
 import { CandlePeriod } from '../constants/chartConfig';
-import { REFERRAL_CONFIG } from '../constants/hyperLiquidConfig';
+import {
+  BUILDER_FEE_CONFIG,
+  REFERRAL_CONFIG,
+} from '../constants/hyperLiquidConfig';
 import { PERPS_ERROR_CODES } from '../perpsErrorCodes';
 import { HyperLiquidClientService } from '../services/HyperLiquidClientService';
 import { HyperLiquidSubscriptionService } from '../services/HyperLiquidSubscriptionService';
@@ -261,6 +264,9 @@ const createMockInfoClient = (overrides: Record<string, unknown> = {}) => ({
     ],
     universe: [],
   }),
+  historicalOrders: jest.fn().mockResolvedValue([]),
+  userFills: jest.fn().mockResolvedValue([]),
+  userFillsByTime: jest.fn().mockResolvedValue([]),
   ...overrides,
 });
 
@@ -5657,6 +5663,39 @@ describe('HyperLiquidProvider', () => {
         mockClientService.getExchangeClient().setReferrer,
       ).not.toHaveBeenCalled();
     });
+
+    it('uses testnet builder address when in testnet mode', async () => {
+      // Arrange — flip to testnet mode
+      mockClientService.isTestnetMode.mockReturnValue(true);
+
+      mockClientService.getInfoClient = jest.fn().mockReturnValue(
+        createMockInfoClient({
+          maxBuilderFee: jest.fn().mockResolvedValue(1), // Already approved
+        }),
+      );
+
+      const orderParams: OrderParams = {
+        symbol: 'BTC',
+        isBuy: true,
+        size: '0.1',
+        orderType: 'market',
+        currentPrice: 50000,
+      };
+
+      // Act
+      const result = await provider.placeOrder(orderParams);
+
+      // Assert — order placed with the testnet builder address
+      expect(result.success).toBe(true);
+      expect(mockClientService.getExchangeClient().order).toHaveBeenCalledWith(
+        expect.objectContaining({
+          builder: {
+            b: BUILDER_FEE_CONFIG.TestnetBuilder,
+            f: expect.any(Number),
+          },
+        }),
+      );
+    });
   });
 
   // TODO: Refactor to test through public API — ES # private fields prevent direct access
@@ -6512,6 +6551,115 @@ describe('HyperLiquidProvider', () => {
     });
   });
 
+  describe('getOrderFills enrichment with detailedOrderType', () => {
+    it('enriches fills with detailedOrderType from historical orders', async () => {
+      const mockUserFills = jest.fn().mockResolvedValue([
+        {
+          oid: 100,
+          coin: 'BTC',
+          side: 'A',
+          sz: '0.5',
+          px: '50000',
+          fee: '5',
+          feeToken: 'USDC',
+          time: Date.now(),
+          closedPnl: '-200',
+          dir: 'Close Long',
+          startPosition: '0.5',
+        },
+        {
+          oid: 101,
+          coin: 'ETH',
+          side: 'B',
+          sz: '1.0',
+          px: '3000',
+          fee: '3',
+          feeToken: 'USDC',
+          time: Date.now(),
+          closedPnl: '100',
+          dir: 'Close Short',
+          startPosition: '-1.0',
+        },
+      ]);
+
+      const mockHistoricalOrders = jest.fn().mockResolvedValue([
+        {
+          order: {
+            oid: 100,
+            coin: 'BTC',
+            side: 'A',
+            sz: '0',
+            origSz: '0.5',
+            limitPx: '50000',
+            orderType: 'Stop Market',
+            reduceOnly: true,
+            isTrigger: true,
+          },
+          status: 'filled',
+          statusTimestamp: Date.now(),
+        },
+        {
+          order: {
+            oid: 101,
+            coin: 'ETH',
+            side: 'B',
+            sz: '0',
+            origSz: '1.0',
+            limitPx: '3000',
+            orderType: 'Take Profit Limit',
+            reduceOnly: true,
+            isTrigger: true,
+          },
+          status: 'filled',
+          statusTimestamp: Date.now(),
+        },
+      ]);
+
+      mockClientService.getInfoClient = jest.fn().mockReturnValue(
+        createMockInfoClient({
+          userFills: mockUserFills,
+          historicalOrders: mockHistoricalOrders,
+        }),
+      );
+
+      const fills = await provider.getOrderFills();
+
+      expect(fills).toHaveLength(2);
+      expect(fills[0].detailedOrderType).toBe('Stop Market');
+      expect(fills[1].detailedOrderType).toBe('Take Profit Limit');
+    });
+
+    it('gracefully handles historicalOrders failure', async () => {
+      const mockUserFills = jest.fn().mockResolvedValue([
+        {
+          oid: 200,
+          coin: 'BTC',
+          side: 'B',
+          sz: '0.1',
+          px: '60000',
+          fee: '6',
+          feeToken: 'USDC',
+          time: Date.now(),
+          closedPnl: '0',
+          dir: 'Open Long',
+          startPosition: '0',
+        },
+      ]);
+
+      mockClientService.getInfoClient = jest.fn().mockReturnValue(
+        createMockInfoClient({
+          userFills: mockUserFills,
+          historicalOrders: jest.fn().mockRejectedValue(new Error('API error')),
+        }),
+      );
+
+      const fills = await provider.getOrderFills();
+
+      expect(fills).toHaveLength(1);
+      expect(fills[0].detailedOrderType).toBeUndefined();
+    });
+  });
+
   describe('getOpenOrders additional coverage', () => {
     it('returns empty array when frontendOpenOrders throws error', async () => {
       // Arrange
diff --git a/app/controllers/perps/providers/HyperLiquidProvider.ts b/app/controllers/perps/providers/HyperLiquidProvider.ts
index 480ac72df401..cb0d1bbc3a80 100644
--- a/app/controllers/perps/providers/HyperLiquidProvider.ts
+++ b/app/controllers/perps/providers/HyperLiquidProvider.ts
@@ -375,6 +375,10 @@ export class HyperLiquidProvider implements PerpsProvider {
 
   readonly #messenger: PerpsControllerMessengerBase;
 
+  readonly #builderAddressTestnet?: string;
+
+  readonly #builderAddressMainnet?: string;
+
   constructor(options: {
     isTestnet?: boolean;
     hip3Enabled?: boolean;
@@ -384,9 +388,13 @@ export class HyperLiquidProvider implements PerpsProvider {
     platformDependencies: PerpsPlatformDependencies;
     messenger: PerpsControllerMessengerBase;
     initialAssetMapping?: [string, number][];
+    builderAddressTestnet?: string;
+    builderAddressMainnet?: string;
   }) {
     this.#deps = options.platformDependencies;
     this.#messenger = options.messenger;
+    this.#builderAddressTestnet = options.builderAddressTestnet;
+    this.#builderAddressMainnet = options.builderAddressMainnet;
     const isTestnet = options.isTestnet ?? false;
 
     // Dev-friendly defaults: Enable all markets by default for easier testing (discovery mode)
@@ -5086,6 +5094,20 @@ export class HyperLiquidProvider implements PerpsProvider {
         count: rawFills?.length ?? 0,
       });
 
+      // Start fetching historical orders in parallel with fill transformation.
+      // The fills API does not return order type, so we cross-reference
+      // with historical orders to enable TP/SL pill rendering in activity.
+      const historicalOrdersPromise = (
+        infoClient.historicalOrders?.({ user: userAddress }) ??
+        Promise.resolve(null)
+      ).catch((enrichError: unknown) => {
+        this.#deps.debugLogger.log(
+          'Warning: failed to enrich fills with order types:',
+          enrichError,
+        );
+        return null;
+      });
+
       // Transform HyperLiquid fills to abstract OrderFill type
       const fills = (rawFills || []).reduce((acc: OrderFill[], fill) => {
         // Perps only, no Spots
@@ -5116,6 +5138,32 @@ export class HyperLiquidProvider implements PerpsProvider {
         return acc;
       }, []);
 
+      // Enrich fills with detailedOrderType from historical orders
+      // Wrapped in its own try/catch so a malformed order never discards fetched fills
+      try {
+        const rawOrders = await historicalOrdersPromise;
+        if (rawOrders) {
+          const orderTypeByOid = new Map<string, string>();
+          for (const rawOrder of rawOrders) {
+            const oid = rawOrder.order?.oid?.toString();
+            if (oid && rawOrder.order?.orderType && !orderTypeByOid.has(oid)) {
+              orderTypeByOid.set(oid, rawOrder.order.orderType);
+            }
+          }
+          for (const fill of fills) {
+            const orderType = orderTypeByOid.get(fill.orderId);
+            if (orderType) {
+              fill.detailedOrderType = orderType;
+            }
+          }
+        }
+      } catch (enrichError) {
+        this.#deps.debugLogger.log(
+          'Error enriching fills with order types:',
+          enrichError,
+        );
+      }
+
       return fills;
     } catch (error) {
       this.#deps.debugLogger.log('Error getting user fills:', error);
@@ -8035,9 +8083,13 @@ export class HyperLiquidProvider implements PerpsProvider {
   }
 
   #getBuilderAddress(isTestnet: boolean): string {
-    return isTestnet
-      ? BUILDER_FEE_CONFIG.TestnetBuilder
-      : BUILDER_FEE_CONFIG.MainnetBuilder;
+    // || intentional: env vars default to '' which must fall through to the hardcoded default
+    if (isTestnet) {
+      // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+      return this.#builderAddressTestnet || BUILDER_FEE_CONFIG.TestnetBuilder;
+    }
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    return this.#builderAddressMainnet || BUILDER_FEE_CONFIG.MainnetBuilder;
   }
 
   #getReferralCode(isTestnet: boolean): string {
diff --git a/app/controllers/perps/services/HyperLiquidSubscriptionService.test.ts b/app/controllers/perps/services/HyperLiquidSubscriptionService.test.ts
index 95b4801741da..6a1923f05018 100644
--- a/app/controllers/perps/services/HyperLiquidSubscriptionService.test.ts
+++ b/app/controllers/perps/services/HyperLiquidSubscriptionService.test.ts
@@ -751,6 +751,62 @@ describe('HyperLiquidSubscriptionService', () => {
       unsubscribe();
     });
 
+    it('enriches WS fills with detailedOrderType from cached orders', async () => {
+      // Arrange — subscribe to orders first so #cachedOrders gets populated
+      const orderCallback = jest.fn();
+      service.subscribeToOrders({ callback: orderCallback });
+      await jest.runAllTimersAsync();
+
+      // Now subscribe to fills — the callback should enrich with cached order types
+      const fillCallback = jest.fn();
+      mockSubscriptionClient.userFills.mockImplementation(
+        (_params: any, callback: any) => {
+          setTimeout(() => {
+            callback({
+              fills: [
+                {
+                  oid: BigInt(12345),
+                  coin: 'BTC',
+                  side: 'B',
+                  sz: '0.1',
+                  px: '50000',
+                  fee: '5',
+                  time: Date.now(),
+                  closedPnl: '0',
+                  dir: 'Open Long',
+                  feeToken: 'USDC',
+                  startPosition: '0',
+                },
+              ],
+            });
+          }, 0);
+          return Promise.resolve({
+            unsubscribe: jest.fn().mockResolvedValue(undefined),
+          });
+        },
+      );
+
+      // Act
+      const unsubscribe = service.subscribeToOrderFills({
+        callback: fillCallback,
+      });
+      await jest.runAllTimersAsync();
+
+      // Assert — fill received with orderId mapped and detailedOrderType enriched
+      expect(fillCallback).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({
+            orderId: '12345',
+            symbol: 'BTC',
+            detailedOrderType: 'Limit',
+          }),
+        ],
+        undefined,
+      );
+
+      unsubscribe();
+    });
+
     it('should pass isSnapshot flag to callback', async () => {
       const mockCallback = jest.fn();
 
diff --git a/app/controllers/perps/services/HyperLiquidSubscriptionService.ts b/app/controllers/perps/services/HyperLiquidSubscriptionService.ts
index 5cedb6be657e..a56c1a70f08f 100644
--- a/app/controllers/perps/services/HyperLiquidSubscriptionService.ts
+++ b/app/controllers/perps/services/HyperLiquidSubscriptionService.ts
@@ -2115,26 +2115,39 @@ export class HyperLiquidSubscriptionService {
     const subscription = await subscriptionClient.userFills(
       { user: userAddress },
       (data: UserFillsWsEvent) => {
-        const orderFills: OrderFill[] = data.fills.map((fill) => ({
-          orderId: fill.oid.toString(),
-          symbol: fill.coin,
-          side: fill.side,
-          size: fill.sz,
-          price: fill.px,
-          fee: fill.fee,
-          timestamp: fill.time,
-          pnl: fill.closedPnl,
-          direction: fill.dir,
-          feeToken: fill.feeToken,
-          startPosition: fill.startPosition,
-          liquidation: fill.liquidation
-            ? {
-                liquidatedUser: fill.liquidation.liquidatedUser,
-                markPx: fill.liquidation.markPx,
-                method: fill.liquidation.method,
-              }
-            : undefined,
-        }));
+        // Build a Map for O(1) lookup instead of O(n) find per fill
+        const orderMap = new Map<string, string>();
+        if (this.#cachedOrders) {
+          for (const order of this.#cachedOrders) {
+            if (order.detailedOrderType) {
+              orderMap.set(order.orderId, order.detailedOrderType);
+            }
+          }
+        }
+        const orderFills: OrderFill[] = data.fills.map((fill) => {
+          const oid = fill.oid.toString();
+          return {
+            orderId: oid,
+            symbol: fill.coin,
+            side: fill.side,
+            size: fill.sz,
+            price: fill.px,
+            fee: fill.fee,
+            timestamp: fill.time,
+            pnl: fill.closedPnl,
+            direction: fill.dir,
+            feeToken: fill.feeToken,
+            startPosition: fill.startPosition,
+            liquidation: fill.liquidation
+              ? {
+                  liquidatedUser: fill.liquidation.liquidatedUser,
+                  markPx: fill.liquidation.markPx,
+                  method: fill.liquidation.method,
+                }
+              : undefined,
+            detailedOrderType: orderMap.get(oid),
+          };
+        });
 
         // Cache fills for cache-first pattern (similar to price caching)
         // This allows getOrFetchFills() to return cached data without REST API calls
diff --git a/app/controllers/perps/types/index.ts b/app/controllers/perps/types/index.ts
index 7b096606d1ca..9dcfb312a78a 100644
--- a/app/controllers/perps/types/index.ts
+++ b/app/controllers/perps/types/index.ts
@@ -596,21 +596,35 @@ export type PerpsControllerConfig = {
   fallbackHip3BlocklistMarkets?: string[];
 
   /**
-   * MYX provider credentials.
+   * Per-provider credentials and configuration.
+   * Nested by provider name so each provider's settings are self-contained
+   * and new protocols can be added without polluting the top-level config.
    * Passed from the init file where `process.env.X` is babel-transformed at build time.
    */
-  myxAppIdTestnet?: string;
-  myxApiSecretTestnet?: string;
-  myxBrokerAddressTestnet?: string;
-  myxAppIdMainnet?: string;
-  myxApiSecretMainnet?: string;
-  myxBrokerAddressMainnet?: string;
+  providerCredentials?: PerpsProviderCredentials;
+};
 
-  /**
-   * Whether MYX provider is enabled via local env var (MM_PERPS_MYX_PROVIDER_ENABLED).
-   * Must match the UI selector logic so the controller and UI agree on MYX availability.
-   */
-  myxProviderEnabled?: boolean;
+export type HyperLiquidCredentials = {
+  /** Builder fee wallet address for testnet. Empty/omitted = uses BUILDER_FEE_CONFIG default. */
+  builderAddressTestnet?: string;
+  /** Builder fee wallet address for mainnet. Empty/omitted = uses BUILDER_FEE_CONFIG default. */
+  builderAddressMainnet?: string;
+};
+
+export type MYXCredentials = {
+  /** Whether MYX provider is enabled via local env var. */
+  enabled?: boolean;
+  appIdTestnet?: string;
+  apiSecretTestnet?: string;
+  brokerAddressTestnet?: string;
+  appIdMainnet?: string;
+  apiSecretMainnet?: string;
+  brokerAddressMainnet?: string;
+};
+
+export type PerpsProviderCredentials = {
+  hyperliquid?: HyperLiquidCredentials;
+  myx?: MYXCredentials;
 };
 
 export type PriceUpdate = {
diff --git a/app/controllers/perps/utils/orderCalculations.ts b/app/controllers/perps/utils/orderCalculations.ts
index d6dffbed5d3c..facfa45d3f3d 100644
--- a/app/controllers/perps/utils/orderCalculations.ts
+++ b/app/controllers/perps/utils/orderCalculations.ts
@@ -4,7 +4,10 @@ import {
   formatHyperLiquidPrice,
   formatHyperLiquidSize,
 } from './hyperLiquidAdapter';
-import { ORDER_SLIPPAGE_CONFIG } from '../constants/perpsConfig';
+import {
+  MAX_ORDER_MARGIN_BUFFER,
+  ORDER_SLIPPAGE_CONFIG,
+} from '../constants/perpsConfig';
 import { PERPS_ERROR_CODES } from '../perpsErrorCodes';
 import type { PerpsDebugLogger } from '../types';
 import type { SDKOrderParams } from '../types/hyperliquid-types';
@@ -174,7 +177,11 @@ export function getMaxAllowedAmount(params: MaxAllowedAmountParams): number {
     maxAmount -= positionSizeIncrementUsd;
   }
 
-  return Math.max(0, maxAmount);
+  // Apply margin buffer to reduce "Insufficient margin" rejections from the exchange
+  // (fees, rounding, and exchange-side checks can make 100% theoretical max fail)
+  const bufferedMax = maxAmount * (1 - MAX_ORDER_MARGIN_BUFFER);
+
+  return Math.max(0, Math.floor(bufferedMax));
 }
 
 /**
diff --git a/app/core/Engine/controllers/perps-controller/index.test.ts b/app/core/Engine/controllers/perps-controller/index.test.ts
index 829ff3d2d88c..9cbae1d3e0f4 100644
--- a/app/core/Engine/controllers/perps-controller/index.test.ts
+++ b/app/core/Engine/controllers/perps-controller/index.test.ts
@@ -17,6 +17,7 @@ jest.mock(
   '../../../../components/UI/Perps/adapters/mobileInfrastructure',
   () => ({
     createMobileInfrastructure: jest.fn(() => ({})),
+    createMobileClientConfig: jest.fn(() => ({})),
   }),
 );
 jest.mock('../../../../components/UI/Perps/utils/e2eBridgePerps', () => ({
diff --git a/app/core/Engine/controllers/perps-controller/index.ts b/app/core/Engine/controllers/perps-controller/index.ts
index 94065a09d552..72bad653197a 100644
--- a/app/core/Engine/controllers/perps-controller/index.ts
+++ b/app/core/Engine/controllers/perps-controller/index.ts
@@ -3,10 +3,12 @@ import {
   PerpsController,
   PerpsControllerMessenger,
   getDefaultPerpsControllerState,
-  parseCommaSeparatedString,
 } from '@metamask/perps-controller';
 import { applyE2EControllerMocks } from '../../../../components/UI/Perps/utils/e2eBridgePerps';
-import { createMobileInfrastructure } from '../../../../components/UI/Perps/adapters/mobileInfrastructure';
+import {
+  createMobileInfrastructure,
+  createMobileClientConfig,
+} from '../../../../components/UI/Perps/adapters/mobileInfrastructure';
 
 /**
  * Initialize the PerpsController.
@@ -23,34 +25,11 @@ export const perpsControllerInit: ControllerInitFunction<
   const perpsControllerState =
     persistedState.PerpsController ?? getDefaultPerpsControllerState();
 
-  // Pass fallback HIP-3 values from local env vars
-  // PerpsController will try to read remote feature flags on construction
-  // and subscribe to updates via RemoteFeatureFlagController:stateChange
   const controller = new PerpsController({
     messenger: controllerMessenger,
     state: perpsControllerState,
     infrastructure: createMobileInfrastructure(),
-    clientConfig: {
-      fallbackBlockedRegions: parseCommaSeparatedString(
-        process.env.MM_PERPS_BLOCKED_REGIONS ?? '',
-      ),
-      fallbackHip3Enabled: process.env.MM_PERPS_HIP3_ENABLED === 'true',
-      fallbackHip3AllowlistMarkets: parseCommaSeparatedString(
-        process.env.MM_PERPS_HIP3_ALLOWLIST_MARKETS ?? '',
-      ),
-      fallbackHip3BlocklistMarkets: parseCommaSeparatedString(
-        process.env.MM_PERPS_HIP3_BLOCKLIST_MARKETS ?? '',
-      ),
-      myxProviderEnabled: process.env.MM_PERPS_MYX_PROVIDER_ENABLED === 'true',
-      myxAppIdTestnet: process.env.MM_PERPS_MYX_APP_ID_TESTNET ?? '',
-      myxApiSecretTestnet: process.env.MM_PERPS_MYX_API_SECRET_TESTNET ?? '',
-      myxBrokerAddressTestnet:
-        process.env.MM_PERPS_MYX_BROKER_ADDRESS_TESTNET ?? '',
-      myxAppIdMainnet: process.env.MM_PERPS_MYX_APP_ID_MAINNET ?? '',
-      myxApiSecretMainnet: process.env.MM_PERPS_MYX_API_SECRET_MAINNET ?? '',
-      myxBrokerAddressMainnet:
-        process.env.MM_PERPS_MYX_BROKER_ADDRESS_MAINNET ?? '',
-    },
+    clientConfig: createMobileClientConfig(),
   });
 
   // Apply E2E mocks if configured via bridge
diff --git a/app/core/Engine/controllers/rewards-controller/RewardsController.test.ts b/app/core/Engine/controllers/rewards-controller/RewardsController.test.ts
index 1a38bc0a0222..d8614930c543 100644
--- a/app/core/Engine/controllers/rewards-controller/RewardsController.test.ts
+++ b/app/core/Engine/controllers/rewards-controller/RewardsController.test.ts
@@ -18610,7 +18610,6 @@ describe('RewardsController', () => {
         endDate: string;
         termsAndConditions: Json | null;
         excludedRegions: string[];
-        statusLabel: string;
         details: null;
         featured: boolean;
       }> = {},
@@ -18622,7 +18621,6 @@ describe('RewardsController', () => {
       endDate: '2027-01-01T00:00:00.000Z',
       termsAndConditions: null,
       excludedRegions: [],
-      statusLabel: 'Active',
       details: null,
       featured: false,
       ...overrides,
diff --git a/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.test.ts b/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.test.ts
index 81ee5e309d53..7ae9f273a0e8 100644
--- a/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.test.ts
+++ b/app/core/Engine/controllers/rewards-controller/services/rewards-data-service.test.ts
@@ -4321,7 +4321,6 @@ describe('RewardsDataService', () => {
         endDate: '2027-01-01T00:00:00.000Z',
         termsAndConditions: null,
         excludedRegions: [],
-        statusLabel: 'Active',
         details: null,
         featured: false,
       },
diff --git a/app/core/Engine/controllers/rewards-controller/types.ts b/app/core/Engine/controllers/rewards-controller/types.ts
index 657f26811376..680aadc81d4d 100644
--- a/app/core/Engine/controllers/rewards-controller/types.ts
+++ b/app/core/Engine/controllers/rewards-controller/types.ts
@@ -141,14 +141,13 @@ export interface CampaignDto {
   excludedRegions: string[];
 
   /**
-   * Status label for the campaign
-   * @example 'Active'
+   * Theme-aware background image for the campaign tile
    */
-  statusLabel: string;
+  image?: ThemeImage;
 
   /**
    * The details of the campaign
-   * @example { image: { lightModeUrl: 'https://example.com/image.png', darkModeUrl: 'https://example.com/image-dark.png' }, howItWorks: { title: 'How it works', description: 'How it works', phases: [{ name: 'Phase 1', daysLabel: 'Days', sortOrder: 1, steps: [{ title: 'Step 1', description: 'Step 1', iconName: 'icon-name' }] }] } }
+   * @example { howItWorks: { title: 'How it works', description: 'How it works', phases: [{ name: 'Phase 1', daysLabel: 'Days', sortOrder: 1, steps: [{ title: 'Step 1', description: 'Step 1', iconName: 'icon-name' }] }] } }
    */
   details: CampaignDetails | null;
 
@@ -169,12 +168,11 @@ export type CampaignsState = {
     endDate: string;
     termsAndConditions: Json | null;
     excludedRegions: string[];
-    statusLabel: string;
+    image?: {
+      lightModeUrl: string;
+      darkModeUrl: string;
+    };
     details: {
-      image: {
-        lightModeUrl: string;
-        darkModeUrl: string;
-      };
       howItWorks: {
         title: string;
         description: string;
@@ -243,7 +241,6 @@ export interface OndoCampaignHowItWorks {
 }
 
 export interface OndoHoldingDetails {
-  image: ThemeImage;
   howItWorks: OndoCampaignHowItWorks;
 }
 
diff --git a/app/reducers/rewards/index.test.ts b/app/reducers/rewards/index.test.ts
index 22721d37c1d2..17b6301fa77b 100644
--- a/app/reducers/rewards/index.test.ts
+++ b/app/reducers/rewards/index.test.ts
@@ -4471,7 +4471,6 @@ const mockCampaign: CampaignDto = {
   endDate: '2027-01-01T00:00:00.000Z',
   termsAndConditions: null,
   excludedRegions: [],
-  statusLabel: 'Active',
   details: null,
   featured: false,
 };
diff --git a/app/reducers/rewards/selectors.test.ts b/app/reducers/rewards/selectors.test.ts
index 4d636857ba72..9e870f116a82 100644
--- a/app/reducers/rewards/selectors.test.ts
+++ b/app/reducers/rewards/selectors.test.ts
@@ -3139,7 +3139,6 @@ describe('Rewards selectors', () => {
     endDate: '2027-01-01T00:00:00.000Z',
     termsAndConditions: null,
     excludedRegions: [],
-    statusLabel: 'Active',
     details: null,
     featured: false,
   };
diff --git a/docs/perps/perps-caching-architecture.md b/docs/perps/perps-caching-architecture.md
new file mode 100644
index 000000000000..3279f5e8deb7
--- /dev/null
+++ b/docs/perps/perps-caching-architecture.md
@@ -0,0 +1,171 @@
+# Perps Caching Architecture
+
+## Overview
+
+Trading UX must feel instant. Users expect sub-second rendering of positions, orders, and prices — any loading skeleton on the Perps home screen feels like a broken app. Caching bridges the gap between slow REST APIs, WebSocket warmup latency, and the instant UI that traders demand.
+
+**Historical context**: The current architecture has a legacy REST preload layer that was built when WebSocket connections only existed while the Perps tab was visible. Now that `PerpsAlwaysOnProvider` keeps WS connected from wallet mount, parts of this preload infrastructure are redundant and candidates for removal.
+
+## How It Works Today
+
+Three tiers, from freshest to stalest:
+
+| Tier             | What                             | Lifetime        | Examples                                                  |
+| ---------------- | -------------------------------- | --------------- | --------------------------------------------------------- |
+| Real-time        | WebSocket via StreamManager      | While connected | Prices, positions, fills, orders, account balance         |
+| Session          | Provider + TradingReadinessCache | App lifetime    | DEX discovery, signing state, spot metadata, fee rates    |
+| Preload (legacy) | REST via Controller              | 5-min refresh   | Market list for home screen, positions before WS connects |
+
+The Preload tier exists because WS wasn't always-on historically. With `PerpsAlwaysOnProvider`, it's partially redundant — WS data arrives within 1-2 seconds of app launch, making the 5-min REST cycle a safety net rather than a primary data source.
+
+## Data Flow: Cold Start to Live Data
+
+What happens when the app launches:
+
+1. **App launches** — Controller preload fires REST fetch — `cachedMarketDataByProvider` populated
+2. **PerpsAlwaysOnProvider mounts** — WS connects — stream channels prewarm via `preloadSubscriptions()`
+3. **UI hooks mount** — read from stream channel cache (populated by WS prewarm) — instant render
+4. **If stream cache empty** — fall back to controller's REST preload cache via `getPreloadedData()` — still instant render
+5. **WS data arrives** — overrides everything with live data
+
+The key coupling point: `MarketDataStreamChannel.getCachedData()` falls back to the controller's REST cache. This fallback is what makes the preload layer still useful — it fills the gap between app launch and first WS message.
+
+## Per-Layer Details
+
+### Real-time Layer (Hooks + StreamManager + ConnectionManager)
+
+**UI Hooks** don't own caches — they read from stream channels first, then fall back to the controller's preloaded REST data via `getPreloadedData()`.
+
+**PerpsStreamManager** maintains 9 WebSocket channels:
+
+| Channel      | Cache key         | Scope      | What it stores           |
+| ------------ | ----------------- | ---------- | ------------------------ |
+| `prices`     | `priceCache` Map  | Global     | Per-symbol price updates |
+| `positions`  | `'positions'`     | Account    | User positions array     |
+| `orders`     | `'orders'`        | Account    | Open orders array        |
+| `account`    | `'account'`       | Account    | Account state (balance)  |
+| `fills`      | `'fills'`         | Account    | Recent fills (max 100)   |
+| `marketData` | `'markets'`       | Global     | Market data array        |
+| `oiCaps`     | `'oiCaps'`        | Global     | OI cap strings           |
+| `topOfBook`  | `cachedTopOfBook` | Per-symbol | Best bid/ask/spread      |
+| `candles`    | (external class)  | Per-symbol | Candle data              |
+
+All 9 channels support `pause()`/`resume()` — pausing blocks emission to React subscribers while keeping the WebSocket alive. Used during brief operations to prevent UI flicker.
+
+**PerpsConnectionManager** doesn't own caches — it orchestrates clearing of stream channels during lifecycle events. See [Cache Clearing Matrix](#cache-clearing-matrix).
+
+### Session Layer: Provider Instance Caches
+
+| Cache                         | What it stores                     | Scope   | Cleared on disconnect?  |
+| ----------------------------- | ---------------------------------- | ------- | ----------------------- |
+| `#cachedValidatedDexs`        | Feature-flag-filtered DEX names    | Global  | No (intentional)        |
+| `#cachedAllPerpDexs`          | Raw `perpDexs()` API objects       | Global  | No (intentional)        |
+| `#perpDexsCache`              | Extended DEX data with fee scales  | Session | Yes                     |
+| `#dexDiscoveryComplete`       | Boolean gate for retry logic       | Session | Yes (reset to false)    |
+| `#cachedMetaByDex`            | Per-DEX meta responses             | Session | Yes                     |
+| `#cachedSpotMeta`             | Spot metadata (USDC token info)    | Session | Yes                     |
+| `#cachedMarketDataWithPrices` | Last known-good market snapshot    | Global  | No                      |
+| `#symbolToAssetId`            | Symbol-to-asset-ID mapping         | Session | Rebuilt on init         |
+| `#maxLeverageCache`           | Per-asset max leverage (TTL-based) | Session | No (TTL-based eviction) |
+| `#userFeeCache`               | Per-user fee rates (TTL-based)     | Account | No (TTL-based eviction) |
+| `#referralCheckCache`         | Referral state per user            | Account | Yes                     |
+| `#builderFeeCheckCache`       | Builder fee approval per user      | Account | Yes                     |
+
+**Critical note**: `#cachedValidatedDexs` and `#cachedAllPerpDexs` are two views of the same `perpDexs()` API response. The [P1 dual-cache desync bug](postmortems/2026-03-24-hip3-asset-id-cache-poisoning.md) was caused by a code path writing one without the other.
+
+### Session Layer: TradingReadinessCache (Global Singleton)
+
+| Cache           | What it stores                         | Key format                   | Cleared on disconnect? |
+| --------------- | -------------------------------------- | ---------------------------- | ---------------------- |
+| Signing state   | DEX abstraction, builder fee, referral | `network:userAddress`        | Never (intentional)    |
+| In-flight locks | Concurrent signing operation guards    | `opType:network:userAddress` | Self-clearing          |
+
+This is the most important "survives everything" cache. Providers are recreated on account/network changes, which resets all instance-level caches. TradingReadinessCache persists as a global singleton specifically to remember that a hardware wallet user already approved DEX abstraction — without it, every reconnect would trigger another QR code scan.
+
+### Preload Layer: PerpsController (Legacy — candidate for removal)
+
+| Cache                        | What it stores                   | Key format           | Cleared on disconnect? |
+| ---------------------------- | -------------------------------- | -------------------- | ---------------------- |
+| `cachedMarketDataByProvider` | Market list from REST            | `providerId:network` | No (preserved)         |
+| `cachedUserDataByProvider`   | Positions, orders, account state | `providerId:network` | No (preserved)         |
+
+**Staleness & debounce constants**:
+
+| Constant             | Value         | Purpose                                                  |
+| -------------------- | ------------- | -------------------------------------------------------- |
+| `#preloadRefreshMs`  | 5 min         | Periodic `setInterval` refresh                           |
+| `#preloadGuardMs`    | 30 s          | Write debounce — skip fetch if entry is fresher than 30s |
+| Market data read TTL | 300 s (5 min) | Stale cutoff for consumer reads                          |
+| User data read TTL   | 60 s          | Stale cutoff for consumer reads                          |
+
+**Why this is legacy**: `startMarketDataPreload()` is called from `Wallet/index.tsx` and runs independently of `PerpsAlwaysOnProvider`. The user data preload already has a WS-connected guard that skips it when WS is streaming (mostly dormant). The market data preload still runs every 5 min via REST even when WS is streaming — redundant but harmless. Network switches don't clear these caches — different networks use different keys (`hyperliquid:mainnet` vs `hyperliquid:testnet`).
+
+## Cache Clearing Matrix
+
+| Trigger                               | Provider caches                                                                                                        | Controller preload                                                            | Stream channels                              | TradingReadinessCache |
+| ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | -------------------------------------------- | --------------------- |
+| `disconnect()` (grace period expires) | Meta, spot, fees, perpDexsCache cleared. DEX discovery (`#cachedValidatedDexs`, `#cachedAllPerpDexs`) **NOT** cleared. | Preserved                                                                     | All 9 cleared                                | Preserved             |
+| Account switch                        | Provider recreated (all instance caches reset)                                                                         | `cachedUserDataByProvider` cleared if address changed. Market data preserved. | All 9 cleared immediately (before reconnect) | Preserved             |
+| Network switch                        | Provider recreated                                                                                                     | Not cleared (different key avoids collision)                                  | All 9 cleared immediately                    | Preserved             |
+| Provider switch                       | Provider recreated                                                                                                     | Scoped by `providerId:network` key                                            | All 9 cleared immediately                    | Preserved             |
+| App → background                      | Nothing (20s grace period)                                                                                             | Nothing                                                                       | Nothing (WS stays alive)                     | Preserved             |
+| App → foreground                      | `performActualDisconnection()` runs full clear, then fresh connect                                                     | Nothing                                                                       | All 9 cleared, then re-prewarmed             | Preserved             |
+| User retry (force)                    | Provider recreated                                                                                                     | Nothing                                                                       | All 9 cleared                                | Preserved             |
+
+**Double-clear on account/network switch**: Stream channels are cleared twice — once immediately in the Redux store subscriber (prevents stale data flash), and again inside `performReconnection()` (ensures clean state for new subscriptions).
+
+## Simplification Roadmap
+
+### 1. Disk-backed cold-start cache (new capability)
+
+**Problem**: On cold start, there's a gap between app launch and first WS data. Currently filled by REST preload.
+
+**Proposal**: Write stream channel snapshots to MMKV after first WS data arrives. Read from MMKV on next cold start.
+
+**Implementation**:
+
+- Two MMKV keys: `PERPS_CACHE_MARKETS`, `PERPS_CACHE_USER_DATA`
+- Write via `StorageWrapper.setItem()` — fire-and-forget, MMKV writes are synchronous under the hood
+- Read in controller constructor or stream channel `getCachedData()` fallback
+- Invalidate on account switch
+- `StorageWrapper` is already used in 91+ files — it's the standard persistence layer
+
+**Result**: Instant display of last-known data on cold start. Prices stale by seconds/minutes, positions accurate until next trade. Live WS data overlays within 1-2 seconds.
+
+### 2. Remove REST preload timer (simplification)
+
+**Problem**: 5-min REST polling is redundant when WS is always connected via `PerpsAlwaysOnProvider`.
+
+**Proposal**: Remove `startMarketDataPreload()` interval. Keep a single REST fetch on first mount as a fallback before WS connects. With disk cache (proposal 1), even that may be unnecessary.
+
+**Dependencies**: Requires disk cache (proposal 1) to fill the cold-start gap.
+
+**What to remove**:
+
+- `#preloadRefreshMs` interval
+- `#preloadGuardMs` debounce
+- `#performMarketDataPreload` periodic calls
+- Keep `#performUserDataPreload` as a one-shot fallback (already guarded by WS check)
+
+### 3. Dual-cache unification in provider (bug prevention)
+
+**Problem**: `#cachedValidatedDexs` and `#cachedAllPerpDexs` must stay in sync because `#buildAssetMapping()` reads both. Three independent code paths call the same `perpDexs()` API and write to separate caches:
+
+| Path                            | Cache written                                 | Purpose             |
+| ------------------------------- | --------------------------------------------- | ------------------- |
+| `#fetchValidatedDexsInternal()` | `#cachedValidatedDexs` + `#cachedAllPerpDexs` | Init discovery      |
+| `#getStandaloneValidatedDexs()` | Same two caches                               | Pre-WebSocket reads |
+| `#getCachedPerpDexs()`          | `#perpDexsCache`                              | Fee calculation     |
+
+**Proposal**: Replace all three caches with a single `#dexDiscoveryState` object that atomically stores `raw`, `validated`, and `extended` views. One object assignment, one source of truth — eliminates the desync risk by construction.
+
+**Postmortem**: [2026-03-24-hip3-asset-id-cache-poisoning.md](postmortems/2026-03-24-hip3-asset-id-cache-poisoning.md)
+
+## Rules for Adding New Caches
+
+1. **Pick the right layer**: Provider for API data, Controller for preload, StreamManager for real-time, TradingReadinessCache for signing state.
+2. **Decide scope**: Global (market data) vs account-specific (positions, signing state).
+3. **If account-specific**: Must be cleared on account switch. Verify your cache is covered by the ConnectionManager's clearing sequence or the controller's account-change handler.
+4. **If two caches derive from the same source**: Unify into a single object or ensure atomic writes. Never let independent code paths write subsets of related caches.
+5. **Choose a freshness tier**: Real-time (WS), background (REST with TTL), or session (app lifetime). Don't mix — a cache that's sometimes WS-fed and sometimes REST-fed creates confusing staleness semantics.
+6. **Document in this file**: Add your cache to the appropriate per-layer inventory table.
diff --git a/docs/perps/perps-refactoring-plan.md b/docs/perps/perps-refactoring-plan.md
new file mode 100644
index 000000000000..ba076720fce2
--- /dev/null
+++ b/docs/perps/perps-refactoring-plan.md
@@ -0,0 +1,313 @@
+# Perps Refactoring Plan
+
+## Overview
+
+The perps controller layer has grown significantly since its initial extraction (Feb 11, 2026). Four files now account for 52% of all perps production code (18,733 of 35,920 lines across 62 files). This document investigates the root causes and provides a phased plan to bring file sizes under control.
+
+**Locations**: `app/controllers/perps/`
+
+---
+
+## 1. Investigation: Why Did Files Explode?
+
+### Growth Timeline — PerpsController.ts
+
+| Date   | Commit                                        | Lines | Delta | What landed                                            |
+| ------ | --------------------------------------------- | ----: | ----: | ------------------------------------------------------ |
+| Feb 11 | `4cd86d34` perps-controller folder setup      | 3,343 |     — | Initial extraction from monolith                       |
+| Feb 16 | `3ab7d90b` preload market and user data       | 3,884 |  +541 | Preloading added directly to controller                |
+| Mar 05 | `7140d264` MYX provider infrastructure        | 4,648 |  +764 | MYX lifecycle, provider switching, aggregated provider |
+| Mar 10 | `03597ba3` Geolocation Controller integration | 4,526 |  -122 | Geolocation + minor cleanup                            |
+| Mar 25 | `a679c0e3` (HEAD)                             | 4,689 |  +163 | MYX error handling, core resolver changes              |
+
+**+1,346 lines (40% growth) in 6 weeks**, despite several refactoring PRs in the same period.
+
+### Root Causes
+
+#### 1a. Preloading added directly to controller (~505 lines)
+
+**Status: Already resolved by PR #27898** (removes preloading from PerpsController entirely).
+
+Lines 2715–3211 contain the full preload lifecycle: `startMarketDataPreload`, `stopMarketDataPreload`, `#performMarketDataPreload`, `#performUserDataPreload`, plus ~50 lines of guard/debounce logic near line 990 and state field declarations near line 344. This was the single largest feature addition (+541 lines on Feb 16) and was added to the controller because it needed access to state, messenger, and provider — but it has no reason to live inside the controller class.
+
+#### 1b. Deposit lifecycle tracking (~285 lines)
+
+Lines 2073–2357: `depositWithConfirmation()` alone is 285 lines. It orchestrates transaction preparation, `depositRequests` state tracking, success/failure/cancellation toast flows, and analytics. A `DepositService` already exists (imported at line 32), but the controller still owns the full deposit orchestration logic — the extraction was incomplete.
+
+#### 1c. MYX provider registration (~150 lines)
+
+Lines 706–766 (feature flag checks, registration promise) + lines 1602–1676 (`registerMYXProvider`, `handleMYXImportError`) + lines 1682–1730 (`#assignActiveProvider`). Provider lifecycle management (creation, dynamic import, assignment, error handling) belongs in a dedicated registry, not the main controller.
+
+#### 1d. Subscription boilerplate (~240 lines)
+
+Lines 3638–3941: Nine `subscribeTo*` methods follow an identical pattern:
+
+1. Null-check `activeProviderInstance`
+2. Call `provider.subscribeTo*(params)`
+3. Catch + log error → return no-op unsubscribe
+
+Only `subscribeToAccount` differs (intercepts callback to update Redux state). The other 8 are pure delegation boilerplate that could be generated by a generic helper.
+
+#### 1e. State preference getters/setters (~460 lines)
+
+Lines 4124–4689: 14+ methods for trade configuration, pending config (with 5-min expiry), market filter preferences, payment token selection, order book grouping, and watchlist management. Each method is simple CRUD (read/write state, debug log, optional analytics), but they accumulate. These have no business logic coupling to the controller — pure state management.
+
+### Anti-Patterns Table
+
+| Pattern                          | Example                                                                | Lesson                                                      |
+| -------------------------------- | ---------------------------------------------------------------------- | ----------------------------------------------------------- |
+| "Just add it to the controller"  | Preloading (+541 lines in one PR)                                      | New features should start as separate services from day one |
+| Incomplete extraction            | DepositService exists but controller still owns 285-line orchestration | Extraction means moving ALL logic, not just helpers         |
+| Provider lifecycle in controller | MYX registration, feature flags, error handling all in controller      | Provider creation/management is a separate concern          |
+| Copy-paste delegation            | 8 identical `subscribeTo*` methods                                     | Use a generic subscription proxy or code generation         |
+| Preference creep                 | 14 get/set methods accumulated over 6 PRs                              | Group preferences into a dedicated PreferencesService early |
+
+---
+
+## 2. Large File Inventory
+
+All files over 1,000 lines in `app/controllers/perps/` (production only, excludes tests):
+
+| #   | File                                         | Lines | Primary bloat source                                         |
+| --- | -------------------------------------------- | ----: | ------------------------------------------------------------ |
+| 1   | `providers/HyperLiquidProvider.ts`           | 8,342 | Orders, positions, markets, and adapter logic in one class   |
+| 2   | `PerpsController.ts`                         | 4,689 | Preloading, deposits, subscriptions, preferences (see above) |
+| 3   | `services/HyperLiquidSubscriptionService.ts` | 3,643 | All WebSocket channels in one file                           |
+| 4   | `services/TradingService.ts`                 | 2,059 | Order + position operations mixed                            |
+| 5   | `types/index.ts`                             | 1,677 | All domain types in single barrel file                       |
+| 6   | `providers/MYXProvider.ts`                   | 1,182 | Acceptable — single provider, self-contained                 |
+| 7   | `services/HyperLiquidClientService.ts`       | 1,115 | HTTP client methods — low complexity per line                |
+| 8   | `services/MYXClientService.ts`               | 1,070 | HTTP client methods — low complexity per line                |
+| 9   | `services/MarketDataService.ts`              | 1,052 | Acceptable — single domain                                   |
+
+**After PR #27898 merges**: PerpsController drops ~500 lines → ~4,200 lines. Top-4 total drops from 18,733 to ~18,200.
+
+---
+
+## 3. Phased Refactoring Plan
+
+### Phase 1: PerpsController.ts (post-preload-removal ~4,200 → ~2,500 target)
+
+Preloading removal (PR #27898) is already in flight. The remaining extractions target the four next-largest sections.
+
+#### 1a. DepositFlowService (~280 lines)
+
+**Extract**: `depositWithConfirmation()` orchestration (lines 2073–2357), `clearDepositResult()`, `clearWithdrawResult()`, and deposit request state management.
+
+**Target**: New `services/DepositFlowService.ts` that takes `update()`, `getState()`, provider, and metrics as constructor args. The existing `DepositService` handles transaction preparation — `DepositFlowService` owns the higher-level lifecycle (confirmation screen flow, toast, analytics, `depositRequests` bookkeeping).
+
+**Risk**: Low — deposit flow is self-contained with clear inputs/outputs.
+
+#### 1b. Collapse subscription delegation (~200 lines saved)
+
+The 7 identical `subscribeTo*` methods (Prices, Positions, OrderFills, Orders, OrderBook, Candles, OICaps) have no pause/resume, no state tracking — they are pure null-check + try/catch + `provider.subscribeTo*(params)`. There is no reason for 7 separate methods.
+
+**Replace with a single generic method**:
+
+```typescript
+// Before: 7 × ~22 lines = ~154 lines of identical boilerplate
+subscribeToPrices(params: SubscribePricesParams): () => void {
+  const provider = this.getActiveProviderOrNull();
+  if (!provider) return () => {};
+  try { return provider.subscribeToPrices(params); }
+  catch (error) { this.#logError(...); return () => {}; }
+}
+// ... repeated 6 more times
+
+// After: single generic method (~20 lines)
+subscribe<C extends SubscriptionChannel>(
+  channel: C,
+  params: SubscriptionParamsMap[C],
+): () => void {
+  const provider = this.getActiveProviderOrNull();
+  if (!provider) return () => {};
+  try { return provider[`subscribeTo${channel}`](params); }
+  catch (error) {
+    this.#logError(ensureError(error, `PerpsController.subscribeTo${channel}`),
+      this.#getErrorContext(`subscribeTo${channel}`, params));
+    return () => {};
+  }
+}
+```
+
+Keep `subscribeToAccount` (intercepts callback to update Redux) and `subscribeToConnectionState` (different fallback logic) as manual methods — they have real custom behavior.
+
+**Risk**: Low — purely mechanical. Callers switch from `controller.subscribeToPrices(p)` to `controller.subscribe('Prices', p)`, or keep thin typed aliases that call the generic method.
+
+#### 1c. PreferencesService (~400 lines saved)
+
+**Extract**: Lines 4124–4689 (trade configuration, pending config, market filter preferences, payment token, order book grouping, watchlist) into `services/PreferencesService.ts`.
+
+The service receives `update()` and `getState()` callbacks. Each method is a simple read/write with optional analytics. No coupling to provider, messenger, or other controller internals.
+
+**Risk**: Very low — pure state CRUD with no async operations.
+
+#### 1d. ProviderRegistryService (~150 lines saved)
+
+**Extract**: Provider creation (`#createProviders`), MYX registration (`registerMYXProvider`, `handleMYXImportError`), provider assignment (`#assignActiveProvider`), and feature flag checks (`#isMYXProviderEnabled`) into `services/ProviderRegistryService.ts`.
+
+Controller calls `registry.createProviders(config)` and `registry.getActiveProvider()`. Registry owns the provider `Map`, dynamic import logic, and fallback behavior.
+
+**Risk**: Medium — touches initialization sequence. Requires careful constructor ordering. Should be validated with existing integration tests.
+
+#### Phase 1 Summary
+
+| Extraction              | Lines removed | New file                              | Risk     |
+| ----------------------- | ------------: | ------------------------------------- | -------- |
+| Preloading (PR #27898)  |          ~500 | _(already in flight)_                 | Done     |
+| DepositFlowService      |          ~280 | `services/DepositFlowService.ts`      | Low      |
+| Subscription collapse   |          ~200 | _(inline generic method)_             | Low      |
+| PreferencesService      |          ~400 | `services/PreferencesService.ts`      | Very low |
+| ProviderRegistryService |          ~150 | `services/ProviderRegistryService.ts` | Medium   |
+| **Total**               |    **~1,510** |                                       |          |
+
+**Post-Phase 1 PerpsController**: ~4,200 - 1,010 = **~3,190 lines** (without preload), on track toward 2,500 target with further cleanup.
+
+---
+
+### Phase 2: HyperLiquidProvider.ts (8,342 → ~3,500 target)
+
+HyperLiquidProvider is the largest file in the perps codebase. It contains four distinct concerns that map cleanly to separate services.
+
+#### 2a. HyperLiquidOrderService (~1,800 lines)
+
+**Extract**: Order placement, modification, cancellation, TP/SL management. Methods include `placeOrder`, `cancelOrder`, `modifyOrder`, `createTPSL`, `updateTPSL`, and their supporting validation/signing logic.
+
+#### 2b. HyperLiquidPositionService (~1,500 lines)
+
+**Extract**: Position queries, close operations, margin management, liquidation calculations. Methods include `getPositions`, `closePosition`, `closePositions`, `updateMargin`, `calculateLiquidationPrice`.
+
+#### 2c. HyperLiquidMarketService (~1,200 lines)
+
+**Extract**: Market data fetching, funding rates, candle data, order book queries, market metadata. Methods include `getMarketData`, `getMarketDataWithPrices`, `getFundingRates`, `getHistoricalCandles`.
+
+#### 2d. Consolidate adapter layer (~300 lines saved)
+
+The provider contains inline data transformation (HyperLiquid API shapes → normalized types). These should consolidate into `utils/hyperLiquidAdapter.ts` (466 lines already exists) to eliminate duplication between the provider and the existing adapter utility.
+
+#### Phase 2 Summary
+
+| Extraction                 | Lines moved | New file                                 |
+| -------------------------- | ----------: | ---------------------------------------- |
+| HyperLiquidOrderService    |      ~1,800 | `services/HyperLiquidOrderService.ts`    |
+| HyperLiquidPositionService |      ~1,500 | `services/HyperLiquidPositionService.ts` |
+| HyperLiquidMarketService   |      ~1,200 | `services/HyperLiquidMarketService.ts`   |
+| Adapter consolidation      |        ~300 | _(merged into existing adapter)_         |
+
+**Post-Phase 2 HyperLiquidProvider**: ~8,342 - 4,800 = **~3,500 lines** (coordinator + account + connection management).
+
+---
+
+### Phase 3: Other Large Files
+
+#### 3a. HyperLiquidSubscriptionService (3,643 → ~1,800 target)
+
+Split by WebSocket channel family:
+
+- `HLPriceSubscriptions.ts` — price/allMids/activeAssetCtx channels
+- `HLUserSubscriptions.ts` — positions, orders, order fills, account
+- `HLMarketSubscriptions.ts` — order book, candles, OI caps
+
+The base class retains connection management, reconnection logic, and the generic subscription lifecycle.
+
+#### 3b. TradingService (2,059 → ~1,200 target)
+
+Split into:
+
+- `OrderExecutionService.ts` — `placeOrder`, `cancelOrder`, `cancelOrders` + order analytics
+- `PositionExecutionService.ts` — `closePosition`, `closePositions`, `updatePositionTPSL`, `updateMargin` + position analytics
+
+Both share the error context helper and metrics delegation, which stays in a shared base or utility.
+
+#### 3c. types/index.ts (1,677 → split by domain)
+
+Split into domain-specific type files:
+
+- `types/market.ts` — market data, candles, funding rates
+- `types/order.ts` — order types, order parameters, order results
+- `types/position.ts` — position types, margin, liquidation
+- `types/account.ts` — account state, balances, deposit/withdrawal
+- `types/subscription.ts` — subscription params, callbacks
+- `types/index.ts` — re-exports (barrel file, ~50 lines)
+
+This is a low-risk, high-clarity improvement. Re-exports from `types/index.ts` maintain backward compatibility.
+
+---
+
+## 4. Guardrails to Prevent Re-Growth
+
+### File Size Budgets
+
+| Threshold    | Action                                                                 |
+| ------------ | ---------------------------------------------------------------------- |
+| 2,000 lines  | Acceptable target for complex service files                            |
+| 2,500 lines  | Warning — must justify in PR description why extraction isn't feasible |
+| 3,000+ lines | Hard fail — PR cannot merge without extraction plan                    |
+
+### Process Rules
+
+1. **New feature = new service file**. If a feature adds >100 lines of logic to an existing file, it gets its own service. The controller delegates; it does not implement.
+
+2. **Complete extractions only**. Moving helpers but leaving orchestration in the controller is not an extraction. The controller should have a single delegation call, not a 200-line method that calls 3 helpers.
+
+3. **No boilerplate accumulation**. If you're writing the same pattern a third time, extract a generic helper (subscription proxy, preference CRUD generator, etc.).
+
+4. **Provider-specific logic stays in provider directory**. HyperLiquid-specific code goes in `providers/` or `services/HyperLiquid*`. Controller code must be provider-agnostic.
+
+### Proposed CI Check
+
+Add a file-size lint step to CI that scans `app/controllers/perps/**/*.ts` (excluding tests):
+
+```yaml
+# .github/workflows/perps-file-size.yml (conceptual)
+- name: Check perps file sizes
+  run: |
+    find app/controllers/perps -name '*.ts' ! -name '*.test.ts' ! -name '*.spec.ts' \
+      -exec wc -l {} + | sort -rn | while read lines file; do
+      [ "$file" = "total" ] && continue
+      if [ "$lines" -gt 3000 ]; then
+        echo "::error file=$file::$lines lines exceeds 3,000 line hard limit"
+        exit 1
+      elif [ "$lines" -gt 2500 ]; then
+        echo "::warning file=$file::$lines lines approaching limit (2,500+)"
+      fi
+    done
+```
+
+### Tracking
+
+Each phase extraction should be a separate PR with:
+
+- Before/after line counts in PR description
+- No behavior changes — pure mechanical moves + delegation wiring
+- Existing tests pass without modification (or with import path updates only)
+
+---
+
+## Appendix: Current File Size Distribution
+
+```
+8,342  providers/HyperLiquidProvider.ts
+4,689  PerpsController.ts
+3,643  services/HyperLiquidSubscriptionService.ts
+2,059  services/TradingService.ts
+1,677  types/index.ts
+1,182  providers/MYXProvider.ts
+1,115  services/HyperLiquidClientService.ts
+1,070  services/MYXClientService.ts
+1,052  services/MarketDataService.ts
+  793  providers/AggregatedPerpsProvider.ts
+  690  utils/myxAdapter.ts
+  611  aggregation/SubscriptionMultiplexer.ts
+  539  utils/hyperLiquidValidation.ts
+  480  constants/eventNames.ts
+  477  index.ts
+  466  utils/hyperLiquidAdapter.ts
+  462  constants/hyperLiquidConfig.ts
+  451  utils/orderCalculations.ts
+  408  services/AccountService.ts
+─────
+35,920  total (62 production files)
+```
+
+_Line counts as of Mar 25, 2026 on branch `feat/perps/core-resolver`._
diff --git a/docs/perps/perps-review-antipatterns.md b/docs/perps/perps-review-antipatterns.md
new file mode 100644
index 000000000000..ecab07ee1529
--- /dev/null
+++ b/docs/perps/perps-review-antipatterns.md
@@ -0,0 +1,101 @@
+# Perps Domain Anti-Patterns
+
+> Patterns to watch for when reviewing perps-related code. Generic code quality is handled by standard review.
+
+## Controller Portability (Core Sync)
+
+The controller at `app/controllers/perps/` is published as `@metamask/perps-controller` and synced to `core` monorepo via `scripts/perps/validate-core-sync.sh`. It must remain platform-agnostic — no mobile-specific imports.
+
+- **Mobile import in controller** — `react-native`, `Engine`, `Sentry`, `DevLogger` imported directly in `app/controllers/perps/`. All platform services must flow through `PerpsPlatformDependencies` (DI). The sync script checks for these but a PR could introduce them.
+- **Direct controller import from app code** — app files importing `from '../../controllers/perps/...'` instead of `from '@metamask/perps-controller'`. ESLint rule exists but may be suppressed.
+- **`__DEV__` in controller code** — must not appear in controller files. Core replaces it with `false` during sync. If new code adds `__DEV__` checks, sync breaks.
+- **New dependency not in DI interface** — controller code reaching outside its boundary (e.g., importing a hook, React context, or mobile utility). Everything the controller needs must come through `infrastructure: PerpsPlatformDependencies` constructor param.
+- **Breaking the publisher contract** — changing PerpsController's public API (state shape, method signatures, event names) without considering extension consumers. Controller is a publisher — mobile and extension both consume it.
+
+## Magic Strings, Magic Numbers & Placeholder Values
+
+Constants live in `app/controllers/perps/constants/perpsConfig.ts` (controller-portable) and `app/components/UI/Perps/constants/perpsConfig.ts` (UI-only). PRs must use these — not inline literals.
+
+- **Defaulting to `0` when data is unavailable** — the most common mistake. When price/percentage/data hasn't loaded yet, use the placeholder constants, NOT `0`, `$0`, or `0%`:
+  - `PERPS_CONSTANTS.FallbackPriceDisplay` (`'$---'`) — price not yet loaded
+  - `PERPS_CONSTANTS.FallbackPercentageDisplay` (`'--%'`) — percentage not yet loaded
+  - `PERPS_CONSTANTS.FallbackDataDisplay` (`'--'`) — generic data not yet loaded
+  - `PERPS_CONSTANTS.ZeroAmountDisplay` (`'$0'`) / `ZeroAmountDetailedDisplay` (`'$0.00'`) — ONLY for actual confirmed zero values (e.g., no volume), never for "loading" or "unavailable"
+  - Defaulting to `0` hides loading states, makes bugs invisible, and can mislead users into thinking their balance/PnL is actually zero.
+- **Inline timeout/delay values** — hardcoded `5000`, `10000`, `300` instead of `PERPS_CONSTANTS.WebsocketTimeout`, `PERPS_CONSTANTS.ConnectionTimeoutMs`, `PERFORMANCE_CONFIG.ValidationDebounceMs`, etc. Every timing constant has a named export.
+- **Hardcoded slippage** — using `0.03` or `300` instead of `ORDER_SLIPPAGE_CONFIG.DefaultMarketSlippageBps`, `DefaultTpslSlippageBps`, `DefaultLimitSlippageBps`.
+- **Hardcoded leverage fallback** — using `3` or `50` instead of `PERPS_CONSTANTS.DefaultMaxLeverage` or `MARGIN_ADJUSTMENT_CONFIG.FallbackMaxLeverage`.
+- **Hardcoded precision** — using `6`, `2`, `5` for decimal places instead of `DECIMAL_PRECISION_CONFIG.MaxPriceDecimals`, `MaxSignificantFigures`, `FallbackSizeDecimals`, or `CLOSE_POSITION_CONFIG.UsdDecimalPlaces`.
+- **Hardcoded API URLs** — inline `'https://perps.api...'` instead of `DATA_LAKE_API_CONFIG.OrdersEndpoint`.
+- **Hardcoded provider name** — `'hyperliquid'` string instead of `PROVIDER_CONFIG.DefaultProvider`.
+- **Hardcoded validation thresholds** — `20` for high leverage warning, `0.1` for price deviation, instead of `VALIDATION_THRESHOLDS.HighLeverageWarning`, `VALIDATION_THRESHOLDS.PriceDeviation`.
+- **Hardcoded cache durations** — inline `5 * 60 * 1000` instead of `PERFORMANCE_CONFIG.MarketDataCacheDurationMs`, `FeeDiscountCacheDurationMs`, etc.
+
+## Protocol Abstraction
+
+All provider access must go through `AggregatedPerpsProvider` → `ProviderRouter`. HyperLiquid is primary, MYX is feature-flagged.
+
+- **Hardcoded provider** — uses HyperLiquid or MYX APIs directly instead of going through `AggregatedPerpsProvider` / `ProviderRouter`. All operations must route through the abstraction.
+- **Provider-specific branching in UI** — `if (provider === 'hyperliquid')` in components or hooks. Provider differences must be normalized in the aggregation layer, not leaked to the view.
+- **Provider-specific error handling** — catches errors from one provider but not others. All providers must have consistent error boundaries via the aggregated layer.
+- **Hardcoded market symbols** — string literals `"BTC"` or `"ETH"` instead of market config constants. Breaks when new markets or providers are added.
+- **Hardcoded decimals/precision** — using provider-native decimal formats without normalization. HyperLiquid and MYX use different precision for prices, sizes, and leverage. Must go through `MarketDataFormatters` (DI).
+
+## MetaMetrics Events
+
+8 consolidated events with typed constants. Reference: `docs/perps/perps-metametrics-reference.md`.
+
+- **Magic string event properties** — using `'status'`, `'asset'`, `'direction'` instead of `PERPS_EVENT_PROPERTY.STATUS`, `PERPS_EVENT_PROPERTY.ASSET`, etc. from `@metamask/perps-controller`.
+- **Magic string event values** — using `'executed'`, `'long'`, `'market'` instead of `PERPS_EVENT_VALUE.STATUS.EXECUTED`, `PERPS_EVENT_VALUE.DIRECTION.LONG`, `PERPS_EVENT_VALUE.ORDER_TYPE.MARKET`.
+- **New event instead of property** — creating a 9th event when the change should be a new `screen_type`, `interaction_type`, or `action_type` value on an existing event. The 8-event model is intentional (Segment cost optimization).
+- **Missing `source` on screen view** — `PERPS_SCREEN_VIEWED` without `source` property loses navigation flow tracking. Source = current screen, not earlier in the chain.
+- **Hardcoded source in reusable component** — reusable components (`PerpsMarketTypeSection`, `PerpsWatchlistMarkets`, `PerpsCard`) must receive `source` as a prop from the parent screen, not set it implicitly.
+- **New screen/view without tracking** — adding a new view without `PERPS_SCREEN_VIEWED` event + `usePerpsMeasurement` Sentry trace.
+- **Missing `completion_duration` on transaction events** — all transaction events (`PERPS_TRADE_TRANSACTION`, `PERPS_POSITION_CLOSE_TRANSACTION`, etc.) require duration tracking.
+
+## Sentry Tracing
+
+38+ traces for performance monitoring. Reference: `docs/perps/perps-sentry-reference.md`.
+
+- **New screen without `usePerpsMeasurement`** — every new view needs a Sentry performance trace with appropriate `conditions` for when data is loaded.
+- **Missing error context** — `Logger.error()` calls without `{ feature: 'perps', context: 'ClassName.method', provider, network }`. Sentry filtering depends on these fields.
+- **Missing `ensureError()` wrapper** — catching errors without `ensureError(error)` before passing to `Logger.error()`. Non-Error objects crash Sentry reporting.
+- **New trace without TraceName enum** — hardcoded trace name strings instead of adding to `TraceName` enum in `app/util/trace.ts`.
+- **Missing `endTrace` in finally block** — `trace()` started but `endTrace()` not in a `finally` block. Orphaned traces leak in Sentry.
+
+## Connection & WebSocket Architecture
+
+Single `PerpsAlwaysOnProvider` at wallet root owns lifecycle. All `PerpsConnectionProvider` instances use `manageLifecycle={false}`.
+
+- **New `PerpsConnectionProvider` with lifecycle** — adding a `PerpsConnectionProvider` without `manageLifecycle={false}` creates reference-count bugs. Only `PerpsAlwaysOnProvider` manages connect/disconnect.
+- **Unthrottled WS → setState** — every WS tick triggers state update. Must use `useLivePrices` with appropriate `throttleMs` (100ms for charts, 2s for lists, 10s for order forms).
+- **Per-component WS subscription** — creating a new WebSocket connection per component instead of using `PerpsStreamManager` shared subscriptions with reference counting.
+- **WS subscription leak** — subscribing on mount without unsubscribing on unmount or market switch. `PerpsStreamManager` handles ref counting but custom subscriptions must clean up.
+- **Stale data after async gap** — reading position/order state, awaiting something, then using the stale read. WS updates change state between awaits. Re-read after async boundaries.
+- **Missing cache invalidation** — after trade/withdrawal/position change, not calling `PerpsCacheInvalidator.invalidate()` for affected cache types (`positions`, `accountState`). Standalone queries on token detail pages show stale data.
+
+## Data Flow & State
+
+Controller → Redux → Hooks → Components. Standalone mode for lightweight queries without full init.
+
+- **Direct controller call from component** — components calling `PerpsController.method()` directly instead of going through hooks (`usePerpsTrading`, `usePerpsAccount`, etc.).
+- **Missing `accountState` check** — accessing positions/orders/balances without verifying accountState is loaded. Causes undefined errors on first load or account switch.
+- **Stale position after close** — position in UI after close because local state not cleared or WS update not processed. Must refresh via `PerpsCacheInvalidator`.
+- **Preload data not seeded** — new hook not using `getPreloadedData()` lazy initializer. First render shows skeleton instead of cached data from the 5-minute preload cycle.
+- **Order state race** — submitting order and immediately reading order state. WS confirmation hasn't arrived. Use transaction receipt or poll with backoff.
+- **Leverage/validation bypass** — allowing values outside market's `maxLeverage` or skipping pre-trade checks (balance, market open, position limit).
+
+## Trade Flow
+
+- **Pre-trade checks missing** — submitting trade without verifying: sufficient balance, market open, position limit, leverage within bounds, slippage tolerance set.
+- **Post-trade state not refreshed** — after trade confirmation, not triggering refresh of balances, positions, orders. User sees stale data until next WS tick.
+- **Missing slippage in order params** — creating order without slippage tolerance, or hardcoding slippage instead of user preference.
+
+## Agentic Testability (testIDs)
+
+PRs that touch UI components must include testIDs so agentic recipes and E2E tests can navigate and assert on the app without manual interaction.
+
+- **Missing testID on interactive elements** — any `TextInput`, `Pressable`, `Button`, or touchable in a new or modified component without a `testID` prop. Agentic recipes use `app-state.sh press <testID>` and `eval_sync` fiber-walk queries to interact with and assert on UI. If the element has no testID, the recipe cannot press it or read its value — the fix is untestable agentically.
+- **testID not in `Perps.testIds.ts`** — testIDs defined as inline strings instead of exported constants from `app/components/UI/Perps/Perps.testIds.ts`. All testIDs must be centralized so recipes can reference them by constant name.
+- **testID missing from the element that holds the value** — adding testID to a wrapper View instead of the `TextInput` or Text that actually contains the value. CDP fiber-walk reads `value` from the React element with the matching testID — the testID must be on the element that owns the state.
+- **TP/SL price inputs without testID** — the trigger price `TextInput` components in `PerpsTPSLView` (and similar order-form screens) frequently lack testIDs, making it impossible to assert the accepted decimal precision agentically. Any PR touching these screens must add `testID` to both the Take Profit and Stop Loss price inputs.
diff --git a/scripts/perps/validate-core-sync.sh b/scripts/perps/validate-core-sync.sh
index 5001b97a02a3..84bc37b6dc92 100755
--- a/scripts/perps/validate-core-sync.sh
+++ b/scripts/perps/validate-core-sync.sh
@@ -327,13 +327,7 @@ step_verify_fixes() {
 step_eslint_fix() {
   cd "$CORE_PATH"
 
-  # Back up suppressions file so we don't leave dirty changes in Core
   local supp_file="$CORE_PATH/eslint-suppressions.json"
-  local supp_backup=""
-  if [[ -f "$supp_file" ]]; then
-    supp_backup=$(mktemp)
-    cp "$supp_file" "$supp_backup"
-  fi
 
   progress "  ├─ Running --fix"
   yarn eslint 'packages/perps-controller/src/**/*.ts' --fix || true
@@ -359,11 +353,6 @@ step_eslint_fix() {
     SUPPRESSION_COUNT=0
   fi
 
-  # Restore original suppressions file
-  if [[ -n "$supp_backup" ]]; then
-    mv "$supp_backup" "$supp_file"
-  fi
-
   cd "$MOBILE_ROOT"
   return 0
 }
diff --git a/tests/page-objects/Settings/SecurityAndPrivacy/RevealSecretRecoveryPhrase.ts b/tests/page-objects/Settings/SecurityAndPrivacy/RevealSecretRecoveryPhrase.ts
index a7b5e88238e3..bed7260f3026 100644
--- a/tests/page-objects/Settings/SecurityAndPrivacy/RevealSecretRecoveryPhrase.ts
+++ b/tests/page-objects/Settings/SecurityAndPrivacy/RevealSecretRecoveryPhrase.ts
@@ -20,7 +20,7 @@ class RevealSecretRecoveryPhrase {
   }
 
   get passwordInputToRevealCredential(): DetoxElement {
-    return Matchers.getElementByID(
+    return Matchers.getElementByLabel(
       RevealSeedViewSelectorsIDs.PASSWORD_INPUT_BOX_ID,
     );
   }