diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bf134cd11bd..20f528c3d830 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.58.2]
+
+### Fixed
+
+- fix(card): cp-7.58.2 delegation issues ([#22476](https://github.com/MetaMask/metamask-mobile/pull/22476)
+- fix: pressability measureAsyncOnUI only running on Android cp-7.58.2 ([#22464](https://github.com/MetaMask/metamask-mobile/pull/22464)
+- fix(card): cp-7.58.2 CardHome and SpendingLimit UI issues ([#22448](https://github.com/MetaMask/metamask-mobile/pull/22448)
+- fix(card): UI issues on Authentication/Delegation ([#22433](https://github.com/MetaMask/metamask-mobile/pull/22433)
+- fix: cp-7.58.2 update close position calculation with funding fees and live data ([#22344](https://github.com/MetaMask/metamask-mobile/pull/22344)
+
+## [7.58.1]
+
+### Fixed
+
+- fix: Android In-App Browser Crash ([#22269](https://github.com/MetaMask/metamask-mobile/pull/22269))
+- fix: cp-75.8.1 remove selected network reference from bridge getBridgeERC20Allowance handler ([#22230](https://github.com/MetaMask/metamask-mobile/pull/22230))
+- fix(card): add temporary fix for crashing KYC webview on Android ([#22238](https://github.com/MetaMask/metamask-mobile/pull/22238))
+- fix(card): Onboarding UI issues ([#22263](https://github.com/MetaMask/metamask-mobile/pull/22263))
+- fix(card): delegation issues ([#22249](https://github.com/MetaMask/metamask-mobile/pull/22249))
+
+### Changed
+
+- refactor(card): sonarcloud maintainability issues ([#22268](https://github.com/MetaMask/metamask-mobile/pull/22268))
+
 ## [7.58.0]
 
 ### Added
@@ -8783,7 +8807,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#957](https://github.com/MetaMask/metamask-mobile/pull/957): fix timeouts (#957)
 - [#954](https://github.com/MetaMask/metamask-mobile/pull/954): Bugfix: onboarding navigation (#954)
 
-[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.58.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.58.2...HEAD
+[7.58.2]: https://github.com/MetaMask/metamask-mobile/compare/v7.58.1...v7.58.2
+[7.58.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.58.0...v7.58.1
 [7.58.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.57.2...v7.58.0
 [7.57.2]: https://github.com/MetaMask/metamask-mobile/compare/v7.57.1...v7.57.2
 [7.57.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.57.0...v7.57.1
diff --git a/app/components/Nav/Main/MainNavigator.js b/app/components/Nav/Main/MainNavigator.js
index 97a4a62f0acd..703a68aad012 100644
--- a/app/components/Nav/Main/MainNavigator.js
+++ b/app/components/Nav/Main/MainNavigator.js
@@ -942,8 +942,8 @@ const MainNavigator = () => {
   // Get feature flag state for conditional Predict screen registration
   const predictEnabledFlag = useSelector(selectPredictEnabledFlag);
   const isPredictEnabled = useMemo(
-    () => predictEnabledFlag && isEvmSelected,
-    [predictEnabledFlag, isEvmSelected],
+    () => predictEnabledFlag,
+    [predictEnabledFlag],
   );
   const { enabled: isSendRedesignEnabled } = useSelector(
     selectSendRedesignFlags,
diff --git a/app/components/UI/Card/hooks/useAssetBalances.test.ts b/app/components/UI/Card/hooks/useAssetBalances.test.ts
index 3dd96b16e369..2615aba97a6c 100644
--- a/app/components/UI/Card/hooks/useAssetBalances.test.ts
+++ b/app/components/UI/Card/hooks/useAssetBalances.test.ts
@@ -382,7 +382,7 @@ describe('useAssetBalances', () => {
       mockUseTokensWithBalance.mockReturnValue([
         {
           address: mockEvmToken.address?.toLowerCase() || '',
-          chainId: mockEvmToken.caipChainId,
+          chainId: '0xe708', // Use hex format, not CAIP format
           balance: '250.75',
           balanceFiat: '$250.75',
           symbol: 'USDC',
@@ -449,7 +449,7 @@ describe('useAssetBalances', () => {
       mockUseTokensWithBalance.mockReturnValue([
         {
           address: mockNotEnabledToken.address?.toLowerCase() || '',
-          chainId: mockNotEnabledToken.caipChainId,
+          chainId: '0xe708', // Use hex format, not CAIP format
           balance: '200.75',
           balanceFiat: '$200.75',
           symbol: 'DAI',
@@ -559,7 +559,7 @@ describe('useAssetBalances', () => {
       mockUseTokensWithBalance.mockReturnValue([
         {
           address: mockEvmToken.address?.toLowerCase() || '',
-          chainId: mockEvmToken.caipChainId,
+          chainId: '0xe708', // Use hex format, not CAIP format
           balance: '125.50',
           balanceFiat: '$125.50',
           symbol: 'USDC',
diff --git a/app/components/UI/Card/hooks/useAssetBalances.tsx b/app/components/UI/Card/hooks/useAssetBalances.tsx
index 7ba8a6df2b3d..8f9389881476 100644
--- a/app/components/UI/Card/hooks/useAssetBalances.tsx
+++ b/app/components/UI/Card/hooks/useAssetBalances.tsx
@@ -71,6 +71,7 @@ export const useAssetBalances = (
           }
         }
       });
+
     return map;
   });
 
@@ -114,6 +115,7 @@ export const useAssetBalances = (
         }
       }
     });
+
     return map;
   });
 
@@ -487,8 +489,13 @@ export const useAssetBalances = (
         : safeFormatChainIdToHex(token.caipChainId);
 
       // Find the token in tokensWithBalance
+      // Note: tokensWithBalance uses hex chainId (e.g., "0xe708") while token has CAIP chainId (e.g., "eip155:59144")
+      // We need to use assetChainId which is already normalized to the correct format
+      // Also need case-insensitive address comparison since tokensWithBalance may have checksum addresses
       const filteredToken = tokensWithBalance.find(
-        (t) => t.address === assetAddress && t.chainId === token.caipChainId,
+        (t) =>
+          t.address?.toLowerCase() === assetAddress?.toLowerCase() &&
+          t.chainId === assetChainId,
       );
 
       // Get wallet asset as fallback
diff --git a/app/components/UI/Perps/components/PerpsConnectionErrorView/PerpsConnectionErrorView.test.tsx b/app/components/UI/Perps/components/PerpsConnectionErrorView/PerpsConnectionErrorView.test.tsx
index 573ee49e5cb5..b17feae1289e 100644
--- a/app/components/UI/Perps/components/PerpsConnectionErrorView/PerpsConnectionErrorView.test.tsx
+++ b/app/components/UI/Perps/components/PerpsConnectionErrorView/PerpsConnectionErrorView.test.tsx
@@ -41,7 +41,7 @@ jest.mock('../../../../../component-library/components/Icons/Icon', () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     default: ({ name, ...props }: any) => <View {...props} testID={name} />,
     IconName: {
-      Details: 'Details',
+      Warning: 'Warning',
     },
     IconColor: {
       Muted: 'Muted',
@@ -146,7 +146,6 @@ describe('PerpsConnectionErrorView', () => {
     );
 
     expect(getByText('perps.errors.connectionFailed.title')).toBeTruthy();
-    expect(getByText('perps.errors.connectionFailed.description')).toBeTruthy();
     expect(getByText('perps.errors.connectionFailed.retry')).toBeTruthy();
   });
 
diff --git a/app/components/UI/Perps/components/PerpsConnectionErrorView/PerpsConnectionErrorView.tsx b/app/components/UI/Perps/components/PerpsConnectionErrorView/PerpsConnectionErrorView.tsx
index d205342e50a1..de934cfcd604 100644
--- a/app/components/UI/Perps/components/PerpsConnectionErrorView/PerpsConnectionErrorView.tsx
+++ b/app/components/UI/Perps/components/PerpsConnectionErrorView/PerpsConnectionErrorView.tsx
@@ -85,7 +85,7 @@ const PerpsConnectionErrorView: React.FC<PerpsConnectionErrorViewProps> = ({
     <View style={styles.container}>
       <View style={styles.errorContainer}>
         <Icon
-          name={IconName.Details}
+          name={IconName.Warning}
           color={IconColor.Muted}
           size={IconSize.Xl}
           style={styles.errorIcon}
@@ -99,14 +99,6 @@ const PerpsConnectionErrorView: React.FC<PerpsConnectionErrorViewProps> = ({
           {strings('perps.errors.connectionFailed.title')}
         </Text>
 
-        <Text
-          variant={TextVariant.BodyMD}
-          color={TextColor.Muted}
-          style={styles.errorMessage}
-        >
-          {strings('perps.errors.connectionFailed.description')}
-        </Text>
-
         {/* Only show debug details in development */}
         {shouldShowDebugDetails && (
           <Text
diff --git a/app/components/UI/Perps/components/PerpsErrorState/PerpsErrorState.test.tsx b/app/components/UI/Perps/components/PerpsErrorState/PerpsErrorState.test.tsx
index 34a1a5d6d173..b42c5979d1be 100644
--- a/app/components/UI/Perps/components/PerpsErrorState/PerpsErrorState.test.tsx
+++ b/app/components/UI/Perps/components/PerpsErrorState/PerpsErrorState.test.tsx
@@ -17,9 +17,6 @@ describe('PerpsErrorState', () => {
       expect(
         getByText(strings('perps.errors.connectionFailed.title')),
       ).toBeTruthy();
-      expect(
-        getByText(strings('perps.errors.connectionFailed.description')),
-      ).toBeTruthy();
 
       const retryButton = getByText(
         strings('perps.errors.connectionFailed.retry'),
diff --git a/app/components/UI/Perps/components/PerpsErrorState/PerpsErrorState.tsx b/app/components/UI/Perps/components/PerpsErrorState/PerpsErrorState.tsx
index 1c250a3de0c2..c3ff5d620bef 100644
--- a/app/components/UI/Perps/components/PerpsErrorState/PerpsErrorState.tsx
+++ b/app/components/UI/Perps/components/PerpsErrorState/PerpsErrorState.tsx
@@ -45,9 +45,9 @@ const PerpsErrorState: React.FC<PerpsErrorStateProps> = ({
     switch (errorType) {
       case PerpsErrorType.CONNECTION_FAILED:
         return {
-          icon: IconName.Wifi,
+          icon: IconName.Warning,
           title: strings('perps.errors.connectionFailed.title'),
-          description: strings('perps.errors.connectionFailed.description'),
+          description: undefined,
           primaryAction: {
             label: strings('perps.errors.connectionFailed.retry'),
             onPress: onRetry,
@@ -97,13 +97,15 @@ const PerpsErrorState: React.FC<PerpsErrorStateProps> = ({
         >
           {errorContent.title}
         </Text>
-        <Text
-          variant={TextVariant.BodyMD}
-          color={TextColor.Muted}
-          style={styles.description}
-        >
-          {errorContent.description}
-        </Text>
+        {errorContent.description && (
+          <Text
+            variant={TextVariant.BodyMD}
+            color={TextColor.Muted}
+            style={styles.description}
+          >
+            {errorContent.description}
+          </Text>
+        )}
         {errorContent.primaryAction?.onPress && (
           <Button
             variant={ButtonVariants.Primary}
diff --git a/app/components/UI/Perps/components/PerpsMarketHoursBanner/PerpsMarketHoursBanner.test.tsx b/app/components/UI/Perps/components/PerpsMarketHoursBanner/PerpsMarketHoursBanner.test.tsx
index 12aa264040fb..acc526395476 100644
--- a/app/components/UI/Perps/components/PerpsMarketHoursBanner/PerpsMarketHoursBanner.test.tsx
+++ b/app/components/UI/Perps/components/PerpsMarketHoursBanner/PerpsMarketHoursBanner.test.tsx
@@ -92,7 +92,7 @@ describe('PerpsMarketHoursBanner', () => {
       );
 
       expect(
-        getByText('Expect more volatility outside of regular market hours'),
+        getByText('Expect more volatility outside of market hours'),
       ).toBeTruthy();
     });
   });
diff --git a/app/components/UI/Perps/components/PerpsWatchlistMarkets/PerpsWatchlistMarkets.tsx b/app/components/UI/Perps/components/PerpsWatchlistMarkets/PerpsWatchlistMarkets.tsx
index 225812dae184..d4442a7b4992 100644
--- a/app/components/UI/Perps/components/PerpsWatchlistMarkets/PerpsWatchlistMarkets.tsx
+++ b/app/components/UI/Perps/components/PerpsWatchlistMarkets/PerpsWatchlistMarkets.tsx
@@ -63,6 +63,7 @@ const PerpsWatchlistMarkets: React.FC<PerpsWatchlistMarketsProps> = ({
     ({ item }: { item: PerpsMarketData }) => (
       <PerpsMarketRowItem
         market={item}
+        showBadge={false}
         onPress={() => handleMarketPress(item)}
       />
     ),
diff --git a/app/components/UI/Perps/components/TradingViewChart/TradingViewChartTemplate.tsx b/app/components/UI/Perps/components/TradingViewChart/TradingViewChartTemplate.tsx
index e4190997b437..dd0235f87f85 100644
--- a/app/components/UI/Perps/components/TradingViewChart/TradingViewChartTemplate.tsx
+++ b/app/components/UI/Perps/components/TradingViewChart/TradingViewChartTemplate.tsx
@@ -569,9 +569,9 @@ export const createTradingViewChartTemplate = (
                         price: parseFloat(currentPrice),
                         color: '#FFF', // White
                         lineWidth: 1,
-                        lineStyle: 0, // Solid line
+                        lineStyle: 2, // Dashed line
                         axisLabelVisible: true,
-                        title: 'Current'
+                        title: ''
                     });
                     // Store reference for future removal
                     window.priceLines.currentPrice = priceLine;
@@ -711,15 +711,15 @@ export const createTradingViewChartTemplate = (
                         price: window.originalPriceLineData.currentPrice.price,
                         color: '#FFF',
                         lineWidth: 1,
-                        lineStyle: 0,
+                        lineStyle: 2,
                         axisLabelVisible: true,
-                        title: 'Current'
+                        title: ''
                     });
                 } catch (error) {
                     // Silent error handling
                 }
             }
-            
+
             // Recreate current price line from stored data
             if (window.originalPriceLineData.currentPrice) {
                 try {
@@ -727,9 +727,9 @@ export const createTradingViewChartTemplate = (
                         price: window.originalPriceLineData.currentPrice.price,
                         color: '#FFF',
                         lineWidth: 1,
-                        lineStyle: 0,
+                        lineStyle: 2,
                         axisLabelVisible: true,
-                        title: 'Current'
+                        title: ''
                     });
                 } catch (error) {
                     // Silent error handling
diff --git a/app/components/UI/Perps/controllers/providers/HyperLiquidProvider.ts b/app/components/UI/Perps/controllers/providers/HyperLiquidProvider.ts
index 663843f67f8c..cac49b0227fb 100644
--- a/app/components/UI/Perps/controllers/providers/HyperLiquidProvider.ts
+++ b/app/components/UI/Perps/controllers/providers/HyperLiquidProvider.ts
@@ -3676,6 +3676,13 @@ export class HyperLiquidProvider implements IPerpsProvider {
       this.ensureClientsInitialized();
       this.clientService.ensureInitialized();
 
+      // CRITICAL: Build asset mapping on first call to ensure DEX discovery
+      // This must happen BEFORE any WebSocket subscriptions receive data
+      // Otherwise HIP-3 positions will be filtered out due to empty discoveredDexNames
+      if (this.coinToAssetId.size === 0) {
+        await this.buildAssetMapping();
+      }
+
       // Path 1: Symbol filtering - group by DEX and fetch in parallel
       if (params?.symbols && params.symbols.length > 0) {
         DevLogger.log(
diff --git a/app/components/UI/Perps/hooks/usePerpsMarkets.ts b/app/components/UI/Perps/hooks/usePerpsMarkets.ts
index dcebede93b2d..816d88a654c6 100644
--- a/app/components/UI/Perps/hooks/usePerpsMarkets.ts
+++ b/app/components/UI/Perps/hooks/usePerpsMarkets.ts
@@ -50,7 +50,7 @@ export interface UsePerpsMarketsOptions {
   skipInitialFetch?: boolean;
   /**
    * Show markets with zero or invalid volume
-   * @default false
+   * @default __DEV__ (true in development, false in production)
    */
   showZeroVolume?: boolean;
 }
@@ -112,7 +112,7 @@ export const usePerpsMarkets = (
     enablePolling = false,
     pollingInterval = 60000, // 1 minute default
     skipInitialFetch = false,
-    showZeroVolume = false,
+    showZeroVolume = __DEV__, // Show zero-volume markets in development mode
   } = options;
 
   const streamManager = usePerpsStream();
diff --git a/app/components/UI/Perps/services/HyperLiquidSubscriptionService.ts b/app/components/UI/Perps/services/HyperLiquidSubscriptionService.ts
index 7b6ad12874a2..938c29e6453a 100644
--- a/app/components/UI/Perps/services/HyperLiquidSubscriptionService.ts
+++ b/app/components/UI/Perps/services/HyperLiquidSubscriptionService.ts
@@ -159,6 +159,7 @@ export class HyperLiquidSubscriptionService {
     this.walletService = walletService;
     this.hip3Enabled = hip3Enabled ?? false;
     this.enabledDexs = enabledDexs ?? [];
+    this.discoveredDexNames = enabledDexs ?? [];
     this.allowlistMarkets = allowlistMarkets ?? [];
     this.blocklistMarkets = blocklistMarkets ?? [];
   }
diff --git a/app/components/UI/Perps/utils/marketDataTransform.test.ts b/app/components/UI/Perps/utils/marketDataTransform.test.ts
index 653d6e81a03d..47c34ed45bc5 100644
--- a/app/components/UI/Perps/utils/marketDataTransform.test.ts
+++ b/app/components/UI/Perps/utils/marketDataTransform.test.ts
@@ -357,7 +357,7 @@ describe('marketDataTransform', () => {
       expect(result[0].marketType).toBe('commodity');
     });
 
-    it('handles unmapped HIP-3 DEX with marketSource but no marketType', () => {
+    it('handles unmapped HIP-3 DEX - defaults to equity marketType', () => {
       const unknownDexAsset = {
         name: 'unknown:ASSET1',
         maxLeverage: 10,
@@ -376,7 +376,7 @@ describe('marketDataTransform', () => {
       expect(result).toHaveLength(1);
       expect(result[0].symbol).toBe('unknown:ASSET1');
       expect(result[0].marketSource).toBe('unknown');
-      expect(result[0].marketType).toBeUndefined();
+      expect(result[0].marketType).toBe('equity');
     });
 
     it('handles main DEX assets with no marketSource or marketType', () => {
diff --git a/app/components/UI/Perps/utils/marketDataTransform.ts b/app/components/UI/Perps/utils/marketDataTransform.ts
index a23cb1b84f25..dd57752b4d44 100644
--- a/app/components/UI/Perps/utils/marketDataTransform.ts
+++ b/app/components/UI/Perps/utils/marketDataTransform.ts
@@ -224,16 +224,21 @@ export function transformMarketData(
       fundingRate = fundingData.predictedFundingRate;
     }
 
-    // Extract DEX and determine market type for badge display
+    // Extract DEX and base symbol for display
+    // e.g., "flx:TSLA" → { dex: "flx", symbol: "TSLA" }
     const { dex } = parseAssetName(symbol);
     const marketSource = dex || undefined;
 
-    // Simple per-asset lookup from feature flag (e.g., 'xyz:GOLD' → 'commodity')
-    const marketType: MarketType | undefined = assetMarketTypes?.[symbol];
+    // Determine market type:
+    // 1. Check explicit mapping (e.g., 'xyz:GOLD' → 'commodity')
+    // 2. Default HIP-3 DEX markets to 'equity' (stocks) if not mapped
+    // 3. Main DEX markets remain undefined (crypto)
+    const marketType: MarketType | undefined =
+      assetMarketTypes?.[symbol] || (dex ? 'equity' : undefined);
 
     return {
       symbol,
-      name: symbol, // HyperLiquid uses symbol as name
+      name: symbol,
       maxLeverage: `${asset.maxLeverage}x`,
       price: isNaN(currentPrice)
         ? PERPS_CONSTANTS.FALLBACK_PRICE_DISPLAY
diff --git a/app/components/UI/Predict/components/MarketListContent/MarketListContent.styles.ts b/app/components/UI/Predict/components/MarketListContent/MarketListContent.styles.ts
index 5dd05eca2af9..5f7290d2f3dd 100644
--- a/app/components/UI/Predict/components/MarketListContent/MarketListContent.styles.ts
+++ b/app/components/UI/Predict/components/MarketListContent/MarketListContent.styles.ts
@@ -24,6 +24,13 @@ const styleSheet = () =>
       width: '100%',
       padding: 16,
     },
+    emptySearchContainer: {
+      justifyContent: 'center',
+      alignItems: 'center',
+      width: '100%',
+      marginTop: 42,
+      padding: 16,
+    },
     marketListContainer: {
       flex: 1,
       width: '100%',
diff --git a/app/components/UI/Predict/components/MarketListContent/MarketListContent.test.tsx b/app/components/UI/Predict/components/MarketListContent/MarketListContent.test.tsx
index c55befb2e1f6..2243a62c6fdd 100644
--- a/app/components/UI/Predict/components/MarketListContent/MarketListContent.test.tsx
+++ b/app/components/UI/Predict/components/MarketListContent/MarketListContent.test.tsx
@@ -5,6 +5,8 @@ import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
 import { PredictCategory, PredictMarket, Recurrence } from '../../types';
 import { usePredictMarketData } from '../../hooks/usePredictMarketData';
+import { strings } from '../../../../../../locales/i18n';
+import { getPredictMarketListSelector } from '../../../../../../e2e/selectors/Predict/Predict.selectors';
 
 // Mock animations to prevent act() warnings
 jest.mock('react-native/Libraries/Animated/Animated', () => {
@@ -172,13 +174,14 @@ const initialState = {
 function setupMarketListContentTest(
   marketDataOverrides = {},
   category: PredictCategory = 'trending',
+  q?: string,
 ) {
   jest.clearAllMocks();
   mockUsePredictMarketData.mockReturnValue({
     ...defaultMockReturn,
     ...marketDataOverrides,
   });
-  return renderWithProvider(<MarketListContent category={category} />, {
+  return renderWithProvider(<MarketListContent category={category} q={q} />, {
     state: initialState,
   });
 }
@@ -255,6 +258,26 @@ describe('MarketListContent', () => {
 
       expect(getByText('No crypto markets available')).toBeOnTheScreen();
     });
+
+    it('renders search empty state when query has no matching markets', () => {
+      const searchTerm = 'bitcoin';
+      const expectedEmptySearchText = strings(
+        'predict.search_no_markets_found',
+        { q: searchTerm },
+      );
+
+      const { getByText, getByTestId } = setupMarketListContentTest(
+        { marketData: [] },
+        'crypto',
+        searchTerm,
+      );
+
+      expect(
+        getByTestId(getPredictMarketListSelector.emptyState()),
+      ).toBeOnTheScreen();
+      expect(getByTestId('icon')).toBeOnTheScreen();
+      expect(getByText(expectedEmptySearchText)).toBeOnTheScreen();
+    });
   });
 
   describe('Data Rendering', () => {
diff --git a/app/components/UI/Predict/components/MarketListContent/MarketListContent.tsx b/app/components/UI/Predict/components/MarketListContent/MarketListContent.tsx
index 665577e03ea1..02370a97176d 100644
--- a/app/components/UI/Predict/components/MarketListContent/MarketListContent.tsx
+++ b/app/components/UI/Predict/components/MarketListContent/MarketListContent.tsx
@@ -22,7 +22,10 @@ import PredictMarketSkeleton from '../PredictMarketSkeleton';
 import { getPredictMarketListSelector } from '../../../../../../e2e/selectors/Predict/Predict.selectors';
 import { ScrollCoordinator } from '../../types/scrollCoordinator';
 import PredictOffline from '../PredictOffline';
-
+import { strings } from '../../../../../../locales/i18n';
+import PredictionsDark from '../../../../../images/predictions-no-search-results-dark.svg';
+import PredictionsLight from '../../../../../images/predictions-no-search-results-light.svg';
+import { useAssetFromTheme } from '../../../../../util/theme';
 interface MarketListContentProps {
   q?: string;
   category: PredictCategory;
@@ -43,6 +46,10 @@ const MarketListContent: React.FC<MarketListContentProps> = ({
   scrollCoordinator,
 }) => {
   const { styles } = useStyles(styleSheet, {});
+  const ThemedPredictions = useAssetFromTheme(
+    PredictionsLight,
+    PredictionsDark,
+  );
   const tw = useTailwind();
   const {
     marketData,
@@ -115,6 +122,25 @@ const MarketListContent: React.FC<MarketListContentProps> = ({
     return <PredictOffline onRetry={handleRefresh} />;
   }
 
+  if (q && q.length > 0 && marketData.length === 0) {
+    return (
+      <Box
+        testID={getPredictMarketListSelector.emptyState()}
+        style={styles.emptySearchContainer}
+      >
+        <ThemedPredictions
+          testID="icon"
+          width={100}
+          height={100}
+          style={tw.style('mb-4')}
+        />
+        <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
+          {strings('predict.search_no_markets_found', { q })}
+        </Text>
+      </Box>
+    );
+  }
+
   if (!marketData || marketData.length === 0) {
     return (
       <Box
@@ -122,7 +148,7 @@ const MarketListContent: React.FC<MarketListContentProps> = ({
         style={styles.emptyContainer}
       >
         <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
-          No {category} markets available
+          {strings('predict.search_empty_state', { category })}
         </Text>
       </Box>
     );
diff --git a/app/components/UI/Predict/components/PredictBalance/PredictBalance.tsx b/app/components/UI/Predict/components/PredictBalance/PredictBalance.tsx
index a93ec4d36fb7..f1dab7ebe377 100644
--- a/app/components/UI/Predict/components/PredictBalance/PredictBalance.tsx
+++ b/app/components/UI/Predict/components/PredictBalance/PredictBalance.tsx
@@ -163,7 +163,6 @@ const PredictBalance: React.FC<PredictBalanceProps> = ({ onLayout }) => {
                 variant={BadgeVariant.Network}
                 imageSource={images.POL}
                 name="Polygon"
-                style={tw.style('rounded-2xl')}
               />
             }
           >
diff --git a/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.test.tsx b/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.test.tsx
index 96ba7cfea24a..59dfe195ba78 100644
--- a/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.test.tsx
+++ b/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.test.tsx
@@ -140,6 +140,9 @@ describe('PredictGTMModal', () => {
     expect(mockNavigate).toHaveBeenCalledWith(Routes.WALLET.HOME);
     expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
+      params: {
+        entryPoint: expect.any(String),
+      },
     });
   });
 
diff --git a/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.tsx b/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.tsx
index df8dbcdabcf6..ffc785b297a0 100644
--- a/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.tsx
+++ b/app/components/UI/Predict/components/PredictGTMModal/PredictGTMModal.tsx
@@ -26,6 +26,7 @@ import {
   PREDICT_GTM_MODAL_DECLINE,
   PREDICT_GTM_MODAL_ENGAGE,
   PREDICT_GTM_WHATS_NEW_MODAL,
+  PredictEventValues,
 } from '../../constants/eventNames';
 
 const PredictGTMModal = () => {
@@ -73,6 +74,9 @@ const PredictGTMModal = () => {
 
     navigate(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.GTM_MODAL,
+      },
     });
   };
 
diff --git a/app/components/UI/Predict/components/PredictNewButton/PredictNewButton.test.tsx b/app/components/UI/Predict/components/PredictNewButton/PredictNewButton.test.tsx
index 7c940856fac7..21ff711c66ad 100644
--- a/app/components/UI/Predict/components/PredictNewButton/PredictNewButton.test.tsx
+++ b/app/components/UI/Predict/components/PredictNewButton/PredictNewButton.test.tsx
@@ -167,6 +167,9 @@ describe('PredictNewButton', () => {
         Routes.PREDICT.ROOT,
         {
           screen: Routes.PREDICT.MARKET_LIST,
+          params: {
+            entryPoint: expect.any(String),
+          },
         },
       );
     });
@@ -193,6 +196,9 @@ describe('PredictNewButton', () => {
         Routes.PREDICT.ROOT,
         {
           screen: Routes.PREDICT.MARKET_LIST,
+          params: {
+            entryPoint: expect.any(String),
+          },
         },
       );
     });
diff --git a/app/components/UI/Predict/components/PredictNewButton/PredictNewButton.tsx b/app/components/UI/Predict/components/PredictNewButton/PredictNewButton.tsx
index a8451e3361aa..b55c872350e0 100644
--- a/app/components/UI/Predict/components/PredictNewButton/PredictNewButton.tsx
+++ b/app/components/UI/Predict/components/PredictNewButton/PredictNewButton.tsx
@@ -18,6 +18,7 @@ import Icon, {
 } from '../../../../../component-library/components/Icons/Icon';
 import { strings } from '../../../../../../locales/i18n';
 import Routes from '../../../../../constants/navigation/Routes';
+import { PredictEventValues } from '../../constants/eventNames';
 
 interface PredictNewButtonProps {}
 
@@ -28,6 +29,9 @@ const PredictNewButton: React.FC<PredictNewButtonProps> = () => {
   const handlePress = () => {
     navigation.navigate(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.HOMEPAGE_NEW_PREDICTION,
+      },
     });
   };
 
diff --git a/app/components/UI/Predict/components/PredictPositionEmpty/PredictPositionEmpty.test.tsx b/app/components/UI/Predict/components/PredictPositionEmpty/PredictPositionEmpty.test.tsx
index 12ba44b9d4a3..c20c2d069b18 100644
--- a/app/components/UI/Predict/components/PredictPositionEmpty/PredictPositionEmpty.test.tsx
+++ b/app/components/UI/Predict/components/PredictPositionEmpty/PredictPositionEmpty.test.tsx
@@ -184,6 +184,9 @@ describe('PredictPositionEmpty', () => {
         Routes.PREDICT.ROOT,
         {
           screen: Routes.PREDICT.MARKET_LIST,
+          params: {
+            entryPoint: expect.any(String),
+          },
         },
       );
     });
diff --git a/app/components/UI/Predict/components/PredictPositionEmpty/PredictPositionEmpty.tsx b/app/components/UI/Predict/components/PredictPositionEmpty/PredictPositionEmpty.tsx
index b7a276c7871e..47856fe244ba 100644
--- a/app/components/UI/Predict/components/PredictPositionEmpty/PredictPositionEmpty.tsx
+++ b/app/components/UI/Predict/components/PredictPositionEmpty/PredictPositionEmpty.tsx
@@ -12,6 +12,8 @@ import styleSheet from './PredictPositionEmpty.styles';
 import PredictionsDark from '../../../../../images/predictions-dark.svg';
 import PredictionsLight from '../../../../../images/predictions-light.svg';
 import { useAssetFromTheme } from '../../../../../util/theme';
+import { PredictEventValues } from '../../constants/eventNames';
+
 interface PredictPositionEmptyProps {}
 
 const PredictPositionEmpty: React.FC<PredictPositionEmptyProps> = () => {
@@ -43,6 +45,9 @@ const PredictPositionEmpty: React.FC<PredictPositionEmptyProps> = () => {
         onPress={() =>
           navigation.navigate(Routes.PREDICT.ROOT, {
             screen: Routes.PREDICT.MARKET_LIST,
+            params: {
+              entryPoint: PredictEventValues.ENTRY_POINT.HOMEPAGE_POSITIONS,
+            },
           })
         }
         label={strings('predict.tab.explore')}
diff --git a/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.test.tsx b/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.test.tsx
index 2cf6b8a8c242..d98699547861 100644
--- a/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.test.tsx
+++ b/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.test.tsx
@@ -875,6 +875,9 @@ describe('MarketsWonCard', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: expect.any(String),
+        },
       });
     });
 
@@ -890,6 +893,9 @@ describe('MarketsWonCard', () => {
       expect(mockNavigate).toHaveBeenCalledTimes(1);
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: expect.any(String),
+        },
       });
     });
 
diff --git a/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx b/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx
index a0a623573348..c391337399f3 100644
--- a/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx
+++ b/app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx
@@ -105,6 +105,9 @@ const PredictPositionsHeader = forwardRef<
   const handleBalanceTouch = () => {
     navigation.navigate(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.HOMEPAGE_BALANCE,
+      },
     });
   };
 
diff --git a/app/components/UI/Predict/constants/eventNames.ts b/app/components/UI/Predict/constants/eventNames.ts
index 360133165a76..8d168b38ca58 100644
--- a/app/components/UI/Predict/constants/eventNames.ts
+++ b/app/components/UI/Predict/constants/eventNames.ts
@@ -62,6 +62,7 @@ export const PredictEventProperties = {
  */
 export const PredictEventValues = {
   ENTRY_POINT: {
+    CAROUSEL: 'carousel',
     PREDICT_FEED: 'predict_feed',
     PREDICT_MARKET_DETAILS: 'predict_market_details',
     SEARCH: 'search',
@@ -69,6 +70,8 @@ export const PredictEventValues = {
     HOMEPAGE_NEW_PREDICTION: 'homepage_new_prediction',
     HOMEPAGE_BALANCE: 'homepage_balance',
     MAIN_TRADE_BUTTON: 'main_trade_button',
+    REWARDS: 'rewards',
+    GTM_MODAL: 'gtm_modal',
     BACKGROUND: 'background',
   },
   TRANSACTION_TYPE: {
diff --git a/app/components/UI/Predict/controllers/PredictController.test.ts b/app/components/UI/Predict/controllers/PredictController.test.ts
index ea04564c3587..d635084a50e2 100644
--- a/app/components/UI/Predict/controllers/PredictController.test.ts
+++ b/app/components/UI/Predict/controllers/PredictController.test.ts
@@ -3448,15 +3448,17 @@ describe('PredictController', () => {
           providerId: 'polymarket',
         });
 
-        expect(addTransactionBatch).toHaveBeenCalledWith({
-          from: '0x1234567890123456789012345678901234567890',
-          origin: 'metamask',
-          networkClientId: expect.any(String),
-          disableHook: true,
-          disableSequential: true,
-          requireApproval: true,
-          transactions: [mockWithdrawResponse.transaction],
-        });
+        expect(addTransactionBatch).toHaveBeenCalledWith(
+          expect.objectContaining({
+            from: '0x1234567890123456789012345678901234567890',
+            origin: 'metamask',
+            networkClientId: expect.any(String),
+            disableHook: true,
+            disableSequential: true,
+            requireApproval: true,
+            transactions: [mockWithdrawResponse.transaction],
+          }),
+        );
       });
     });
 
diff --git a/app/components/UI/Predict/controllers/PredictController.ts b/app/components/UI/Predict/controllers/PredictController.ts
index bc3310c2a7e3..8269dc88deea 100644
--- a/app/components/UI/Predict/controllers/PredictController.ts
+++ b/app/components/UI/Predict/controllers/PredictController.ts
@@ -79,6 +79,7 @@ import { ensureError } from '../utils/predictErrorHandler';
 import { PREDICT_CONSTANTS, PREDICT_ERROR_CODES } from '../constants/errors';
 import { getEvmAccountFromSelectedAccountGroup } from '../utils/accounts';
 import { GEO_BLOCKED_COUNTRIES } from '../constants/geoblock';
+import { MATIC_CONTRACTS } from '../providers/polymarket/constants';
 
 /**
  * State shape for PredictController
@@ -1531,6 +1532,8 @@ export class PredictController extends BaseController<
         networkClientId,
         disableHook: true,
         disableSequential: true,
+        // Temporarily breaking abstraction, can instead be abstracted via provider.
+        gasFeeToken: MATIC_CONTRACTS.collateral as Hex,
         transactions,
       });
 
@@ -1990,6 +1993,8 @@ export class PredictController extends BaseController<
         disableHook: true,
         disableSequential: true,
         requireApproval: true,
+        // Temporarily breaking abstraction, can instead be abstracted via provider.
+        gasFeeToken: MATIC_CONTRACTS.collateral as Hex,
         transactions: [transaction],
       });
 
diff --git a/app/components/UI/Predict/hooks/usePredictRewards.test.ts b/app/components/UI/Predict/hooks/usePredictRewards.test.ts
new file mode 100644
index 000000000000..c395a4a0f798
--- /dev/null
+++ b/app/components/UI/Predict/hooks/usePredictRewards.test.ts
@@ -0,0 +1,300 @@
+import { renderHook, waitFor } from '@testing-library/react-native';
+import { useSelector } from 'react-redux';
+import { usePredictRewards } from './usePredictRewards';
+import bridgeController from '@metamask/bridge-controller';
+import utils, { type CaipAccountId, CaipChainId } from '@metamask/utils';
+import Engine from '../../../../core/Engine';
+import Logger from '../../../../util/Logger';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/accountsController', () => ({
+  selectSelectedInternalAccountFormattedAddress: jest.fn(),
+}));
+
+jest.mock('../../../../core/Engine', () => ({
+  controllerMessenger: {
+    call: jest.fn(),
+  },
+}));
+
+jest.mock('../../../../util/Logger', () => ({
+  error: jest.fn(),
+}));
+
+jest.mock('@metamask/bridge-controller', () => ({
+  formatChainIdToCaip: jest.fn(),
+}));
+
+jest.mock('@metamask/utils', () => ({
+  toCaipAccountId: jest.fn(),
+  parseCaipChainId: jest.fn(),
+}));
+
+jest.mock('../constants/errors', () => ({
+  PREDICT_CONSTANTS: {
+    FEATURE_NAME: 'Predict',
+  },
+}));
+
+// Don't mock ensureError - use the real implementation
+jest.mock('../utils/predictErrorHandler', () => {
+  const actual = jest.requireActual('../utils/predictErrorHandler');
+  return {
+    ensureError: actual.ensureError,
+  };
+});
+
+describe('usePredictRewards', () => {
+  const mockUseSelector = useSelector as jest.MockedFunction<
+    typeof useSelector
+  >;
+  const mockControllerMessengerCall = Engine.controllerMessenger
+    .call as jest.MockedFunction<typeof Engine.controllerMessenger.call>;
+  const mockLoggerError = Logger.error as jest.MockedFunction<
+    typeof Logger.error
+  >;
+  const mockFormatChainIdToCaip =
+    bridgeController.formatChainIdToCaip as jest.MockedFunction<
+      typeof bridgeController.formatChainIdToCaip
+    >;
+  const mockParseCaipChainId = utils.parseCaipChainId as jest.MockedFunction<
+    typeof utils.parseCaipChainId
+  >;
+  const mockToCaipAccountId = utils.toCaipAccountId as jest.MockedFunction<
+    typeof utils.toCaipAccountId
+  >;
+
+  const mockAddress = '0x1234567890123456789012345678901234567890';
+  const mockCaipAccount =
+    'eip155:137:0x1234567890123456789012345678901234567890' as CaipAccountId;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mockUseSelector.mockReturnValue(mockAddress);
+    mockFormatChainIdToCaip.mockReturnValue('eip155:137' as CaipChainId);
+    mockParseCaipChainId.mockReturnValue({
+      namespace: 'eip155',
+      reference: '137',
+    });
+    mockToCaipAccountId.mockReturnValue(mockCaipAccount);
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('when rewards are enabled and account has opted in', () => {
+    it('returns enabled true and isLoading transitions from true to false', async () => {
+      // Arrange
+      mockControllerMessengerCall
+        .mockReturnValueOnce(true)
+        .mockResolvedValueOnce(true);
+
+      // Act
+      const { result } = renderHook(() => usePredictRewards());
+
+      // Assert - initial state
+      expect(result.current.isLoading).toBe(true);
+      expect(result.current.enabled).toBe(false);
+
+      // Assert - final state
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.enabled).toBe(true);
+      expect(mockControllerMessengerCall).toHaveBeenCalledTimes(2);
+      expect(mockControllerMessengerCall).toHaveBeenCalledWith(
+        'RewardsController:isRewardsFeatureEnabled',
+      );
+      expect(mockControllerMessengerCall).toHaveBeenCalledWith(
+        'RewardsController:getHasAccountOptedIn',
+        mockCaipAccount,
+      );
+    });
+  });
+
+  describe('when rewards feature is not enabled', () => {
+    it('returns enabled false and stops checking', async () => {
+      // Arrange
+      mockControllerMessengerCall.mockReturnValueOnce(false);
+
+      // Act
+      const { result } = renderHook(() => usePredictRewards());
+
+      // Assert
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.enabled).toBe(false);
+      expect(mockControllerMessengerCall).toHaveBeenCalledTimes(1);
+      expect(mockControllerMessengerCall).toHaveBeenCalledWith(
+        'RewardsController:isRewardsFeatureEnabled',
+      );
+    });
+  });
+
+  describe('when account has not opted in', () => {
+    it('returns enabled false after checking opt-in status', async () => {
+      // Arrange
+      mockControllerMessengerCall
+        .mockReturnValueOnce(true)
+        .mockResolvedValueOnce(false);
+
+      // Act
+      const { result } = renderHook(() => usePredictRewards());
+
+      // Assert
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.enabled).toBe(false);
+      expect(mockControllerMessengerCall).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('when selected address is missing', () => {
+    it('returns enabled false and isLoading false without calling controller', async () => {
+      // Arrange
+      mockUseSelector.mockReturnValue(null);
+
+      // Act
+      const { result } = renderHook(() => usePredictRewards());
+
+      // Assert
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.enabled).toBe(false);
+      expect(mockControllerMessengerCall).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when CAIP-10 formatting fails', () => {
+    it('returns enabled false and logs error with proper context', async () => {
+      // Arrange
+      const mockError = new Error('Invalid chain ID');
+      mockFormatChainIdToCaip.mockImplementation(() => {
+        throw mockError;
+      });
+      mockControllerMessengerCall.mockReturnValueOnce(true);
+
+      // Act
+      const { result } = renderHook(() => usePredictRewards());
+
+      // Assert
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.enabled).toBe(false);
+      expect(mockLoggerError).toHaveBeenCalledWith(mockError, {
+        tags: {
+          feature: 'Predict',
+          component: 'usePredictRewards',
+        },
+        context: {
+          name: 'usePredictRewards',
+          data: {
+            method: 'formatAccountToCaipAccountId',
+            action: 'caip_formatting',
+            operation: 'account_formatting',
+          },
+        },
+      });
+      expect(mockControllerMessengerCall).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('when RewardsController call fails', () => {
+    it('returns enabled false and logs error with proper context', async () => {
+      // Arrange
+      const mockError = new Error('Network error');
+      mockControllerMessengerCall.mockReturnValueOnce(true);
+      mockControllerMessengerCall.mockRejectedValueOnce(mockError);
+
+      // Suppress console.error for this test since we expect an error to be thrown
+      const consoleErrorSpy = jest
+        .spyOn(console, 'error')
+        .mockImplementation(() => {
+          // Suppress error output
+        });
+
+      // Act
+      const { result } = renderHook(() => usePredictRewards());
+
+      // Assert
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.enabled).toBe(false);
+      expect(mockLoggerError).toHaveBeenCalledWith(mockError, {
+        tags: {
+          feature: 'Predict',
+          component: 'usePredictRewards',
+        },
+        context: {
+          name: 'usePredictRewards',
+          data: {
+            method: 'checkRewardsEnabled',
+            action: 'rewards_check',
+            operation: 'rewards_status',
+          },
+        },
+      });
+
+      consoleErrorSpy.mockRestore();
+    });
+  });
+
+  describe('when account changes', () => {
+    it('rechecks rewards status with new account', async () => {
+      // Arrange
+      mockControllerMessengerCall
+        .mockReturnValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockReturnValueOnce(true)
+        .mockResolvedValueOnce(false);
+
+      // Act
+      const { result, rerender } = renderHook(() => usePredictRewards());
+
+      // Assert - first account
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.enabled).toBe(true);
+      expect(mockControllerMessengerCall).toHaveBeenCalledTimes(2);
+
+      // Arrange - change account
+      const newAddress = '0x9876543210987654321098765432109876543210';
+      const newCaipAccount =
+        'eip155:137:0x9876543210987654321098765432109876543210' as CaipAccountId;
+      mockUseSelector.mockReturnValue(newAddress);
+      mockToCaipAccountId.mockReturnValue(newCaipAccount);
+
+      // Act - trigger rerender
+      rerender({});
+
+      // Assert - second account
+      await waitFor(() => {
+        expect(result.current.enabled).toBe(false);
+      });
+
+      expect(mockControllerMessengerCall).toHaveBeenCalledTimes(4);
+      expect(mockControllerMessengerCall).toHaveBeenLastCalledWith(
+        'RewardsController:getHasAccountOptedIn',
+        newCaipAccount,
+      );
+    });
+  });
+});
diff --git a/app/components/UI/Predict/hooks/usePredictRewards.ts b/app/components/UI/Predict/hooks/usePredictRewards.ts
new file mode 100644
index 000000000000..7a374972f76b
--- /dev/null
+++ b/app/components/UI/Predict/hooks/usePredictRewards.ts
@@ -0,0 +1,133 @@
+import { useState, useEffect, useCallback } from 'react';
+import { useSelector } from 'react-redux';
+import Engine from '../../../../core/Engine';
+import { formatChainIdToCaip } from '@metamask/bridge-controller';
+import {
+  toCaipAccountId,
+  parseCaipChainId,
+  type CaipAccountId,
+} from '@metamask/utils';
+import { PREDICT_CONSTANTS } from '../constants/errors';
+import { ensureError } from '../utils/predictErrorHandler';
+import { selectSelectedInternalAccountFormattedAddress } from '../../../../selectors/accountsController';
+import Logger from '../../../../util/Logger';
+
+// Polygon mainnet chain ID
+const POLYGON_CHAIN_ID = '0x89';
+
+interface UsePredictRewardsResult {
+  enabled: boolean;
+  isLoading: boolean;
+}
+
+/**
+ * Formats an address to CAIP-10 account ID for Polygon
+ */
+const formatAccountToCaipAccountId = (
+  address: string,
+): CaipAccountId | null => {
+  try {
+    const caipChainId = formatChainIdToCaip(POLYGON_CHAIN_ID);
+    const { namespace, reference } = parseCaipChainId(caipChainId);
+    return toCaipAccountId(namespace, reference, address);
+  } catch (error) {
+    Logger.error(ensureError(error), {
+      tags: {
+        feature: PREDICT_CONSTANTS.FEATURE_NAME,
+        component: 'usePredictRewards',
+      },
+      context: {
+        name: 'usePredictRewards',
+        data: {
+          method: 'formatAccountToCaipAccountId',
+          action: 'caip_formatting',
+          operation: 'account_formatting',
+        },
+      },
+    });
+    return null;
+  }
+};
+
+/**
+ * Hook to check if rewards are enabled for the current account in Predict
+ * @returns {UsePredictRewardsResult} Object containing enabled status and loading state
+ */
+export const usePredictRewards = (): UsePredictRewardsResult => {
+  const [isLoading, setIsLoading] = useState(true);
+  const [enabled, setEnabled] = useState(false);
+
+  // Selectors
+  const selectedAddress = useSelector(
+    selectSelectedInternalAccountFormattedAddress,
+  );
+
+  const checkRewardsEnabled = useCallback(async () => {
+    // Skip if missing required data
+    if (!selectedAddress) {
+      setEnabled(false);
+      setIsLoading(false);
+      return;
+    }
+
+    setIsLoading(true);
+
+    try {
+      // Check if rewards feature is enabled globally
+      const isRewardsEnabled = Engine.controllerMessenger.call(
+        'RewardsController:isRewardsFeatureEnabled',
+      );
+
+      if (!isRewardsEnabled) {
+        setEnabled(false);
+        setIsLoading(false);
+        return;
+      }
+
+      // Format account to CAIP-10 for Polygon
+      const caipAccount = formatAccountToCaipAccountId(selectedAddress);
+
+      if (!caipAccount) {
+        setEnabled(false);
+        setIsLoading(false);
+        return;
+      }
+
+      // Check if account has opted in
+      const hasOptedIn = await Engine.controllerMessenger.call(
+        'RewardsController:getHasAccountOptedIn',
+        caipAccount,
+      );
+
+      setEnabled(hasOptedIn);
+    } catch (error) {
+      Logger.error(ensureError(error), {
+        tags: {
+          feature: PREDICT_CONSTANTS.FEATURE_NAME,
+          component: 'usePredictRewards',
+        },
+        context: {
+          name: 'usePredictRewards',
+          data: {
+            method: 'checkRewardsEnabled',
+            action: 'rewards_check',
+            operation: 'rewards_status',
+          },
+        },
+      });
+      setEnabled(false);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [selectedAddress]);
+
+  // Check rewards status when dependencies change
+  useEffect(() => {
+    checkRewardsEnabled();
+  }, [checkRewardsEnabled]);
+
+  return {
+    enabled,
+    isLoading,
+  };
+};
diff --git a/app/components/UI/Predict/hooks/useUnrealizedPnL.test.tsx b/app/components/UI/Predict/hooks/useUnrealizedPnL.test.tsx
index de2ebe6bdb74..bb8cb5be784d 100644
--- a/app/components/UI/Predict/hooks/useUnrealizedPnL.test.tsx
+++ b/app/components/UI/Predict/hooks/useUnrealizedPnL.test.tsx
@@ -14,6 +14,7 @@ jest.mock('@react-navigation/native', () => ({
 }));
 
 const mockGetUnrealizedPnL = jest.fn();
+const mockGetPositions = jest.fn();
 
 // Mock DevLogger
 jest.mock('../../../../core/SDKConnect/utils/DevLogger', () => ({
@@ -26,6 +27,7 @@ jest.mock('../../../../core/Engine', () => ({
   context: {
     PredictController: {
       getUnrealizedPnL: mockGetUnrealizedPnL,
+      getPositions: mockGetPositions,
     },
     AccountTreeController: {
       getAccountsFromSelectedAccountGroup: jest.fn(() => [
@@ -50,6 +52,7 @@ interface MockEngine {
   context: {
     PredictController?: {
       getUnrealizedPnL: jest.Mock;
+      getPositions: jest.Mock;
     };
     AccountTreeController?: {
       getAccountsFromSelectedAccountGroup: jest.Mock;
@@ -68,9 +71,12 @@ describe('useUnrealizedPnL', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    // Default: return positions with at least one item so tests pass by default
+    mockGetPositions.mockResolvedValue([{ id: 'position-1' }]);
     engine.context = {
       PredictController: {
         getUnrealizedPnL: mockGetUnrealizedPnL,
+        getPositions: mockGetPositions,
       },
       AccountTreeController: {
         getAccountsFromSelectedAccountGroup: jest.fn(() => [
@@ -260,4 +266,108 @@ describe('useUnrealizedPnL', () => {
       providerId: 'other-provider',
     });
   });
+
+  describe('positions-based visibility', () => {
+    it('returns null when user has no positions', async () => {
+      mockGetUnrealizedPnL.mockResolvedValue(basePnL);
+      mockGetPositions.mockResolvedValue([]);
+
+      const { result } = renderHook(() => useUnrealizedPnL());
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.unrealizedPnL).toBeNull();
+      expect(result.current.error).toBeNull();
+      expect(mockGetPositions).toHaveBeenCalledWith({
+        providerId: undefined,
+        limit: 1,
+        offset: 0,
+        claimable: false,
+      });
+    });
+
+    it('returns unrealized P&L when user has positions', async () => {
+      mockGetUnrealizedPnL.mockResolvedValue(basePnL);
+      mockGetPositions.mockResolvedValue([
+        { id: 'position-1' },
+        { id: 'position-2' },
+      ]);
+
+      const { result } = renderHook(() => useUnrealizedPnL());
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.unrealizedPnL).toEqual(basePnL);
+      expect(result.current.error).toBeNull();
+    });
+
+    it('calls getPositions with providerId when specified', async () => {
+      mockGetUnrealizedPnL.mockResolvedValue(basePnL);
+      mockGetPositions.mockResolvedValue([{ id: 'position-1' }]);
+
+      const { result } = renderHook(() =>
+        useUnrealizedPnL({
+          providerId: 'polymarket',
+        }),
+      );
+
+      await waitFor(() => {
+        expect(result.current.unrealizedPnL).toEqual(basePnL);
+      });
+
+      expect(mockGetPositions).toHaveBeenCalledWith({
+        providerId: 'polymarket',
+        limit: 1,
+        offset: 0,
+        claimable: false,
+      });
+    });
+
+    it('returns null when getUnrealizedPnL returns null and user has positions', async () => {
+      mockGetUnrealizedPnL.mockResolvedValue(null);
+      mockGetPositions.mockResolvedValue([{ id: 'position-1' }]);
+
+      const { result } = renderHook(() => useUnrealizedPnL());
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.unrealizedPnL).toBeNull();
+      expect(result.current.error).toBeNull();
+    });
+
+    it('returns null when both getUnrealizedPnL and getPositions return empty', async () => {
+      mockGetUnrealizedPnL.mockResolvedValue(null);
+      mockGetPositions.mockResolvedValue([]);
+
+      const { result } = renderHook(() => useUnrealizedPnL());
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      expect(result.current.unrealizedPnL).toBeNull();
+      expect(result.current.error).toBeNull();
+    });
+
+    it('calls both getUnrealizedPnL and getPositions in parallel', async () => {
+      mockGetUnrealizedPnL.mockResolvedValue(basePnL);
+      mockGetPositions.mockResolvedValue([{ id: 'position-1' }]);
+
+      renderHook(() => useUnrealizedPnL());
+
+      await waitFor(() => {
+        expect(mockGetUnrealizedPnL).toHaveBeenCalled();
+        expect(mockGetPositions).toHaveBeenCalled();
+      });
+
+      expect(mockGetUnrealizedPnL).toHaveBeenCalledTimes(1);
+      expect(mockGetPositions).toHaveBeenCalledTimes(1);
+    });
+  });
 });
diff --git a/app/components/UI/Predict/hooks/useUnrealizedPnL.tsx b/app/components/UI/Predict/hooks/useUnrealizedPnL.tsx
index 3eb68c131073..59c22059ac87 100644
--- a/app/components/UI/Predict/hooks/useUnrealizedPnL.tsx
+++ b/app/components/UI/Predict/hooks/useUnrealizedPnL.tsx
@@ -75,13 +75,21 @@ export const useUnrealizedPnL = (
         }
         setError(null);
 
-        const unrealizedPnLData =
-          await Engine.context.PredictController.getUnrealizedPnL({
+        const [unrealizedPnLData, positions] = await Promise.all([
+          Engine.context.PredictController.getUnrealizedPnL({
             address: address ?? selectedInternalAccountAddress,
             providerId,
-          });
-
-        setUnrealizedPnL(unrealizedPnLData ?? null);
+          }),
+          Engine.context.PredictController.getPositions({
+            providerId,
+            limit: 1,
+            offset: 0,
+            claimable: false,
+          }),
+        ]);
+
+        const _unrealizedPnL = unrealizedPnLData ?? null;
+        setUnrealizedPnL(positions.length > 0 ? _unrealizedPnL : null);
 
         DevLogger.log('useUnrealizedPnL: Loaded unrealized P&L', {
           unrealizedPnL: unrealizedPnLData,
diff --git a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts
index 7f144616ec47..86101c4312b9 100644
--- a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts
+++ b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts
@@ -7,6 +7,8 @@ import { Hex, numberToHex } from '@metamask/utils';
 import { parseUnits } from 'ethers/lib/utils';
 import { DevLogger } from '../../../../../core/SDKConnect/utils/DevLogger';
 import Logger, { type LoggerErrorOptions } from '../../../../../util/Logger';
+import { MetaMetrics } from '../../../../../core/Analytics';
+import { UserProfileProperty } from '../../../../../util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types';
 import {
   generateTransferData,
   isSmartContractAddress,
@@ -1298,6 +1300,32 @@ export class PolymarketProvider implements PredictProvider {
     return result;
   }
 
+  /**
+   * Set user trait for Polymarket account creation via MetaMask
+   * Fire-and-forget operation that logs errors but doesn't fail
+   */
+  private setPolymarketAccountCreatedTrait(): void {
+    MetaMetrics.getInstance()
+      .addTraitsToUser({
+        [UserProfileProperty.CREATED_POLYMARKET_ACCOUNT_VIA_MM]: true,
+      })
+      .catch((error) => {
+        // Log error but don't fail the deposit preparation
+        Logger.error(error as Error, {
+          tags: {
+            feature: PREDICT_CONSTANTS.FEATURE_NAME,
+            provider: 'polymarket',
+          },
+          context: {
+            name: 'PolymarketProvider',
+            data: {
+              method: 'setPolymarketAccountCreatedTrait',
+            },
+          },
+        });
+      });
+  }
+
   public async prepareDeposit(
     params: PrepareDepositParams & { signer: Signer },
   ): Promise<PrepareDepositResponse> {
@@ -1340,6 +1368,9 @@ export class PolymarketProvider implements PredictProvider {
       }
 
       transactions.push(deployTransaction);
+
+      // Set user trait for Polymarket account creation via MetaMask
+      this.setPolymarketAccountCreatedTrait();
     }
 
     if (!accountState.hasAllowances) {
diff --git a/app/components/UI/Predict/views/PredictBuyPreview/PredictBuyPreview.tsx b/app/components/UI/Predict/views/PredictBuyPreview/PredictBuyPreview.tsx
index 70404de863bb..96d205843006 100644
--- a/app/components/UI/Predict/views/PredictBuyPreview/PredictBuyPreview.tsx
+++ b/app/components/UI/Predict/views/PredictBuyPreview/PredictBuyPreview.tsx
@@ -62,6 +62,7 @@ import { usePredictDeposit } from '../../hooks/usePredictDeposit';
 import Skeleton from '../../../../../component-library/components/Skeleton/Skeleton';
 import { strings } from '../../../../../../locales/i18n';
 import ButtonHero from '../../../../../component-library/components-temp/Buttons/ButtonHero';
+import { usePredictRewards } from '../../hooks/usePredictRewards';
 import { TraceName } from '../../../../../util/trace';
 import { usePredictMeasurement } from '../../hooks/usePredictMeasurement';
 
@@ -137,6 +138,9 @@ const PredictBuyPreview = () => {
     autoRefreshTimeout: 1000,
   });
 
+  const { enabled: isRewardsEnabled, isLoading: isRewardsLoading } =
+    usePredictRewards();
+
   // Track screen load performance (balance + initial preview)
   usePredictMeasurement({
     traceName: TraceName.PredictBuyPreviewView,
@@ -200,7 +204,7 @@ const PredictBuyPreview = () => {
   );
 
   // Show rewards row if we have a valid amount
-  const shouldShowRewards = currentValue > 0;
+  const shouldShowRewards = isRewardsEnabled && currentValue > 0;
 
   // Validation constants and states
   const MINIMUM_BET = 1; // $1 minimum bet
@@ -212,6 +216,7 @@ const PredictBuyPreview = () => {
     preview &&
     !isLoading &&
     !isBalanceLoading &&
+    !isRewardsLoading &&
     !isRateLimited;
 
   const title = market.title;
diff --git a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx
index c65f1456d25c..a0d5d096ded3 100644
--- a/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx
+++ b/app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx
@@ -773,99 +773,100 @@ const PredictMarketDetails: React.FC<PredictMarketDetailsProps> = () => {
   };
 
   const renderAboutSection = () => (
-    <Box twClassName="space-y-6">
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        justifyContent={BoxJustifyContent.Between}
-        twClassName="gap-3 mb-2"
-      >
+    <Box twClassName="gap-6">
+      <Box twClassName="gap-4">
         <Box
           flexDirection={BoxFlexDirection.Row}
           alignItems={BoxAlignItems.Center}
+          justifyContent={BoxJustifyContent.Between}
           twClassName="gap-3"
         >
-          <Icon
-            name={IconName.Chart}
-            size={IconSize.Md}
-            color={colors.text.muted}
-          />
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-3"
+          >
+            <Icon
+              name={IconName.Chart}
+              size={IconSize.Md}
+              color={colors.text.muted}
+            />
+            <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
+              {strings('predict.market_details.volume')}
+            </Text>
+          </Box>
           <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
-            {strings('predict.market_details.volume')}
+            ${formatVolume(market?.outcomes[0].volume || 0)}
           </Text>
         </Box>
-        <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
-          ${formatVolume(market?.outcomes[0].volume || 0)}
-        </Text>
-      </Box>
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        justifyContent={BoxJustifyContent.Between}
-        twClassName="gap-3 my-2"
-      >
         <Box
           flexDirection={BoxFlexDirection.Row}
           alignItems={BoxAlignItems.Center}
+          justifyContent={BoxJustifyContent.Between}
           twClassName="gap-3"
         >
-          <Icon
-            name={IconName.Clock}
-            size={IconSize.Md}
-            color={colors.text.muted}
-          />
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-3"
+          >
+            <Icon
+              name={IconName.Clock}
+              size={IconSize.Md}
+              color={colors.text.muted}
+            />
+            <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
+              {strings('predict.market_details.end_date')}
+            </Text>
+          </Box>
           <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
-            {strings('predict.market_details.end_date')}
+            {market?.endDate
+              ? new Date(market?.endDate).toLocaleDateString()
+              : 'N/A'}
           </Text>
         </Box>
-        <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
-          {market?.endDate
-            ? new Date(market?.endDate).toLocaleDateString()
-            : 'N/A'}
-        </Text>
-      </Box>
-
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        justifyContent={BoxJustifyContent.Between}
-        twClassName="gap-3 my-2"
-      >
         <Box
           flexDirection={BoxFlexDirection.Row}
           alignItems={BoxAlignItems.Center}
+          justifyContent={BoxJustifyContent.Between}
           twClassName="gap-3"
         >
-          <Icon
-            name={IconName.Bank}
-            size={IconSize.Md}
-            color={colors.text.muted}
-          />
-          <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
-            {strings('predict.market_details.resolution_details')}
-          </Text>
-        </Box>
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          alignItems={BoxAlignItems.Center}
-          twClassName="gap-2"
-        >
-          <Pressable onPress={handlePolymarketResolution}>
-            <Text
-              variant={TextVariant.BodyMDMedium}
-              color={colors.primary.default}
-            >
-              Polymarket
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-3"
+          >
+            <Icon
+              name={IconName.Bank}
+              size={IconSize.Md}
+              color={colors.text.muted}
+            />
+            <Text variant={TextVariant.BodyMDMedium} color={TextColor.Default}>
+              {strings('predict.market_details.resolution_details')}
             </Text>
-          </Pressable>
-          <Icon
-            name={IconName.Export}
-            size={IconSize.Sm}
-            color={colors.primary.default}
-          />
+          </Box>
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            twClassName="gap-1"
+          >
+            <Pressable onPress={handlePolymarketResolution}>
+              <Text
+                variant={TextVariant.BodyMDMedium}
+                color={colors.primary.default}
+              >
+                Polymarket
+              </Text>
+            </Pressable>
+            <Icon
+              name={IconName.Export}
+              size={IconSize.Sm}
+              color={colors.primary.default}
+            />
+          </Box>
         </Box>
       </Box>
-      <Box twClassName="w-full border-t border-muted py-2" />
+      <Box twClassName="w-full border-t border-muted" />
       <Text variant={TextVariant.BodySM} color={TextColor.Alternative}>
         {market?.description}
       </Text>
diff --git a/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.test.tsx b/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.test.tsx
index 1629da43ecf4..6316288d77d3 100644
--- a/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.test.tsx
+++ b/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.test.tsx
@@ -560,6 +560,9 @@ describe('WaysToEarn', () => {
       expect(mockGoBack).toHaveBeenCalled();
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: expect.any(String),
+        },
       });
       expect(mockTrackEvent).toHaveBeenCalled();
       expect(mockCreateEventBuilder).toHaveBeenCalledWith(
diff --git a/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.tsx b/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.tsx
index 30522c47d490..804cfae36dbc 100644
--- a/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.tsx
+++ b/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.tsx
@@ -32,6 +32,7 @@ import {
   selectRewardsMusdDepositEnabledFlag,
 } from '../../../../../../../selectors/featureFlagController/rewards';
 import { selectPredictEnabledFlag } from '../../../../../Predict/selectors/featureFlags';
+import { PredictEventValues } from '../../../../../Predict/constants/eventNames';
 import {
   MetaMetricsEvents,
   useMetrics,
@@ -272,6 +273,9 @@ export const WaysToEarn = () => {
       case WayToEarnType.PREDICT:
         navigation.navigate(Routes.PREDICT.ROOT, {
           screen: Routes.PREDICT.MARKET_LIST,
+          params: {
+            entryPoint: PredictEventValues.ENTRY_POINT.REWARDS,
+          },
         });
         break;
       case WayToEarnType.CARD:
diff --git a/app/components/UI/TransactionElement/index.js b/app/components/UI/TransactionElement/index.js
index 2472719164fd..6f87dca8e2af 100644
--- a/app/components/UI/TransactionElement/index.js
+++ b/app/components/UI/TransactionElement/index.js
@@ -155,7 +155,9 @@ const transactionIconSwapFailed = require('../../../images/transaction-icons/swa
 
 const NEW_TRANSACTION_DETAILS_TYPES = [
   TransactionType.perpsDeposit,
+  TransactionType.predictClaim,
   TransactionType.predictDeposit,
+  TransactionType.predictWithdraw,
 ];
 
 /**
diff --git a/app/components/Views/ActivityView/index.js b/app/components/Views/ActivityView/index.js
index 0b3dffb0abe9..52e238d57ea5 100644
--- a/app/components/Views/ActivityView/index.js
+++ b/app/components/Views/ActivityView/index.js
@@ -184,8 +184,8 @@ const ActivityView = () => {
   const [activeTabIndex, setActiveTabIndex] = useState(0);
   const predictEnabledFlag = useSelector(selectPredictEnabledFlag);
   const isPredictEnabled = useMemo(
-    () => predictEnabledFlag && isEvmSelected,
-    [predictEnabledFlag, isEvmSelected],
+    () => predictEnabledFlag,
+    [predictEnabledFlag],
   );
 
   const openAccountSelector = useCallback(() => {
@@ -254,7 +254,7 @@ const ActivityView = () => {
   // Calculate if Perps tab is currently active
   // Perps is the last tab, so its index depends on what other tabs are shown
   const perpsTabIndex = 2;
-  const predictTabIndex = 3;
+  const predictTabIndex = isPerpsEnabled ? 3 : 2;
   const isPerpsTabActive = isPerpsEnabled && activeTabIndex === perpsTabIndex;
   const isPredictTabActive =
     isPredictEnabled && activeTabIndex === predictTabIndex;
diff --git a/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx b/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
index f51ccdce61b9..60fc6a1fe204 100644
--- a/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
+++ b/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
@@ -627,7 +627,7 @@ describe('TradeWalletActions', () => {
     expect(mockOnDismiss).not.toHaveBeenCalled();
   });
 
-  it('should not show Predict button on non-EVM networks', () => {
+  it('should show Predict button on non-EVM networks', () => {
     (
       selectPredictEnabledFlag as jest.MockedFunction<
         typeof selectPredictEnabledFlag
@@ -643,7 +643,7 @@ describe('TradeWalletActions', () => {
       ...mockInitialState,
     };
 
-    const { queryByTestId } = renderScreen(
+    const { getByTestId } = renderScreen(
       TradeWalletActions,
       {
         name: 'TradeWalletActions',
@@ -654,7 +654,7 @@ describe('TradeWalletActions', () => {
     );
 
     expect(
-      queryByTestId(WalletActionsBottomSheetSelectorsIDs.PREDICT_BUTTON),
-    ).toBeNull();
+      getByTestId(WalletActionsBottomSheetSelectorsIDs.PREDICT_BUTTON),
+    ).toBeOnTheScreen();
   });
 });
diff --git a/app/components/Views/TradeWalletActions/TradeWalletActions.tsx b/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
index f61e5d35ba9c..c613f9c4067a 100644
--- a/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
+++ b/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
@@ -48,6 +48,7 @@ import {
 } from '../../UI/Earn/selectors/featureFlags';
 import { selectPerpsEnabledFlag } from '../../UI/Perps';
 import { selectPredictEnabledFlag } from '../../UI/Predict';
+import { PredictEventValues } from '../../UI/Predict/constants/eventNames';
 import { EVENT_LOCATIONS as STAKE_EVENT_LOCATIONS } from '../../UI/Stake/constants/events';
 import { MetaMetricsEvents, useMetrics } from '../../hooks/useMetrics';
 
@@ -146,6 +147,9 @@ function TradeWalletActions() {
     postCallback.current = () => {
       navigate(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: PredictEventValues.ENTRY_POINT.MAIN_TRADE_BUTTON,
+        },
       });
     };
     handleNavigateBack();
@@ -287,7 +291,7 @@ function TradeWalletActions() {
                     isDisabled={!canSignTransactions}
                   />
                 )}
-                {isPredictEnabled && isEvmSelected && (
+                {isPredictEnabled && (
                   <ActionListItem
                     label={strings('asset_overview.predict_button')}
                     description={strings('asset_overview.predict_description')}
diff --git a/app/components/Views/WalletActions/WalletActions.test.tsx b/app/components/Views/WalletActions/WalletActions.test.tsx
index ee134f4b6b45..eef26b865a29 100644
--- a/app/components/Views/WalletActions/WalletActions.test.tsx
+++ b/app/components/Views/WalletActions/WalletActions.test.tsx
@@ -516,6 +516,9 @@ describe('WalletActions', () => {
 
     expect(mockNavigate).toHaveBeenCalledWith('Predict', {
       screen: 'PredictMarketList',
+      params: {
+        entryPoint: expect.any(String),
+      },
     });
   });
 
diff --git a/app/components/Views/WalletActions/WalletActions.tsx b/app/components/Views/WalletActions/WalletActions.tsx
index d1287833b8e4..b3bfc7b1e71c 100644
--- a/app/components/Views/WalletActions/WalletActions.tsx
+++ b/app/components/Views/WalletActions/WalletActions.tsx
@@ -31,6 +31,7 @@ import {
 import { selectPerpsEnabledFlag } from '../../UI/Perps';
 import { PerpsEventValues } from '../../UI/Perps/constants/eventNames';
 import { selectPredictEnabledFlag } from '../../UI/Predict/selectors/featureFlags';
+import { PredictEventValues } from '../../UI/Predict/constants/eventNames';
 import { EARN_INPUT_VIEW_ACTIONS } from '../../UI/Earn/Views/EarnInputView/EarnInputView.types';
 import { earnSelectors } from '../../../selectors/earnController/earn';
 import {
@@ -147,6 +148,9 @@ const WalletActions = () => {
     closeBottomSheetAndNavigate(() => {
       navigate(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: PredictEventValues.ENTRY_POINT.MAIN_TRADE_BUTTON,
+        },
       });
     });
   }, [closeBottomSheetAndNavigate, navigate]);
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-account-row/index.ts b/app/components/Views/confirmations/components/activity/transaction-details-account-row/index.ts
new file mode 100644
index 000000000000..5823b8948e3d
--- /dev/null
+++ b/app/components/Views/confirmations/components/activity/transaction-details-account-row/index.ts
@@ -0,0 +1 @@
+export * from './transaction-details-account-row';
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.test.tsx
new file mode 100644
index 000000000000..c1923a1ad3b8
--- /dev/null
+++ b/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.test.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import renderWithProvider from '../../../../../../util/test/renderWithProvider';
+import { TransactionDetailsAccountRow } from './transaction-details-account-row';
+import { useAccountNames } from '../../../../../hooks/DisplayName/useAccountNames';
+import { Hex } from '@metamask/utils';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import { useTransactionDetails } from '../../../hooks/activity/useTransactionDetails';
+
+jest.mock('../../../../../hooks/DisplayName/useAccountNames');
+jest.mock('../../../hooks/activity/useTransactionDetails');
+
+const ACCOUNT_NAME_MOCK = 'Test Account 1';
+const ADDRESS_MOCK = '0x123' as Hex;
+
+const TRANSACTION_META_MOCK = {
+  chainId: '0x123' as Hex,
+  txParams: {
+    from: ADDRESS_MOCK,
+  },
+  type: TransactionType.predictWithdraw,
+} as TransactionMeta;
+
+function render() {
+  return renderWithProvider(<TransactionDetailsAccountRow />, {});
+}
+
+describe('TransactionDetailsAccountRow', () => {
+  const useTransactionDetailsMock = jest.mocked(useTransactionDetails);
+  const useAccountNamesMock = jest.mocked(useAccountNames);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: TRANSACTION_META_MOCK,
+    });
+
+    useAccountNamesMock.mockReturnValue([ACCOUNT_NAME_MOCK]);
+  });
+
+  it('renders account name', () => {
+    const { getByText } = render();
+    expect(getByText(ACCOUNT_NAME_MOCK)).toBeDefined();
+  });
+
+  it('renders address if no account name', () => {
+    useAccountNamesMock.mockReturnValue([undefined]);
+
+    const { getByText } = render();
+    expect(getByText(ADDRESS_MOCK)).toBeDefined();
+  });
+
+  it('renders nothing if transaction type is not in the list', () => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: {
+        ...TRANSACTION_META_MOCK,
+        type: TransactionType.simpleSend,
+      },
+    });
+
+    const { toJSON } = render();
+    expect(toJSON()).toBeNull();
+  });
+});
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.tsx b/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.tsx
new file mode 100644
index 000000000000..8942ac08aac6
--- /dev/null
+++ b/app/components/Views/confirmations/components/activity/transaction-details-account-row/transaction-details-account-row.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { useTransactionDetails } from '../../../hooks/activity/useTransactionDetails';
+import { TransactionDetailsRow } from '../transaction-details-row/transaction-details-row';
+import { strings } from '../../../../../../../locales/i18n';
+import { NameType } from '../../../../../UI/Name/Name.types';
+import { useAccountNames } from '../../../../../hooks/DisplayName/useAccountNames';
+import Text, {
+  TextColor,
+} from '../../../../../../component-library/components/Texts/Text';
+import { TransactionType } from '@metamask/transaction-controller';
+import { hasTransactionType } from '../../../utils/transaction';
+
+const TRANSACTION_TYPES = [
+  TransactionType.predictClaim,
+  TransactionType.predictWithdraw,
+];
+
+export function TransactionDetailsAccountRow() {
+  const { transactionMeta } = useTransactionDetails();
+
+  const {
+    chainId,
+    txParams: { from },
+  } = transactionMeta;
+
+  const accountName = useAccountNames([
+    {
+      value: from,
+      variation: chainId,
+      type: NameType.EthereumAddress,
+    },
+  ])?.[0];
+
+  if (!hasTransactionType(transactionMeta, TRANSACTION_TYPES)) {
+    return null;
+  }
+
+  return (
+    <TransactionDetailsRow label={strings('transaction_details.label.account')}>
+      <Text color={TextColor.Alternative}>{accountName ?? from}</Text>
+    </TransactionDetailsRow>
+  );
+}
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.test.tsx
index cf6708e75b9d..41a84eac84ff 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.test.tsx
@@ -6,12 +6,12 @@ import {
   TransactionType,
 } from '@metamask/transaction-controller';
 import { TransactionDetailsHero } from './transaction-details-hero';
-import { useTokensWithBalance } from '../../../../../UI/Bridge/hooks/useTokensWithBalance';
 import { merge } from 'lodash';
 import { otherControllersMock } from '../../../__mocks__/controllers/other-controllers-mock';
+import { useTokenWithBalance } from '../../../hooks/tokens/useTokenWithBalance';
 
 jest.mock('../../../hooks/activity/useTransactionDetails');
-jest.mock('../../../../../UI/Bridge/hooks/useTokensWithBalance');
+jest.mock('../../../hooks/tokens/useTokenWithBalance');
 
 const TOKEN_ADDRESS_MOCK = '0x1234567890abcdef1234567890abcdef12345678';
 const CHAIN_ID_MOCK = '0x123';
@@ -36,7 +36,7 @@ function render() {
 
 describe('TransactionDetailsHero', () => {
   const useTransactionDetailsMock = jest.mocked(useTransactionDetails);
-  const useTokensWithBalanceMock = jest.mocked(useTokensWithBalance);
+  const useTokenWithBalanceMock = jest.mocked(useTokenWithBalance);
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -45,14 +45,12 @@ describe('TransactionDetailsHero', () => {
       transactionMeta: TRANSACTION_META_MOCK,
     });
 
-    useTokensWithBalanceMock.mockReturnValue([
-      {
-        address: TOKEN_ADDRESS_MOCK,
-        chainId: CHAIN_ID_MOCK,
-        decimals: DECIMALS_MOCK,
-        symbol: 'TST',
-      },
-    ]);
+    useTokenWithBalanceMock.mockReturnValue({
+      address: TOKEN_ADDRESS_MOCK,
+      chainId: CHAIN_ID_MOCK,
+      decimals: DECIMALS_MOCK,
+      symbol: 'TST',
+    } as unknown as ReturnType<typeof useTokenWithBalance>);
   });
 
   it('renders human amount', () => {
@@ -114,7 +112,9 @@ describe('TransactionDetailsHero', () => {
   });
 
   it('renders nothing if no decimals', () => {
-    useTokensWithBalanceMock.mockReturnValue([]);
+    useTokenWithBalanceMock.mockReturnValue(
+      undefined as unknown as ReturnType<typeof useTokenWithBalance>,
+    );
 
     const { queryByTestId } = render();
     expect(queryByTestId('transaction-details-hero')).toBeNull();
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.tsx b/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.tsx
index 8dd7bdd04d5d..3760c68c4f96 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-hero/transaction-details-hero.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { Box } from '../../../../../UI/Box/Box';
 import Text, {
   TextVariant,
@@ -10,7 +10,6 @@ import {
   hasTransactionType,
   parseStandardTokenTransactionData,
 } from '../../../utils/transaction';
-import { useTokensWithBalance } from '../../../../../UI/Bridge/hooks/useTokensWithBalance';
 import { Result } from '@ethersproject/abi';
 import { calcTokenAmount } from '../../../../../../util/transactions';
 import { useStyles } from '../../../../../../component-library/hooks';
@@ -18,10 +17,12 @@ import styleSheet from './transaction-details-hero.styles';
 import { getTokenTransferData } from '../../../utils/transaction-pay';
 import useFiatFormatter from '../../../../../UI/SimulationDetails/FiatDisplay/useFiatFormatter';
 import { PERPS_CURRENCY } from '../../../constants/perps';
+import { useTokenWithBalance } from '../../../hooks/tokens/useTokenWithBalance';
 
 const SUPPORTED_TYPES = [
   TransactionType.perpsDeposit,
   TransactionType.predictDeposit,
+  TransactionType.predictWithdraw,
 ];
 
 export function TransactionDetailsHero() {
@@ -29,25 +30,19 @@ export function TransactionDetailsHero() {
   const { styles } = useStyles(styleSheet, {});
   const { transactionMeta } = useTransactionDetails();
   const { chainId } = transactionMeta;
-  const chainIds = useMemo(() => (chainId ? [chainId] : []), [chainId]);
-  const tokens = useTokensWithBalance({ chainIds });
+  const { data, to } = getTokenTransferData(transactionMeta) ?? {};
+  const token = useTokenWithBalance(to ?? '0x0', chainId);
 
   if (!hasTransactionType(transactionMeta, SUPPORTED_TYPES)) {
     return null;
   }
 
-  const { data, to } = getTokenTransferData(transactionMeta) ?? {};
-
   if (!to || !data) {
     return null;
   }
 
   const decodedData = parseStandardTokenTransactionData(data);
 
-  const token = tokens.find(
-    (t) => t.address.toLowerCase() === to.toLowerCase(),
-  );
-
   const { decimals } = token ?? {};
   const { _value: amount } = decodedData?.args ?? ({} as Result);
 
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.test.tsx
index 42f5358f5a5b..6f1241889404 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.test.tsx
@@ -1,12 +1,18 @@
 import React from 'react';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import { useTransactionDetails } from '../../../hooks/activity/useTransactionDetails';
-import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import { TransactionDetailsNetworkFeeRow } from './transaction-details-network-fee-row';
+import { useFeeCalculations } from '../../../hooks/gas/useFeeCalculations';
 
 jest.mock('../../../hooks/activity/useTransactionDetails');
+jest.mock('../../../hooks/gas/useFeeCalculations');
 
-const NETWORK_FEE_FIAT_MOCK = '123.45';
+const PAY_FEE_MOCK = '123.45';
+const CALCULATED_FEE_MOCK = '234.56';
 
 function render() {
   return renderWithProvider(<TransactionDetailsNetworkFeeRow />, {});
@@ -14,6 +20,7 @@ function render() {
 
 describe('TransactionDetailsNetworkFeeRow', () => {
   const useTransactionDetailsMock = jest.mocked(useTransactionDetails);
+  const useFeeCalculationsMock = jest.mocked(useFeeCalculations);
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -21,26 +28,41 @@ describe('TransactionDetailsNetworkFeeRow', () => {
     useTransactionDetailsMock.mockReturnValue({
       transactionMeta: {
         metamaskPay: {
-          networkFeeFiat: NETWORK_FEE_FIAT_MOCK,
+          networkFeeFiat: PAY_FEE_MOCK,
         },
       } as unknown as TransactionMeta,
     });
+
+    useFeeCalculationsMock.mockReturnValue({
+      estimatedFeeFiatPrecise: CALCULATED_FEE_MOCK,
+    } as unknown as ReturnType<typeof useFeeCalculations>);
   });
 
-  it('renders network fee fiat', () => {
+  it('renders network fee from pay metadata', () => {
+    const { getByText } = render();
+    expect(getByText(`$${PAY_FEE_MOCK}`)).toBeDefined();
+  });
+
+  it('renders network fee from calculation', () => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: {
+        type: TransactionType.predictWithdraw,
+      } as unknown as TransactionMeta,
+    });
+
     const { getByText } = render();
-    expect(getByText(`$${NETWORK_FEE_FIAT_MOCK}`)).toBeDefined();
+    expect(getByText(`$${CALCULATED_FEE_MOCK}`)).toBeDefined();
   });
 
-  it('renders nothing if no network fee fiat', () => {
+  it('renders nothing if no pay metadata and type not supported', () => {
     useTransactionDetailsMock.mockReturnValue({
       transactionMeta: {
         metamaskPay: {},
       } as unknown as TransactionMeta,
     });
 
-    const { queryByText } = render();
+    const { toJSON } = render();
 
-    expect(queryByText(`$${NETWORK_FEE_FIAT_MOCK}`)).toBeNull();
+    expect(toJSON()).toBeNull();
   });
 });
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.tsx b/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.tsx
index 6f71e98c3c8a..52652bcba72c 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-network-fee-row/transaction-details-network-fee-row.tsx
@@ -3,21 +3,36 @@ import { TransactionDetailsRow } from '../transaction-details-row/transaction-de
 import Text from '../../../../../../component-library/components/Texts/Text';
 import { useTransactionDetails } from '../../../hooks/activity/useTransactionDetails';
 import { strings } from '../../../../../../../locales/i18n';
+import { TransactionType } from '@metamask/transaction-controller';
+import { hasTransactionType } from '../../../utils/transaction';
+import { useFeeCalculations } from '../../../hooks/gas/useFeeCalculations';
 import useFiatFormatter from '../../../../../UI/SimulationDetails/FiatDisplay/useFiatFormatter';
 import { BigNumber } from 'bignumber.js';
 
+const FALLBACK_TYPES = [
+  TransactionType.predictClaim,
+  TransactionType.predictWithdraw,
+];
+
 export function TransactionDetailsNetworkFeeRow() {
   const formatFiat = useFiatFormatter({ currency: 'usd' });
   const { transactionMeta } = useTransactionDetails();
+  const { estimatedFeeFiatPrecise } = useFeeCalculations(transactionMeta);
+
   const { metamaskPay } = transactionMeta;
-  const { networkFeeFiat } = metamaskPay || {};
+  const { networkFeeFiat: payNetworkFeeFiat } = metamaskPay || {};
+
+  const networkFee = payNetworkFeeFiat ?? estimatedFeeFiatPrecise;
 
-  const networkFeeFiatFormatted = useMemo(
-    () => formatFiat(new BigNumber(networkFeeFiat ?? 0)),
-    [formatFiat, networkFeeFiat],
+  const networkFeeFormatted = useMemo(
+    () => formatFiat(new BigNumber(networkFee ?? 0)),
+    [formatFiat, networkFee],
   );
 
-  if (!networkFeeFiat) {
+  if (
+    !payNetworkFeeFiat &&
+    !hasTransactionType(transactionMeta, FALLBACK_TYPES)
+  ) {
     return null;
   }
 
@@ -25,7 +40,7 @@ export function TransactionDetailsNetworkFeeRow() {
     <TransactionDetailsRow
       label={strings('transaction_details.label.network_fee')}
     >
-      <Text>{networkFeeFiatFormatted}</Text>
+      <Text>{networkFeeFormatted}</Text>
     </TransactionDetailsRow>
   );
 }
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-paid-with-row/transaction-details-paid-with-row.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-paid-with-row/transaction-details-paid-with-row.test.tsx
index be2a577757df..1fa3f379d9aa 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-paid-with-row/transaction-details-paid-with-row.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-paid-with-row/transaction-details-paid-with-row.test.tsx
@@ -2,13 +2,13 @@ import React from 'react';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import { TransactionDetailsPaidWithRow } from './transaction-details-paid-with-row';
 import { useTransactionDetails } from '../../../hooks/activity/useTransactionDetails';
-import { useTokensWithBalance } from '../../../../../UI/Bridge/hooks/useTokensWithBalance';
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { merge } from 'lodash';
 import { otherControllersMock } from '../../../__mocks__/controllers/other-controllers-mock';
+import { useTokenWithBalance } from '../../../hooks/tokens/useTokenWithBalance';
 
 jest.mock('../../../hooks/activity/useTransactionDetails');
-jest.mock('../../../../../UI/Bridge/hooks/useTokensWithBalance');
+jest.mock('../../../hooks/tokens/useTokenWithBalance');
 
 const TOKEN_ADDRESS_MOCK = '0x1234567890abcdef1234567890abcdef12345678';
 const CHAIN_ID_MOCK = '0x1';
@@ -22,7 +22,7 @@ function render() {
 
 describe('TransactionDetailsPaidWithRow', () => {
   const useTransactionDetailsMock = jest.mocked(useTransactionDetails);
-  const useTokensWithBalanceMock = jest.mocked(useTokensWithBalance);
+  const useTokenWithBalanceMock = jest.mocked(useTokenWithBalance);
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -36,14 +36,12 @@ describe('TransactionDetailsPaidWithRow', () => {
       } as unknown as TransactionMeta,
     });
 
-    useTokensWithBalanceMock.mockReturnValue([
-      {
-        address: TOKEN_ADDRESS_MOCK,
-        chainId: CHAIN_ID_MOCK,
-        decimals: 6,
-        symbol: TOKEN_SYMBOL_MOCK,
-      },
-    ]);
+    useTokenWithBalanceMock.mockReturnValue({
+      address: TOKEN_ADDRESS_MOCK,
+      chainId: CHAIN_ID_MOCK,
+      decimals: 6,
+      symbol: TOKEN_SYMBOL_MOCK,
+    } as unknown as ReturnType<typeof useTokenWithBalance>);
   });
 
   it('renders token symbol', () => {
@@ -69,7 +67,7 @@ describe('TransactionDetailsPaidWithRow', () => {
   });
 
   it('renders nothing if token not found', () => {
-    useTokensWithBalanceMock.mockReturnValue([]);
+    useTokenWithBalanceMock.mockReturnValue(undefined);
 
     const { queryByText } = render();
 
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-paid-with-row/transaction-details-paid-with-row.tsx b/app/components/Views/confirmations/components/activity/transaction-details-paid-with-row/transaction-details-paid-with-row.tsx
index 79f3edb13fd7..c7c57a015d42 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-paid-with-row/transaction-details-paid-with-row.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-paid-with-row/transaction-details-paid-with-row.tsx
@@ -1,23 +1,18 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { TransactionDetailsRow } from '../transaction-details-row/transaction-details-row';
 import Text from '../../../../../../component-library/components/Texts/Text';
 import { Box } from '../../../../../UI/Box/Box';
 import { AlignItems, FlexDirection } from '../../../../../UI/Box/box.types';
 import { TokenIcon, TokenIconVariant } from '../../token-icon';
 import { useTransactionDetails } from '../../../hooks/activity/useTransactionDetails';
-import { useTokensWithBalance } from '../../../../../UI/Bridge/hooks/useTokensWithBalance';
 import { strings } from '../../../../../../../locales/i18n';
+import { useTokenWithBalance } from '../../../hooks/tokens/useTokenWithBalance';
 
 export function TransactionDetailsPaidWithRow() {
   const { transactionMeta } = useTransactionDetails();
   const { metamaskPay } = transactionMeta;
   const { chainId, tokenAddress } = metamaskPay || {};
-  const chainIds = useMemo(() => (chainId ? [chainId] : []), [chainId]);
-  const tokens = useTokensWithBalance({ chainIds });
-
-  const token = tokens.find(
-    (t) => t.address.toLowerCase() === tokenAddress?.toLowerCase(),
-  );
+  const token = useTokenWithBalance(tokenAddress ?? '0x0', chainId ?? '0x0');
 
   if (!chainId || !tokenAddress || !token) {
     return null;
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.test.tsx b/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.test.tsx
index 2aedd8245b43..65dcef990d83 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.test.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.test.tsx
@@ -1,12 +1,18 @@
 import React from 'react';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import { useTransactionDetails } from '../../../hooks/activity/useTransactionDetails';
-import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import { TransactionDetailsTotalRow } from './transaction-details-total-row';
+import { useTokenAmount } from '../../../hooks/useTokenAmount';
 
 jest.mock('../../../hooks/activity/useTransactionDetails');
+jest.mock('../../../hooks/useTokenAmount');
 
-const TOTAL_FIAT_MOCK = '123.45';
+const PAY_TOTAL = '123.45';
+const TOKEN_TOTAL = '234.56';
 
 function render() {
   return renderWithProvider(<TransactionDetailsTotalRow />, {});
@@ -14,6 +20,7 @@ function render() {
 
 describe('TransactionDetailsTotalRow', () => {
   const useTransactionDetailsMock = jest.mocked(useTransactionDetails);
+  const useTokenAmountMock = jest.mocked(useTokenAmount);
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -21,26 +28,43 @@ describe('TransactionDetailsTotalRow', () => {
     useTransactionDetailsMock.mockReturnValue({
       transactionMeta: {
         metamaskPay: {
-          totalFiat: TOTAL_FIAT_MOCK,
+          totalFiat: PAY_TOTAL,
         },
       } as unknown as TransactionMeta,
     });
+
+    useTokenAmountMock.mockReturnValue({
+      amount: TOKEN_TOTAL,
+    } as ReturnType<typeof useTokenAmount>);
   });
 
-  it('renders total fiat', () => {
+  it('renders total from pay metadata', () => {
     const { getByText } = render();
-    expect(getByText(`$${TOTAL_FIAT_MOCK}`)).toBeDefined();
+    expect(getByText(`$${PAY_TOTAL}`)).toBeDefined();
+  });
+
+  it('renders total from token amount', () => {
+    useTransactionDetailsMock.mockReturnValue({
+      transactionMeta: {
+        metamaskPay: {},
+        type: TransactionType.predictWithdraw,
+      } as unknown as TransactionMeta,
+    });
+
+    const { getByText } = render();
+
+    expect(getByText(`$${TOKEN_TOTAL}`)).toBeDefined();
   });
 
-  it('renders nothing if no total fiat', () => {
+  it('renders nothing if no total fiat and type not supported', () => {
     useTransactionDetailsMock.mockReturnValue({
       transactionMeta: {
         metamaskPay: {},
       } as unknown as TransactionMeta,
     });
 
-    const { queryByText } = render();
+    const { toJSON } = render();
 
-    expect(queryByText(`$${TOTAL_FIAT_MOCK}`)).toBeNull();
+    expect(toJSON()).toBeNull();
   });
 });
diff --git a/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.tsx b/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.tsx
index 55a1d5da0431..0bb34a336183 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details-total-row/transaction-details-total-row.tsx
@@ -3,27 +3,43 @@ import { TransactionDetailsRow } from '../transaction-details-row/transaction-de
 import Text from '../../../../../../component-library/components/Texts/Text';
 import { useTransactionDetails } from '../../../hooks/activity/useTransactionDetails';
 import { strings } from '../../../../../../../locales/i18n';
+import { useTokenAmount } from '../../../hooks/useTokenAmount';
+import { TransactionType } from '@metamask/transaction-controller';
+import { hasTransactionType } from '../../../utils/transaction';
 import useFiatFormatter from '../../../../../UI/SimulationDetails/FiatDisplay/useFiatFormatter';
 import { BigNumber } from 'bignumber.js';
 
+const FALLBACK_TYPES = [TransactionType.predictWithdraw];
+
 export function TransactionDetailsTotalRow() {
   const formatFiat = useFiatFormatter({ currency: 'usd' });
   const { transactionMeta } = useTransactionDetails();
+  const { amount } = useTokenAmount({ transactionMeta }) ?? {};
+
   const { metamaskPay } = transactionMeta;
-  const { totalFiat } = metamaskPay || {};
+  const { totalFiat: payTotal } = metamaskPay || {};
 
-  const totalFiatFormatted = useMemo(
-    () => formatFiat(new BigNumber(totalFiat ?? '0')),
-    [formatFiat, totalFiat],
+  const total = payTotal ?? amount;
+
+  const totalFormatted = useMemo(
+    () => formatFiat(new BigNumber(total ?? '0')),
+    [formatFiat, total],
   );
 
-  if (!totalFiat) {
+  if (!payTotal && !hasTransactionType(transactionMeta, FALLBACK_TYPES)) {
     return null;
   }
 
+  const label = hasTransactionType(transactionMeta, [
+    TransactionType.predictClaim,
+    TransactionType.predictWithdraw,
+  ])
+    ? strings('transaction_details.label.received_total')
+    : strings('transaction_details.label.total');
+
   return (
-    <TransactionDetailsRow label={strings('transaction_details.label.total')}>
-      <Text>{totalFiatFormatted}</Text>
+    <TransactionDetailsRow label={label}>
+      <Text>{totalFormatted}</Text>
     </TransactionDetailsRow>
   );
 }
diff --git a/app/components/Views/confirmations/components/activity/transaction-details/transaction-details.tsx b/app/components/Views/confirmations/components/activity/transaction-details/transaction-details.tsx
index 809f769154a2..8fb4f4d03694 100644
--- a/app/components/Views/confirmations/components/activity/transaction-details/transaction-details.tsx
+++ b/app/components/Views/confirmations/components/activity/transaction-details/transaction-details.tsx
@@ -23,6 +23,12 @@ import { TransactionDetailsBridgeFeeRow } from '../transaction-details-bridge-fe
 import { hasTransactionType } from '../../../utils/transaction';
 import { ScrollView } from 'react-native';
 import { TransactionDetailsRetry } from '../transaction-details-retry';
+import { TransactionDetailsAccountRow } from '../transaction-details-account-row';
+
+export const SUMMARY_SECTION_TYPES = [
+  TransactionType.perpsDeposit,
+  TransactionType.predictDeposit,
+];
 
 export function TransactionDetails() {
   const { styles } = useStyles(styleSheet, {});
@@ -39,30 +45,48 @@ export function TransactionDetails() {
     );
   }, [colors, navigation, theme, title]);
 
+  const showSummarySection = hasTransactionType(
+    transactionMeta,
+    SUMMARY_SECTION_TYPES,
+  );
+
   return (
     <ScrollView>
       <Box style={styles.container} gap={12}>
         <TransactionDetailsHero />
         <TransactionDetailsStatusRow />
         <TransactionDetailsDateRow />
+        <TransactionDetailsAccountRow />
         <TransactionDetailDivider />
         <TransactionDetailsPaidWithRow />
         <TransactionDetailsNetworkFeeRow />
         <TransactionDetailsBridgeFeeRow />
         <TransactionDetailsTotalRow />
-        <TransactionDetailDivider />
-        <TransactionDetailsSummary />
-        <TransactionDetailsRetry />
+        {showSummarySection && (
+          <>
+            <TransactionDetailDivider />
+            <TransactionDetailsSummary />
+            <TransactionDetailsRetry />
+          </>
+        )}
       </Box>
     </ScrollView>
   );
 }
 
 function getTitle(transactionMeta: TransactionMeta) {
+  if (hasTransactionType(transactionMeta, [TransactionType.predictClaim])) {
+    return strings('transaction_details.title.predict_claim');
+  }
+
   if (hasTransactionType(transactionMeta, [TransactionType.predictDeposit])) {
     return strings('transaction_details.title.predict_deposit');
   }
 
+  if (hasTransactionType(transactionMeta, [TransactionType.predictWithdraw])) {
+    return strings('transaction_details.title.predict_withdraw');
+  }
+
   switch (transactionMeta.type) {
     case TransactionType.perpsDeposit:
       return strings('transaction_details.title.perps_deposit');
diff --git a/app/components/Views/confirmations/components/deposit-keyboard/deposit-keyboard.test.tsx b/app/components/Views/confirmations/components/deposit-keyboard/deposit-keyboard.test.tsx
index e597ea940d55..7773ea486cd6 100644
--- a/app/components/Views/confirmations/components/deposit-keyboard/deposit-keyboard.test.tsx
+++ b/app/components/Views/confirmations/components/deposit-keyboard/deposit-keyboard.test.tsx
@@ -79,4 +79,13 @@ describe('DepositKeyboard', () => {
     expect(queryByTestId('deposit-keyboard-done-button')).toBeNull();
     expect(queryByText('50%')).toBeNull();
   });
+
+  it('renders doneLabel if specified', async () => {
+    const { getByText } = render({
+      doneLabel: 'Test Button',
+      hasInput: true,
+    });
+
+    expect(getByText('Test Button')).toBeDefined();
+  });
 });
diff --git a/app/components/Views/confirmations/components/deposit-keyboard/deposit-keyboard.tsx b/app/components/Views/confirmations/components/deposit-keyboard/deposit-keyboard.tsx
index 2205d04d6e60..52171c611aae 100644
--- a/app/components/Views/confirmations/components/deposit-keyboard/deposit-keyboard.tsx
+++ b/app/components/Views/confirmations/components/deposit-keyboard/deposit-keyboard.tsx
@@ -35,6 +35,7 @@ const PERCENTAGE_BUTTONS = [
 
 export interface DepositKeyboardProps {
   alertMessage?: string;
+  doneLabel?: string;
   hasInput?: boolean;
   onChange: (value: string) => void;
   onPercentagePress: (percentage: number) => void;
@@ -45,6 +46,7 @@ export interface DepositKeyboardProps {
 export const DepositKeyboard = memo(
   ({
     alertMessage,
+    doneLabel,
     hasInput,
     onChange,
     onDonePress,
@@ -101,7 +103,7 @@ export const DepositKeyboard = memo(
           {!alertMessage && hasInput && (
             <Button
               testID="deposit-keyboard-done-button"
-              label={strings('confirm.deposit_edit_amount_done')}
+              label={doneLabel ?? strings('confirm.deposit_edit_amount_done')}
               style={styles.button}
               onPress={onDonePress}
               variant={ButtonVariants.Primary}
diff --git a/app/components/Views/confirmations/components/footer/footer.tsx b/app/components/Views/confirmations/components/footer/footer.tsx
index 130a9f75d076..d7bdec6be8a9 100644
--- a/app/components/Views/confirmations/components/footer/footer.tsx
+++ b/app/components/Views/confirmations/components/footer/footer.tsx
@@ -42,6 +42,7 @@ import { useIsTransactionPayLoading } from '../../hooks/pay/useTransactionPayDat
 const HIDE_FOOTER_BY_DEFAULT_TYPES = [
   TransactionType.perpsDeposit,
   TransactionType.predictDeposit,
+  TransactionType.predictWithdraw,
 ];
 
 export const Footer = () => {
diff --git a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx
index 057e664fa898..64d44e27558f 100644
--- a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx
+++ b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { act } from 'react';
 import { merge, noop } from 'lodash';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import { CustomAmountInfo, CustomAmountInfoProps } from './custom-amount-info';
@@ -24,6 +24,8 @@ import { TransactionPayRequiredToken } from '@metamask/transaction-pay-controlle
 import { RampMode } from '../../../../../UI/Ramp/hooks/useRampNavigation';
 import { RampType } from '../../../../../UI/Ramp/Aggregator/types';
 import { fireEvent } from '@testing-library/react-native';
+import { TransactionType } from '@metamask/transaction-controller';
+import { useTransactionConfirm } from '../../../hooks/transactions/useTransactionConfirm';
 
 jest.mock('../../../hooks/ui/useClearConfirmationOnBackSwipe');
 jest.mock('../../../hooks/pay/useAutomaticTransactionPayToken');
@@ -36,6 +38,7 @@ jest.mock('../../../hooks/pay/useTransactionPayMetrics');
 jest.mock('../../../hooks/send/useAccountTokens');
 jest.mock('../../../hooks/pay/useTransactionPayAvailableTokens');
 jest.mock('../../../hooks/pay/useTransactionPayData');
+jest.mock('../../../hooks/transactions/useTransactionConfirm');
 
 const mockGoToRamps = jest.fn();
 
@@ -54,13 +57,30 @@ jest.mock('../../../../../UI/Ramp/hooks/useRampNavigation', () => ({
 const TOKEN_ADDRESS_MOCK = '0x123' as Hex;
 const CHAIN_ID_MOCK = '0x1' as Hex;
 
-function render(props: CustomAmountInfoProps = {}) {
+function render(
+  props: CustomAmountInfoProps & { transactionType?: TransactionType } = {},
+) {
   return renderWithProvider(<CustomAmountInfo {...props} />, {
     state: merge(
       {},
       simpleSendTransactionControllerMock,
       transactionApprovalControllerMock,
       otherControllersMock,
+      {
+        engine: {
+          backgroundState: {
+            TransactionController: {
+              transactions: [
+                {
+                  type:
+                    props.transactionType ||
+                    TransactionType.contractInteraction,
+                },
+              ],
+            },
+          },
+        },
+      },
     ),
   });
 }
@@ -70,6 +90,7 @@ describe('CustomAmountInfo', () => {
   const useConfirmationContextMock = jest.mocked(useConfirmationContext);
   const useAlertsMock = jest.mocked(useAlerts);
   const useAccountTokensMock = jest.mocked(useAccountTokens);
+  const useTransactionConfirmMock = jest.mocked(useTransactionConfirm);
 
   const useTransactionPayRequiredTokensMock = jest.mocked(
     useTransactionPayRequiredTokens,
@@ -133,6 +154,7 @@ describe('CustomAmountInfo', () => {
     useAccountTokensMock.mockReturnValue([]);
     useTransactionPayAvailableTokensMock.mockReturnValue([{}] as AssetType[]);
     useTransactionPayRequiredTokensMock.mockReturnValue([]);
+    useTransactionConfirmMock.mockReturnValue({} as never);
   });
 
   it('renders amount', () => {
@@ -211,4 +233,20 @@ describe('CustomAmountInfo', () => {
       },
     });
   });
+
+  it('renders alternate confirm label if predict withdraw', async () => {
+    const { getByText } = render({
+      transactionType: TransactionType.predictWithdraw,
+    });
+
+    await act(async () => {
+      fireEvent.press(
+        getByText(strings('confirm.deposit_edit_amount_predict_withdraw')),
+      );
+    });
+
+    expect(
+      getByText(strings('confirm.deposit_edit_amount_predict_withdraw')),
+    ).toBeDefined();
+  });
 });
diff --git a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx
index 2636b1590e7d..df3e0922cc09 100644
--- a/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx
+++ b/app/components/Views/confirmations/components/info/custom-amount-info/custom-amount-info.tsx
@@ -68,6 +68,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
     const [isKeyboardVisible, setIsKeyboardVisible] = useState(true);
     const availableTokens = useTransactionPayAvailableTokens();
     const hasTokens = availableTokens.length > 0;
+    const buttonLabel = useButtonLabel();
 
     const isResultReady = useIsResultReady({
       isKeyboardVisible,
@@ -127,6 +128,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
           {isKeyboardVisible && hasTokens && (
             <DepositKeyboard
               alertMessage={alertTitle}
+              doneLabel={buttonLabel}
               value={amountFiat}
               onChange={updatePendingAmount}
               onDonePress={handleDone}
@@ -227,11 +229,12 @@ function ConfirmButton({
   const isLoading = useIsTransactionPayLoading();
   const { onConfirm } = useTransactionConfirm();
   const disabled = hasBlockingAlerts || isLoading;
+  const buttonLabel = useButtonLabel();
 
   return (
     <Button
       style={[disabled && styles.disabledButton]}
-      label={alertTitle ?? strings('confirm.deposit_edit_amount_done')}
+      label={alertTitle ?? buttonLabel}
       variant={ButtonVariants.Primary}
       width={ButtonWidthTypes.Full}
       disabled={disabled}
@@ -254,3 +257,13 @@ function useIsResultReady({
     (isQuotesLoading || Boolean(quotes?.length) || !sourceAmounts?.length)
   );
 }
+
+function useButtonLabel() {
+  const transaction = useTransactionMetadataRequest();
+
+  if (hasTransactionType(transaction, [TransactionType.predictWithdraw])) {
+    return strings('confirm.deposit_edit_amount_predict_withdraw');
+  }
+
+  return strings('confirm.deposit_edit_amount_done');
+}
diff --git a/app/components/Views/confirmations/hooks/gas/useFeeCalculations.test.ts b/app/components/Views/confirmations/hooks/gas/useFeeCalculations.test.ts
index adbfecc746e9..41dcb5ee90fb 100644
--- a/app/components/Views/confirmations/hooks/gas/useFeeCalculations.test.ts
+++ b/app/components/Views/confirmations/hooks/gas/useFeeCalculations.test.ts
@@ -75,6 +75,7 @@ describe('useFeeCalculations', () => {
       gas: '0x5572e9c22d00',
       shouldUseEIP1559FeeLogic: true,
       gasPrice: '0x5572e9c22d00',
+      receiptGasPrice: undefined,
     });
 
     expect(currentCurrencyFee).toBe(null);
@@ -161,6 +162,30 @@ describe('useFeeCalculations', () => {
     expect(result.current.calculateGasEstimate).toBeDefined();
   });
 
+  it('returs fee calculations using receipt values if present', () => {
+    const state = cloneDeep(stakingDepositConfirmationState);
+
+    state.engine.backgroundState.TransactionController.transactions[0].txReceipt =
+      {
+        gasUsed: toHex(50000),
+        effectiveGasPrice: toHex(300000000000000),
+      };
+
+    const transactionWithReceipt =
+      state.engine.backgroundState.TransactionController.transactions[0];
+
+    const { result } = renderHookWithProvider(
+      () => useFeeCalculations(transactionWithReceipt),
+      {
+        state,
+      },
+    );
+
+    expect(result.current).toMatchObject({
+      estimatedFeeNative: '15',
+    });
+  });
+
   it('returns fee calculations when gasUsed is present', () => {
     const clonedStateWithGasUsed = cloneDeep(stakingDepositConfirmationState);
     const gasUsed = toHex(35000);
diff --git a/app/components/Views/confirmations/hooks/gas/useFeeCalculations.ts b/app/components/Views/confirmations/hooks/gas/useFeeCalculations.ts
index 6e0f9b77fdd1..d53a91f6eec9 100644
--- a/app/components/Views/confirmations/hooks/gas/useFeeCalculations.ts
+++ b/app/components/Views/confirmations/hooks/gas/useFeeCalculations.ts
@@ -34,12 +34,14 @@ export const useFeeCalculations = (
     gas,
     shouldUseEIP1559FeeLogic,
     priorityFeePerGas,
+    receiptGasPrice,
   }: {
     feePerGas: string;
     gasPrice: string;
     gas: string;
     shouldUseEIP1559FeeLogic: boolean;
     priorityFeePerGas: string;
+    receiptGasPrice?: string;
   }) => {
     currentCurrencyFee: string | null;
     nativeCurrencyFee: string | null;
@@ -52,8 +54,14 @@ export const useFeeCalculations = (
   maxFeeNativePrecise: string | null;
   maxFeeNativeHex: string | null;
 } => {
-  const { chainId, gasLimitNoBuffer, gasUsed, layer1GasFee, networkClientId } =
-    transactionMeta;
+  const {
+    chainId,
+    gasLimitNoBuffer,
+    gasUsed,
+    layer1GasFee,
+    networkClientId,
+    txReceipt,
+  } = transactionMeta;
 
   const { nativeCurrency } =
     useSelector((state: RootState) =>
@@ -74,6 +82,7 @@ export const useFeeCalculations = (
   // `gasUsed` is the gas limit actually used by the transaction in the
   // simulation environment.
   const optimizedGasLimit =
+    txReceipt?.gasUsed ||
     gasUsed ||
     // While estimating gas for the transaction we add 50% gas limit buffer.
     // With `gasLimitNoBuffer` that buffer is removed. see PR
@@ -85,7 +94,9 @@ export const useFeeCalculations = (
 
   const estimatedBaseFee = (gasFeeEstimates as GasFeeEstimates)
     ?.estimatedBaseFee;
+
   const txParamsGasPrice = transactionMeta.txParams?.gasPrice ?? HEX_ZERO;
+  const receiptGasPriceHex = txReceipt?.effectiveGasPrice;
 
   const getFeesFromHexCallback = useCallback(
     (hexFee: string) =>
@@ -106,12 +117,14 @@ export const useFeeCalculations = (
       gas,
       shouldUseEIP1559FeeLogic,
       priorityFeePerGas,
+      receiptGasPrice,
     }: {
       feePerGas: string;
       priorityFeePerGas: string;
       gasPrice: string;
       gas: string;
       shouldUseEIP1559FeeLogic: boolean;
+      receiptGasPrice?: string;
     }) =>
       calculateGasEstimate({
         feePerGas,
@@ -122,6 +135,7 @@ export const useFeeCalculations = (
         estimatedBaseFee,
         layer1GasFee,
         getFeesFromHexFn: getFeesFromHexCallback,
+        receiptGasPrice,
       }),
     [estimatedBaseFee, layer1GasFee, getFeesFromHexCallback],
   );
@@ -135,6 +149,7 @@ export const useFeeCalculations = (
         gas: optimizedGasLimit,
         shouldUseEIP1559FeeLogic: supportsEIP1559,
         gasPrice: txParamsGasPrice,
+        receiptGasPrice: receiptGasPriceHex,
       }),
     [
       calculateGasEstimateCallback,
@@ -143,6 +158,7 @@ export const useFeeCalculations = (
       optimizedGasLimit,
       supportsEIP1559,
       txParamsGasPrice,
+      receiptGasPriceHex,
     ],
   );
 
diff --git a/app/components/Views/confirmations/utils/gas.ts b/app/components/Views/confirmations/utils/gas.ts
index 9089b403885f..cbcb041769fa 100644
--- a/app/components/Views/confirmations/utils/gas.ts
+++ b/app/components/Views/confirmations/utils/gas.ts
@@ -129,6 +129,7 @@ export function calculateGasEstimate({
   estimatedBaseFee,
   layer1GasFee,
   getFeesFromHexFn,
+  receiptGasPrice,
 }: {
   feePerGas: string;
   priorityFeePerGas: string;
@@ -137,6 +138,7 @@ export function calculateGasEstimate({
   shouldUseEIP1559FeeLogic: boolean;
   estimatedBaseFee: string | undefined;
   layer1GasFee?: string;
+  receiptGasPrice?: string;
   getFeesFromHexFn: (hexFee: string) => {
     currentCurrencyFee: string | null;
     nativeCurrencyFee: string | null;
@@ -145,6 +147,10 @@ export function calculateGasEstimate({
     preciseNativeFeeInHex: string | null;
   };
 }) {
+  if (receiptGasPrice) {
+    return getFeesFromHexFn(multiplyHexes(receiptGasPrice as Hex, gas as Hex));
+  }
+
   let minimumFeePerGas = addHexes(
     decGWEIToHexWEI(estimatedBaseFee) ?? HEX_ZERO,
     decimalToHex(priorityFeePerGas),
diff --git a/app/core/DeeplinkManager/DeeplinkManager.ts b/app/core/DeeplinkManager/DeeplinkManager.ts
index ed3dfc6bb4f0..1d098e12494f 100644
--- a/app/core/DeeplinkManager/DeeplinkManager.ts
+++ b/app/core/DeeplinkManager/DeeplinkManager.ts
@@ -139,9 +139,10 @@ class DeeplinkManager {
     });
   }
 
-  _handlePredict(predictPath: string) {
+  _handlePredict(predictPath: string, origin?: string) {
     handlePredictUrl({
       predictPath,
+      origin,
     });
   }
 
diff --git a/app/core/DeeplinkManager/Handlers/handlePredictUrl.test.ts b/app/core/DeeplinkManager/Handlers/handlePredictUrl.test.ts
index 626a6d8cc795..854297e07594 100644
--- a/app/core/DeeplinkManager/Handlers/handlePredictUrl.test.ts
+++ b/app/core/DeeplinkManager/Handlers/handlePredictUrl.test.ts
@@ -119,6 +119,9 @@ describe('handlePredictUrl', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
 
@@ -127,6 +130,9 @@ describe('handlePredictUrl', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
 
@@ -135,6 +141,9 @@ describe('handlePredictUrl', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
 
@@ -143,6 +152,9 @@ describe('handlePredictUrl', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
 
@@ -151,6 +163,9 @@ describe('handlePredictUrl', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
   });
@@ -166,6 +181,9 @@ describe('handlePredictUrl', () => {
       expect(mockNavigate).toHaveBeenCalledTimes(2);
       expect(mockNavigate).toHaveBeenLastCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
 
@@ -178,6 +196,9 @@ describe('handlePredictUrl', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
 
@@ -188,6 +209,9 @@ describe('handlePredictUrl', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
 
@@ -213,6 +237,8 @@ describe('handlePredictUrl', () => {
       expect(DevLogger.log).toHaveBeenCalledWith(
         '[handlePredictUrl] Starting predict deeplink handling with path:',
         '?market=23246',
+        'origin:',
+        undefined,
       );
     });
 
@@ -257,6 +283,9 @@ describe('handlePredictUrl', () => {
 
       expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint: 'deeplink',
+        },
       });
     });
 
@@ -300,4 +329,84 @@ describe('handlePredictUrl', () => {
       });
     });
   });
+
+  describe('origin parameter handling', () => {
+    it('sets entryPoint to carousel when origin is carousel', async () => {
+      await handlePredictUrl({
+        predictPath: '?market=23246',
+        origin: 'carousel',
+      });
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.MODALS.ROOT, {
+        screen: Routes.PREDICT.MARKET_DETAILS,
+        params: {
+          marketId: '23246',
+          entryPoint: 'carousel',
+        },
+      });
+    });
+
+    it('sets entryPoint to deeplink when origin is undefined', async () => {
+      await handlePredictUrl({
+        predictPath: '?market=23246',
+        origin: undefined,
+      });
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.MODALS.ROOT, {
+        screen: Routes.PREDICT.MARKET_DETAILS,
+        params: {
+          marketId: '23246',
+          entryPoint: 'deeplink',
+        },
+      });
+    });
+
+    it('sets entryPoint to deeplink when origin is deeplink', async () => {
+      await handlePredictUrl({
+        predictPath: '?market=23246',
+        origin: 'deeplink',
+      });
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.MODALS.ROOT, {
+        screen: Routes.PREDICT.MARKET_DETAILS,
+        params: {
+          marketId: '23246',
+          entryPoint: 'deeplink',
+        },
+      });
+    });
+
+    it('sets entryPoint to notification when origin is notification', async () => {
+      await handlePredictUrl({
+        predictPath: '?market=23246',
+        origin: 'notification',
+      });
+
+      expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.MODALS.ROOT, {
+        screen: Routes.PREDICT.MARKET_DETAILS,
+        params: {
+          marketId: '23246',
+          entryPoint: 'notification',
+        },
+      });
+    });
+
+    it('logs origin and entry point', async () => {
+      await handlePredictUrl({
+        predictPath: '?market=23246',
+        origin: 'carousel',
+      });
+
+      expect(DevLogger.log).toHaveBeenCalledWith(
+        '[handlePredictUrl] Starting predict deeplink handling with path:',
+        '?market=23246',
+        'origin:',
+        'carousel',
+      );
+      expect(DevLogger.log).toHaveBeenCalledWith(
+        '[handlePredictUrl] Entry point:',
+        'carousel',
+      );
+    });
+  });
 });
diff --git a/app/core/DeeplinkManager/Handlers/handlePredictUrl.ts b/app/core/DeeplinkManager/Handlers/handlePredictUrl.ts
index 01bafafe3a9e..0c23564085b2 100644
--- a/app/core/DeeplinkManager/Handlers/handlePredictUrl.ts
+++ b/app/core/DeeplinkManager/Handlers/handlePredictUrl.ts
@@ -4,6 +4,7 @@ import DevLogger from '../../SDKConnect/utils/DevLogger';
 
 interface HandlePredictUrlParams {
   predictPath: string;
+  origin?: string;
 }
 
 /**
@@ -36,8 +37,9 @@ const parsePredictNavigationParams = (
 /**
  * Handle market-specific navigation
  * @param marketId The market ID to navigate to
+ * @param entryPoint The entry point for analytics tracking
  */
-const handleMarketNavigation = (marketId: string) => {
+const handleMarketNavigation = (marketId: string, entryPoint: string) => {
   DevLogger.log(
     '[handlePredictUrl] Navigating to market details for market:',
     marketId,
@@ -49,6 +51,7 @@ const handleMarketNavigation = (marketId: string) => {
     );
     NavigationService.navigation.navigate(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
+      params: { entryPoint },
     });
     return;
   }
@@ -59,7 +62,7 @@ const handleMarketNavigation = (marketId: string) => {
     screen: Routes.PREDICT.MARKET_DETAILS,
     params: {
       marketId,
-      entryPoint: 'deeplink',
+      entryPoint,
     },
   });
 };
@@ -67,7 +70,7 @@ const handleMarketNavigation = (marketId: string) => {
 /**
  * Predict deeplink handler
  *
- * @param params Object containing the predict path
+ * @param params Object containing the predict path and origin
  *
  * Supported URL formats:
  * - https://metamask.app.link/predict
@@ -76,19 +79,31 @@ const handleMarketNavigation = (marketId: string) => {
  * - https://link.metamask.io/predict?market=23246
  * - https://link.metamask.io/predict?marketId=23246
  *
+ * Origin handling:
+ * - Uses origin value directly as entryPoint for analytics tracking
+ * - Defaults to 'deeplink' if origin is not provided
+ * - Examples: 'carousel', 'notification', 'deeplink', etc.
+ *
  * Navigation behavior:
  * - No market param: Navigate to market list
  * - market=X or marketId=X: Navigate directly to market details for market X
  */
 export const handlePredictUrl = async ({
   predictPath,
+  origin,
 }: HandlePredictUrlParams) => {
   DevLogger.log(
     '[handlePredictUrl] Starting predict deeplink handling with path:',
     predictPath,
+    'origin:',
+    origin,
   );
 
   try {
+    // Use origin as entry point, default to 'deeplink' if not provided
+    const entryPoint = origin || 'deeplink';
+    DevLogger.log('[handlePredictUrl] Entry point:', entryPoint);
+
     // Parse navigation parameters from URL
     const navParams = parsePredictNavigationParams(predictPath);
     DevLogger.log(
@@ -98,19 +113,26 @@ export const handlePredictUrl = async ({
 
     // If market ID is provided, navigate to market details
     if (navParams.market) {
-      handleMarketNavigation(navParams.market);
+      handleMarketNavigation(navParams.market, entryPoint);
     } else {
       // Default to market list
       DevLogger.log('[handlePredictUrl] No market parameter, showing list');
       NavigationService.navigation.navigate(Routes.PREDICT.ROOT, {
         screen: Routes.PREDICT.MARKET_LIST,
+        params: {
+          entryPoint,
+        },
       });
     }
   } catch (error) {
     DevLogger.log('Failed to handle predict deeplink:', error);
     // Fallback to market list on error
+    // Default to 'deeplink' entry point for error fallback
     NavigationService.navigation.navigate(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
+      params: {
+        entryPoint: 'deeplink',
+      },
     });
   }
 };
diff --git a/app/core/DeeplinkManager/ParseManager/handleUniversalLink.test.ts b/app/core/DeeplinkManager/ParseManager/handleUniversalLink.test.ts
index 663a2bc429ce..0cd946e03f9d 100644
--- a/app/core/DeeplinkManager/ParseManager/handleUniversalLink.test.ts
+++ b/app/core/DeeplinkManager/ParseManager/handleUniversalLink.test.ts
@@ -603,7 +603,7 @@ describe('handleUniversalLinks', () => {
       });
 
       expect(handled).toHaveBeenCalled();
-      expect(mockHandlePredict).toHaveBeenCalledWith('');
+      expect(mockHandlePredict).toHaveBeenCalledWith('', 'test-source');
     });
 
     it('calls _handlePredict when action is PREDICT with market parameter', async () => {
@@ -626,7 +626,10 @@ describe('handleUniversalLinks', () => {
       });
 
       expect(handled).toHaveBeenCalled();
-      expect(mockHandlePredict).toHaveBeenCalledWith('?market=23246');
+      expect(mockHandlePredict).toHaveBeenCalledWith(
+        '?market=23246',
+        'test-source',
+      );
     });
 
     it('calls _handlePredict when action is PREDICT with marketId parameter', async () => {
@@ -649,7 +652,10 @@ describe('handleUniversalLinks', () => {
       });
 
       expect(handled).toHaveBeenCalled();
-      expect(mockHandlePredict).toHaveBeenCalledWith('?marketId=12345');
+      expect(mockHandlePredict).toHaveBeenCalledWith(
+        '?marketId=12345',
+        'test-source',
+      );
     });
 
     it('calls _handlePredict with full query string when multiple parameters present', async () => {
@@ -674,6 +680,7 @@ describe('handleUniversalLinks', () => {
       expect(handled).toHaveBeenCalled();
       expect(mockHandlePredict).toHaveBeenCalledWith(
         '?market=23246&utm_source=campaign',
+        'test-source',
       );
     });
   });
diff --git a/app/core/DeeplinkManager/ParseManager/handleUniversalLink.ts b/app/core/DeeplinkManager/ParseManager/handleUniversalLink.ts
index ce44e0c16122..44cdfd2bad0d 100644
--- a/app/core/DeeplinkManager/ParseManager/handleUniversalLink.ts
+++ b/app/core/DeeplinkManager/ParseManager/handleUniversalLink.ts
@@ -260,7 +260,7 @@ async function handleUniversalLink({
     instance._handleRewards(rewardsPath);
   } else if (action === SUPPORTED_ACTIONS.PREDICT) {
     const predictPath = urlObj.href.replace(BASE_URL_ACTION, '');
-    instance._handlePredict(predictPath);
+    instance._handlePredict(predictPath, source);
   } else if (action === SUPPORTED_ACTIONS.WC) {
     const { params } = extractURLParams(urlObj.href);
     const wcURL = params?.uri;
diff --git a/app/core/Engine/controllers/transaction-pay-controller/transaction-pay-controller-init.ts b/app/core/Engine/controllers/transaction-pay-controller/transaction-pay-controller-init.ts
index 4ecdd62da425..3600a057a570 100644
--- a/app/core/Engine/controllers/transaction-pay-controller/transaction-pay-controller-init.ts
+++ b/app/core/Engine/controllers/transaction-pay-controller/transaction-pay-controller-init.ts
@@ -35,8 +35,6 @@ export const TransactionPayControllerInit: ControllerInitFunction<
   }
 };
 
-async function getStrategy(
-  _transaction: TransactionMeta,
-): Promise<TransactionPayStrategy> {
+function getStrategy(_transaction: TransactionMeta): TransactionPayStrategy {
   return TransactionPayStrategy.Relay;
 }
diff --git a/app/images/predictions-no-search-results-dark.svg b/app/images/predictions-no-search-results-dark.svg
new file mode 100644
index 000000000000..760b47afb595
--- /dev/null
+++ b/app/images/predictions-no-search-results-dark.svg
@@ -0,0 +1,42 @@
+<svg width="72" height="78" viewBox="0 0 72 78" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_f_6364_73419)">
+<path d="M58.9088 69.3699C58.9088 71.1064 49.0546 72.5142 36.8987 72.5142C24.7429 72.5142 14.8887 71.1064 14.8887 69.3699C14.8887 67.6333 24.7429 66.2256 36.8987 66.2256C49.0546 66.2256 58.9088 67.6333 58.9088 69.3699Z" fill="#858B9A" fill-opacity="0.2"/>
+</g>
+<path d="M43.9236 51.7828L28.2788 49.5886L38.5628 19.6319C38.7925 18.9632 39.4578 18.546 40.1599 18.6301L58.3923 20.8165C58.9728 20.8861 59.5105 21.1569 59.912 21.5819L60.2358 21.9241C60.5999 22.3096 60.7338 22.8592 60.5874 23.3688L54.3736 44.9976C53.0667 49.5467 48.6107 52.4401 43.9236 51.7828Z" fill="#686E7D" stroke="#686E7D"/>
+<path d="M45.0434 50.2385L27.6492 47.7988L35.9207 19.184C36.1265 18.4728 36.8207 18.0182 37.555 18.1135L58.4104 20.8207C59.3208 20.9389 59.9127 21.8402 59.6593 22.7226L53.2932 44.8822C52.2614 48.4733 48.7437 50.7573 45.0434 50.2385Z" fill="#131416" stroke="#686E7D"/>
+<path d="M35.5582 34.1007C39.436 34.6446 42.3503 37.9159 42.4449 41.8304L42.5079 44.4328L42.5292 44.4357C42.7737 47.4052 44.7616 49.8529 47.4827 50.2347L42.6317 49.5543L42.652 50.4082L20.6959 47.0693L20.6989 46.4781L18.492 46.1686L19.1941 41.1629L20.724 41.3774L20.7713 32.0268L35.5582 34.1007ZM47.6916 50.264L47.4827 50.2347C47.5526 50.2445 47.6227 50.2512 47.6924 50.2582L47.6916 50.264Z" fill="#686E7D"/>
+<path d="M37.867 35.4021C37.8593 35.4568 37.8166 35.5 37.7621 35.5096C36.2938 35.769 35.0127 36.6702 34.2691 37.9502C34.1093 38.2252 34.0059 38.528 33.9199 38.8342L28.5909 57.8187C28.5094 58.1092 28.2257 58.2946 27.9269 58.2527C27.6471 58.2135 26.8072 57.3831 26.7407 57.1085C26.6074 56.5583 26.9521 56.689 26.5174 56.3869C25.4817 55.6674 23.9772 56.1497 23.0315 57.4539C22.9867 57.5157 22.9119 57.5493 22.8364 57.5387C22.7433 57.5257 22.1058 56.9753 22.0937 56.8821C21.7935 55.9893 22.2648 56.0767 21.7488 55.718C20.713 54.9984 19.2076 55.4807 18.2619 56.7853C18.2172 56.8469 18.1427 56.8804 18.0673 56.8698C17.9745 56.8568 17.5172 56.3315 17.5051 56.2385C17.1465 55.7629 17.4957 55.4079 16.9794 55.0491C15.9437 54.3296 14.4392 54.8118 13.4935 56.1162C13.4487 56.1779 13.374 56.2116 13.2984 56.201C13.2053 56.1879 12.5701 55.2125 12.558 55.1193C12.4691 54.4338 12.7268 54.739 12.2108 54.3803C11.2166 53.6895 9.7896 54.1062 8.84029 55.2946C8.71933 55.4461 8.53088 55.5323 8.33895 55.5054C8.03909 55.4633 7.06102 54.6523 7.13506 54.3587L12.0491 38.4869C12.9886 34.7623 16.5629 32.3347 20.3636 32.8218L20.3645 32.8211L20.3654 32.8204L37.76 35.2601C37.8287 35.2698 37.8766 35.3333 37.867 35.4021Z" fill="#686E7D"/>
+<mask id="path-6-inside-1_6364_73419" fill="white">
+<path d="M35.1858 34.0484C35.9807 34.16 35.7937 35.1463 35.1625 35.6421C34.5555 36.1189 33.9862 36.7232 33.49 37.417C33.3063 37.6739 33.1789 37.9658 33.0935 38.2699L27.8745 56.8665C27.793 57.1571 27.5091 57.3427 27.2101 57.3007C26.9303 57.2615 26.7223 57.031 26.6556 56.7563C26.5221 56.2064 26.2345 55.7374 25.8 55.4354C24.7652 54.7167 23.2641 55.1992 22.3185 56.5011C22.2731 56.5636 22.1974 56.5977 22.1209 56.5869C22.0266 56.5737 21.9549 56.4966 21.9426 56.4022C21.8532 55.7178 21.5458 55.1246 21.0303 54.7664C19.9954 54.048 18.4941 54.5304 17.5485 55.8325C17.5033 55.8948 17.4278 55.9287 17.3516 55.918C17.2576 55.9048 17.1862 55.828 17.1739 55.7339C17.0846 55.0492 16.7772 54.4559 16.2616 54.0976C15.2266 53.3789 13.7254 53.8615 12.7797 55.1637C12.7345 55.226 12.659 55.2598 12.5828 55.2492C12.4889 55.236 12.4174 55.1592 12.4051 55.0651C12.3158 54.3804 12.0084 53.7871 11.4928 53.4287C10.4993 52.7388 9.0761 53.1559 8.12718 54.3424C8.00574 54.4942 7.81667 54.5807 7.62412 54.5537C7.32312 54.5115 7.1253 54.2174 7.19963 53.9227L11.0214 38.77C12.1408 34.3322 16.4104 31.4448 20.9408 32.0514C20.9411 32.0514 20.9413 32.0513 20.9414 32.051C20.9414 32.0507 20.9417 32.0505 20.9419 32.0506L35.1858 34.0484Z"/>
+</mask>
+<path d="M35.1858 34.0484C35.9807 34.16 35.7937 35.1463 35.1625 35.6421C34.5555 36.1189 33.9862 36.7232 33.49 37.417C33.3063 37.6739 33.1789 37.9658 33.0935 38.2699L27.8745 56.8665C27.793 57.1571 27.5091 57.3427 27.2101 57.3007C26.9303 57.2615 26.7223 57.031 26.6556 56.7563C26.5221 56.2064 26.2345 55.7374 25.8 55.4354C24.7652 54.7167 23.2641 55.1992 22.3185 56.5011C22.2731 56.5636 22.1974 56.5977 22.1209 56.5869C22.0266 56.5737 21.9549 56.4966 21.9426 56.4022C21.8532 55.7178 21.5458 55.1246 21.0303 54.7664C19.9954 54.048 18.4941 54.5304 17.5485 55.8325C17.5033 55.8948 17.4278 55.9287 17.3516 55.918C17.2576 55.9048 17.1862 55.828 17.1739 55.7339C17.0846 55.0492 16.7772 54.4559 16.2616 54.0976C15.2266 53.3789 13.7254 53.8615 12.7797 55.1637C12.7345 55.226 12.659 55.2598 12.5828 55.2492C12.4889 55.236 12.4174 55.1592 12.4051 55.0651C12.3158 54.3804 12.0084 53.7871 11.4928 53.4287C10.4993 52.7388 9.0761 53.1559 8.12718 54.3424C8.00574 54.4942 7.81667 54.5807 7.62412 54.5537C7.32312 54.5115 7.1253 54.2174 7.19963 53.9227L11.0214 38.77C12.1408 34.3322 16.4104 31.4448 20.9408 32.0514C20.9411 32.0514 20.9413 32.0513 20.9414 32.051C20.9414 32.0507 20.9417 32.0505 20.9419 32.0506L35.1858 34.0484Z" fill="#131416"/>
+<path d="M35.1858 34.0484L35.3249 33.0581L35.3247 33.0581L35.1858 34.0484ZM25.8 55.4354L26.3708 54.6143L26.3705 54.6141L25.8 55.4354ZM21.0303 54.7664L21.601 53.9453L21.6006 53.945L21.0303 54.7664ZM16.2616 54.0976L16.8322 53.2764L16.8319 53.2762L16.2616 54.0976ZM11.4928 53.4287L12.0635 52.6076L12.0632 52.6074L11.4928 53.4287ZM11.0214 38.77L10.0517 38.5254L10.0517 38.5254L11.0214 38.77ZM20.9408 32.0514L21.0735 31.0603L20.9408 32.0514ZM17.1739 55.7339L16.1823 55.8632L17.1739 55.7339ZM17.5485 55.8325L16.7394 55.2449L17.5485 55.8325ZM21.9426 56.4022L20.951 56.5317L21.9426 56.4022ZM8.12718 54.3424L8.90814 54.9669L8.12718 54.3424ZM26.6556 56.7563L25.6838 56.9922L26.6556 56.7563ZM27.8745 56.8665L26.9117 56.5963L27.8745 56.8665ZM12.4051 55.0651L13.3967 54.9358L12.4051 55.0651ZM33.0935 38.2699L34.0563 38.5401L33.0935 38.2699ZM22.3185 56.5011L23.1276 57.0888L22.3185 56.5011ZM12.7797 55.1637L13.5889 55.7513L12.7797 55.1637ZM35.1625 35.6421L34.5448 34.8557C33.8557 35.397 33.2222 36.0725 32.6766 36.8353L33.49 37.417L34.3034 37.9988C34.7502 37.374 35.2553 36.8408 35.7802 36.4285L35.1625 35.6421ZM33.0935 38.2699L32.1307 37.9997L26.9117 56.5963L27.8745 56.8665L28.8373 57.1367L34.0563 38.5401L33.0935 38.2699ZM26.6556 56.7563L27.6274 56.5204C27.4476 55.7797 27.0422 55.0811 26.3708 54.6143L25.8 55.4354L25.2292 56.2565C25.4267 56.3938 25.5967 56.6331 25.6838 56.9922L26.6556 56.7563ZM25.8 55.4354L26.3705 54.6141C24.6987 53.4531 22.6189 54.3859 21.5094 55.9135L22.3185 56.5011L23.1276 57.0888C23.9094 56.0124 24.8316 55.9804 25.2296 56.2568L25.8 55.4354ZM21.9426 56.4022L22.9341 56.2728C22.8174 55.3786 22.4001 54.5006 21.601 53.9453L21.0303 54.7664L20.4596 55.5876C20.6914 55.7487 20.889 56.057 20.951 56.5317L21.9426 56.4022ZM21.0303 54.7664L21.6006 53.945C19.9289 52.7844 17.8489 53.7171 16.7394 55.2449L17.5485 55.8325L18.3576 56.4201C19.1393 55.3438 20.0619 55.3115 20.46 55.5879L21.0303 54.7664ZM17.1739 55.7339L18.1655 55.6046C18.0489 54.7102 17.6316 53.8319 16.8322 53.2764L16.2616 54.0976L15.6909 54.9188C15.9227 55.0799 16.1204 55.3883 16.1823 55.8632L17.1739 55.7339ZM16.2616 54.0976L16.8319 53.2762C15.1601 52.1153 13.0801 53.0483 11.9706 54.5761L12.7797 55.1637L13.5889 55.7513C14.3707 54.6747 15.2931 54.6426 15.6912 54.919L16.2616 54.0976ZM12.4051 55.0651L13.3967 54.9358C13.2801 54.0413 12.8628 53.1631 12.0635 52.6076L11.4928 53.4287L10.9221 54.2499C11.1539 54.411 11.3516 54.7195 11.4135 55.1944L12.4051 55.0651ZM11.4928 53.4287L12.0632 52.6074C10.4614 51.4949 8.47022 52.3124 7.34622 53.7178L8.12718 54.3424L8.90814 54.9669C9.68198 53.9994 10.5372 53.9826 10.9224 54.2501L11.4928 53.4287ZM7.19963 53.9227L8.16927 54.1672L11.991 39.0146L11.0214 38.77L10.0517 38.5254L6.23 53.6781L7.19963 53.9227ZM11.0214 38.77L11.991 39.0146C12.9861 35.0699 16.7812 32.5034 20.8081 33.0426L20.9408 32.0514L21.0735 31.0603C16.0396 30.3862 11.2956 33.5944 10.0517 38.5254L11.0214 38.77ZM20.9419 32.0506L20.803 33.0409L35.0469 35.0387L35.1858 34.0484L35.3247 33.0581L21.0808 31.0603L20.9419 32.0506ZM20.9414 32.051L21.9317 32.1899C21.855 32.7366 21.3497 33.1176 20.803 33.0409L20.9419 32.0506L21.0808 31.0603C20.5336 30.9835 20.0278 31.3649 19.9511 31.9121L20.9414 32.051ZM20.9408 32.0514L20.8081 33.0426C21.348 33.1149 21.8545 32.74 21.9317 32.1899L20.9414 32.051L19.9511 31.9121C20.0282 31.3625 20.5341 30.988 21.0735 31.0603L20.9408 32.0514ZM7.62412 54.5537L7.76302 53.5634C8.05109 53.6038 8.24041 53.8852 8.16927 54.1672L7.19963 53.9227L6.23 53.6781C6.0102 54.5496 6.59516 55.4191 7.48522 55.544L7.62412 54.5537ZM17.3516 55.918L17.4905 54.9277C17.8719 54.9812 18.1236 55.2832 18.1655 55.6046L17.1739 55.7339L16.1823 55.8632C16.2487 56.3728 16.6433 56.8285 17.2127 56.9083L17.3516 55.918ZM17.5485 55.8325L16.7394 55.2449C16.9009 55.0225 17.1831 54.8846 17.4905 54.9277L17.3516 55.918L17.2127 56.9083C17.6725 56.9728 18.1057 56.7671 18.3576 56.4201L17.5485 55.8325ZM22.1209 56.5869L22.2597 55.5966C22.641 55.6501 22.8922 55.9518 22.9341 56.2728L21.9426 56.4022L20.951 56.5317C21.0175 57.0414 21.4122 57.4973 21.982 57.5772L22.1209 56.5869ZM8.12718 54.3424L7.34622 53.7178C7.41797 53.6281 7.56458 53.5355 7.76302 53.5634L7.62412 54.5537L7.48522 55.544C8.06876 55.6258 8.59351 55.3603 8.90814 54.9669L8.12718 54.3424ZM27.2101 57.3007L27.349 56.3104C27.4497 56.3245 27.5236 56.3727 27.5657 56.4154C27.6045 56.4549 27.6206 56.4924 27.6274 56.5204L26.6556 56.7563L25.6838 56.9922C25.8245 57.5716 26.2976 58.1825 27.0712 58.291L27.2101 57.3007ZM27.8745 56.8665L26.9117 56.5963C26.9654 56.405 27.1523 56.2828 27.349 56.3104L27.2101 57.3007L27.0712 58.291C27.8659 58.4025 28.6205 57.9092 28.8373 57.1367L27.8745 56.8665ZM12.5828 55.2492L12.7217 54.2588C13.1032 54.3124 13.3548 54.6143 13.3967 54.9358L12.4051 55.0651L11.4135 55.1944C11.48 55.704 11.8746 56.1596 12.4439 56.2395L12.5828 55.2492ZM33.49 37.417L32.6766 36.8353C32.4119 37.2054 32.2405 37.6085 32.1307 37.9997L33.0935 38.2699L34.0563 38.5401C34.1173 38.323 34.2006 38.1425 34.3034 37.9988L33.49 37.417ZM22.3185 56.5011L21.5094 55.9135C21.6707 55.6914 21.9527 55.5535 22.2597 55.5966L22.1209 56.5869L21.982 57.5772C22.442 57.6418 22.8754 57.4359 23.1276 57.0888L22.3185 56.5011ZM12.7797 55.1637L11.9706 54.5761C12.1321 54.3537 12.4144 54.2157 12.7217 54.2588L12.5828 55.2492L12.4439 56.2395C12.9037 56.304 13.3369 56.0982 13.5889 55.7513L12.7797 55.1637ZM35.1858 34.0484L35.0468 35.0387C35.0289 35.0361 34.9013 35.0054 34.7978 34.8633C34.7059 34.737 34.7115 34.6295 34.7123 34.62C34.7131 34.61 34.7109 34.6426 34.6764 34.7027C34.6438 34.7596 34.5972 34.8145 34.5448 34.8557L35.1625 35.6421L35.7802 36.4285C36.2832 36.0335 36.6537 35.4203 36.7056 34.7824C36.7327 34.4504 36.6755 34.0443 36.4147 33.6862C36.1425 33.3123 35.7401 33.1164 35.3249 33.0581L35.1858 34.0484Z" fill="#686E7D" mask="url(#path-6-inside-1_6364_73419)"/>
+<path d="M46.7891 16.3251C50.2668 10.6158 57.8428 8.88513 63.7107 12.4594C69.5785 16.0337 71.5161 23.5595 68.0384 29.2688C67.2469 30.5682 66.2424 31.6606 65.0947 32.5322L69.2679 40.1693C69.7552 41.0611 69.4277 42.1788 68.5359 42.6662C67.6441 43.1535 66.5258 42.8257 66.0385 41.9338L61.8566 34.2807C58.4508 35.4925 54.4999 35.1952 51.1168 33.1344C45.249 29.5601 43.3114 22.0343 46.7891 16.3251Z" fill="#686E7D"/>
+<rect x="60.7104" y="32.1833" width="3.68032" height="12.9515" rx="1.84016" transform="rotate(-28.653 60.7104 32.1833)" fill="#686E7D"/>
+<path d="M61.9828 33.0571C61.6803 32.5035 61.8838 31.8095 62.4374 31.507C62.991 31.2045 63.685 31.408 63.9875 31.9616L68.6415 40.4789C68.944 41.0325 68.7405 41.7265 68.1869 42.029C67.6333 42.3315 66.9393 42.1279 66.6368 41.5743L61.9828 33.0571Z" fill="#686E7D"/>
+<path opacity="0.5" d="M63.6483 34.5481C63.4853 34.25 63.595 33.8762 63.8931 33.7133C64.1913 33.5504 64.565 33.66 64.7279 33.9582L67.9093 39.7804C68.0722 40.0786 67.9626 40.4523 67.6644 40.6152C67.3663 40.7781 66.9925 40.6685 66.8296 40.3704L63.6483 34.5481Z" fill="#131416"/>
+<ellipse cx="57.4139" cy="22.797" rx="12.1043" ry="12.4406" transform="rotate(-1.76248 57.4139 22.797)" fill="#686E7D"/>
+<circle cx="57.4036" cy="22.4609" r="11.4319" transform="rotate(-1.76248 57.4036 22.4609)" fill="#686E7D"/>
+<circle cx="57.4036" cy="22.4609" r="11.4319" transform="rotate(-1.76248 57.4036 22.4609)" fill="#131416"/>
+<mask id="mask0_6364_73419" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="45" y="10" width="24" height="25">
+<circle cx="57.4042" cy="22.4607" r="11.0626" transform="rotate(-1.76248 57.4042 22.4607)" fill="#131416" stroke="#858B9A" stroke-opacity="0.2"/>
+</mask>
+<g mask="url(#mask0_6364_73419)">
+<g opacity="0.6" filter="url(#filter1_f_6364_73419)">
+<path d="M42.6663 66.036L13.8468 61.9939L29.9666 15.0375C30.1962 14.3687 30.8616 13.9505 31.5637 14.0347L60.8868 17.5519C61.4673 17.6215 62.005 17.8922 62.4065 18.3172L63.7125 19.6995C64.0766 20.085 64.2105 20.6346 64.0641 21.1442L53.1163 59.2508C51.8095 63.7999 47.3535 66.6934 42.6663 66.036Z" fill="#686E7D" stroke="#686E7D"/>
+<path d="M43.4683 63.5449L12.8994 59.2574L25.8946 14.3014C26.1002 13.59 26.7946 13.1346 27.5289 13.2299L61.5693 17.6493C62.4797 17.7675 63.0716 18.6688 62.8182 19.5512L51.719 58.1887C50.6872 61.78 47.1687 64.0639 43.4683 63.5449Z" fill="#131416" stroke="#686E7D"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_6364_73419" x="9.88867" y="61.2256" width="54.0203" height="16.2886" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="2.5" result="effect1_foregroundBlur_6364_73419"/>
+</filter>
+<filter id="filter1_f_6364_73419" x="-19.1599" y="11.7178" width="84.782" height="64.3257" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.5" result="effect1_foregroundBlur_6364_73419"/>
+</filter>
+</defs>
+</svg>
diff --git a/app/images/predictions-no-search-results-light.svg b/app/images/predictions-no-search-results-light.svg
new file mode 100644
index 000000000000..221537b23841
--- /dev/null
+++ b/app/images/predictions-no-search-results-light.svg
@@ -0,0 +1,42 @@
+<svg width="72" height="78" viewBox="0 0 72 78" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_f_9865_7003)">
+<path d="M58.9088 69.3699C58.9088 71.1064 49.0546 72.5142 36.8987 72.5142C24.7429 72.5142 14.8887 71.1064 14.8887 69.3699C14.8887 67.6333 24.7429 66.2256 36.8987 66.2256C49.0546 66.2256 58.9088 67.6333 58.9088 69.3699Z" fill="#B7BBC8" fill-opacity="0.4"/>
+</g>
+<path d="M43.9236 51.7828L28.2788 49.5886L38.5628 19.6319C38.7925 18.9632 39.4578 18.546 40.1599 18.6301L58.3923 20.8165C58.9728 20.8861 59.5105 21.1569 59.912 21.5819L60.2358 21.9241C60.5999 22.3096 60.7338 22.8592 60.5874 23.3688L54.3736 44.9976C53.0667 49.5467 48.6107 52.4401 43.9236 51.7828Z" fill="#858B9A" stroke="#858B9A"/>
+<path d="M45.0434 50.2385L27.6492 47.7988L35.9207 19.184C36.1265 18.4728 36.8207 18.0182 37.555 18.1135L58.4104 20.8207C59.3208 20.9389 59.9127 21.8402 59.6593 22.7226L53.2932 44.8822C52.2614 48.4733 48.7437 50.7573 45.0434 50.2385Z" fill="white" stroke="#858B9A"/>
+<path d="M35.5582 34.1007C39.436 34.6446 42.3503 37.9159 42.4449 41.8304L42.5079 44.4328L42.5292 44.4357C42.7737 47.4052 44.7616 49.8529 47.4827 50.2347L42.6317 49.5543L42.652 50.4082L20.6959 47.0693L20.6989 46.4781L18.492 46.1686L19.1941 41.1629L20.724 41.3774L20.7713 32.0268L35.5582 34.1007ZM47.6916 50.264L47.4827 50.2347C47.5526 50.2445 47.6227 50.2512 47.6924 50.2582L47.6916 50.264Z" fill="#858B9A"/>
+<path d="M37.867 35.4021C37.8593 35.4568 37.8166 35.5 37.7621 35.5096C36.2938 35.769 35.0127 36.6702 34.2691 37.9502C34.1093 38.2252 34.0059 38.528 33.9199 38.8342L28.5909 57.8187C28.5094 58.1092 28.2257 58.2946 27.9269 58.2527C27.6471 58.2135 26.8072 57.3831 26.7407 57.1085C26.6074 56.5583 26.9521 56.689 26.5174 56.3869C25.4817 55.6674 23.9772 56.1497 23.0315 57.4539C22.9867 57.5157 22.9119 57.5493 22.8364 57.5387C22.7433 57.5257 22.1058 56.9753 22.0937 56.8821C21.7935 55.9893 22.2648 56.0767 21.7488 55.718C20.713 54.9984 19.2076 55.4807 18.2619 56.7853C18.2172 56.8469 18.1427 56.8804 18.0673 56.8698C17.9745 56.8568 17.5172 56.3315 17.5051 56.2385C17.1465 55.7629 17.4957 55.4079 16.9794 55.0491C15.9437 54.3296 14.4392 54.8118 13.4935 56.1162C13.4487 56.1779 13.374 56.2116 13.2984 56.201C13.2053 56.1879 12.5701 55.2125 12.558 55.1193C12.4691 54.4338 12.7268 54.739 12.2108 54.3803C11.2166 53.6895 9.7896 54.1062 8.84029 55.2946C8.71933 55.4461 8.53088 55.5323 8.33895 55.5054C8.03909 55.4633 7.06102 54.6523 7.13506 54.3587L12.0491 38.4869C12.9886 34.7623 16.5629 32.3347 20.3636 32.8218L20.3645 32.8211L20.3654 32.8204L37.76 35.2601C37.8287 35.2698 37.8766 35.3333 37.867 35.4021Z" fill="#858B9A"/>
+<mask id="path-6-inside-1_9865_7003" fill="white">
+<path d="M35.1858 34.0484C35.9807 34.16 35.7937 35.1463 35.1625 35.6421C34.5555 36.1189 33.9862 36.7232 33.49 37.417C33.3063 37.6739 33.1789 37.9658 33.0935 38.2699L27.8745 56.8665C27.793 57.1571 27.5091 57.3427 27.2101 57.3007C26.9303 57.2615 26.7223 57.031 26.6556 56.7563C26.5221 56.2064 26.2345 55.7374 25.8 55.4354C24.7652 54.7167 23.2641 55.1992 22.3185 56.5011C22.2731 56.5636 22.1974 56.5977 22.1209 56.5869C22.0266 56.5737 21.9549 56.4966 21.9426 56.4022C21.8532 55.7178 21.5458 55.1246 21.0303 54.7664C19.9954 54.048 18.4941 54.5304 17.5485 55.8325C17.5033 55.8948 17.4278 55.9287 17.3516 55.918C17.2576 55.9048 17.1862 55.828 17.1739 55.7339C17.0846 55.0492 16.7772 54.4559 16.2616 54.0976C15.2266 53.3789 13.7254 53.8615 12.7797 55.1637C12.7345 55.226 12.659 55.2598 12.5828 55.2492C12.4889 55.236 12.4174 55.1592 12.4051 55.0651C12.3158 54.3804 12.0084 53.7871 11.4928 53.4287C10.4993 52.7388 9.0761 53.1559 8.12718 54.3424C8.00574 54.4942 7.81667 54.5807 7.62412 54.5537C7.32312 54.5115 7.1253 54.2174 7.19963 53.9227L11.0214 38.77C12.1408 34.3322 16.4104 31.4448 20.9408 32.0514C20.9411 32.0514 20.9413 32.0513 20.9414 32.051C20.9414 32.0507 20.9417 32.0505 20.9419 32.0506L35.1858 34.0484Z"/>
+</mask>
+<path d="M35.1858 34.0484C35.9807 34.16 35.7937 35.1463 35.1625 35.6421C34.5555 36.1189 33.9862 36.7232 33.49 37.417C33.3063 37.6739 33.1789 37.9658 33.0935 38.2699L27.8745 56.8665C27.793 57.1571 27.5091 57.3427 27.2101 57.3007C26.9303 57.2615 26.7223 57.031 26.6556 56.7563C26.5221 56.2064 26.2345 55.7374 25.8 55.4354C24.7652 54.7167 23.2641 55.1992 22.3185 56.5011C22.2731 56.5636 22.1974 56.5977 22.1209 56.5869C22.0266 56.5737 21.9549 56.4966 21.9426 56.4022C21.8532 55.7178 21.5458 55.1246 21.0303 54.7664C19.9954 54.048 18.4941 54.5304 17.5485 55.8325C17.5033 55.8948 17.4278 55.9287 17.3516 55.918C17.2576 55.9048 17.1862 55.828 17.1739 55.7339C17.0846 55.0492 16.7772 54.4559 16.2616 54.0976C15.2266 53.3789 13.7254 53.8615 12.7797 55.1637C12.7345 55.226 12.659 55.2598 12.5828 55.2492C12.4889 55.236 12.4174 55.1592 12.4051 55.0651C12.3158 54.3804 12.0084 53.7871 11.4928 53.4287C10.4993 52.7388 9.0761 53.1559 8.12718 54.3424C8.00574 54.4942 7.81667 54.5807 7.62412 54.5537C7.32312 54.5115 7.1253 54.2174 7.19963 53.9227L11.0214 38.77C12.1408 34.3322 16.4104 31.4448 20.9408 32.0514C20.9411 32.0514 20.9413 32.0513 20.9414 32.051C20.9414 32.0507 20.9417 32.0505 20.9419 32.0506L35.1858 34.0484Z" fill="white"/>
+<path d="M35.1858 34.0484L35.3249 33.0581L35.3247 33.0581L35.1858 34.0484ZM25.8 55.4354L26.3708 54.6143L26.3705 54.6141L25.8 55.4354ZM21.0303 54.7664L21.601 53.9453L21.6006 53.945L21.0303 54.7664ZM16.2616 54.0976L16.8322 53.2764L16.8319 53.2762L16.2616 54.0976ZM11.4928 53.4287L12.0635 52.6076L12.0632 52.6074L11.4928 53.4287ZM11.0214 38.77L10.0517 38.5254L10.0517 38.5254L11.0214 38.77ZM20.9408 32.0514L21.0735 31.0603L20.9408 32.0514ZM17.1739 55.7339L18.1655 55.6046L17.1739 55.7339ZM17.5485 55.8325L16.7394 55.2449L17.5485 55.8325ZM21.9426 56.4022L20.951 56.5317L21.9426 56.4022ZM8.12718 54.3424L8.90814 54.9669L8.12718 54.3424ZM26.6556 56.7563L25.6838 56.9922L26.6556 56.7563ZM27.8745 56.8665L26.9117 56.5963L27.8745 56.8665ZM12.4051 55.0651L11.4135 55.1944L12.4051 55.0651ZM33.0935 38.2699L34.0563 38.5401L33.0935 38.2699ZM22.3185 56.5011L23.1276 57.0888L22.3185 56.5011ZM12.7797 55.1637L11.9706 54.5761L12.7797 55.1637ZM35.1625 35.6421L34.5448 34.8557C33.8557 35.397 33.2222 36.0725 32.6766 36.8353L33.49 37.417L34.3034 37.9988C34.7502 37.374 35.2553 36.8408 35.7802 36.4285L35.1625 35.6421ZM33.0935 38.2699L32.1307 37.9997L26.9117 56.5963L27.8745 56.8665L28.8373 57.1367L34.0563 38.5401L33.0935 38.2699ZM26.6556 56.7563L27.6274 56.5204C27.4476 55.7797 27.0422 55.0811 26.3708 54.6143L25.8 55.4354L25.2292 56.2565C25.4267 56.3938 25.5967 56.6331 25.6838 56.9922L26.6556 56.7563ZM25.8 55.4354L26.3705 54.6141C24.6987 53.4531 22.6189 54.3859 21.5094 55.9135L22.3185 56.5011L23.1276 57.0888C23.9094 56.0124 24.8316 55.9804 25.2296 56.2568L25.8 55.4354ZM21.9426 56.4022L22.9341 56.2728C22.8174 55.3786 22.4001 54.5006 21.601 53.9453L21.0303 54.7664L20.4596 55.5876C20.6914 55.7487 20.889 56.057 20.951 56.5317L21.9426 56.4022ZM21.0303 54.7664L21.6006 53.945C19.9289 52.7844 17.8489 53.7171 16.7394 55.2449L17.5485 55.8325L18.3576 56.4201C19.1393 55.3438 20.0619 55.3115 20.46 55.5879L21.0303 54.7664ZM17.1739 55.7339L18.1655 55.6046C18.0489 54.7102 17.6316 53.8319 16.8322 53.2764L16.2616 54.0976L15.6909 54.9188C15.9227 55.0799 16.1204 55.3883 16.1823 55.8632L17.1739 55.7339ZM16.2616 54.0976L16.8319 53.2762C15.1601 52.1153 13.0801 53.0483 11.9706 54.5761L12.7797 55.1637L13.5889 55.7513C14.3707 54.6747 15.2931 54.6426 15.6912 54.919L16.2616 54.0976ZM12.4051 55.0651L13.3967 54.9358C13.2801 54.0413 12.8628 53.1631 12.0635 52.6076L11.4928 53.4287L10.9221 54.2499C11.1539 54.411 11.3516 54.7195 11.4135 55.1944L12.4051 55.0651ZM11.4928 53.4287L12.0632 52.6074C10.4614 51.4949 8.47022 52.3124 7.34622 53.7178L8.12718 54.3424L8.90814 54.9669C9.68198 53.9994 10.5372 53.9826 10.9224 54.2501L11.4928 53.4287ZM7.19963 53.9227L8.16927 54.1672L11.991 39.0146L11.0214 38.77L10.0517 38.5254L6.23 53.6781L7.19963 53.9227ZM11.0214 38.77L11.991 39.0146C12.9861 35.0699 16.7812 32.5034 20.8081 33.0426L20.9408 32.0514L21.0735 31.0603C16.0396 30.3862 11.2956 33.5944 10.0517 38.5254L11.0214 38.77ZM20.9419 32.0506L20.803 33.0409L35.0469 35.0387L35.1858 34.0484L35.3247 33.0581L21.0808 31.0603L20.9419 32.0506ZM20.9414 32.051L21.9317 32.1899C21.855 32.7366 21.3497 33.1176 20.803 33.0409L20.9419 32.0506L21.0808 31.0603C20.5336 30.9835 20.0278 31.3649 19.9511 31.9121L20.9414 32.051ZM20.9408 32.0514L20.8081 33.0426C21.348 33.1149 21.8545 32.74 21.9317 32.1899L20.9414 32.051L19.9511 31.9121C20.0282 31.3625 20.5341 30.988 21.0735 31.0603L20.9408 32.0514ZM7.62412 54.5537L7.76302 53.5634C8.05109 53.6038 8.24041 53.8852 8.16927 54.1672L7.19963 53.9227L6.23 53.6781C6.0102 54.5496 6.59516 55.4191 7.48522 55.544L7.62412 54.5537ZM17.3516 55.918L17.4905 54.9277C17.8719 54.9812 18.1236 55.2832 18.1655 55.6046L17.1739 55.7339L16.1823 55.8632C16.2487 56.3728 16.6433 56.8285 17.2127 56.9083L17.3516 55.918ZM17.5485 55.8325L16.7394 55.2449C16.9009 55.0225 17.1831 54.8846 17.4905 54.9277L17.3516 55.918L17.2127 56.9083C17.6725 56.9728 18.1057 56.7671 18.3576 56.4201L17.5485 55.8325ZM22.1209 56.5869L22.2597 55.5966C22.641 55.6501 22.8922 55.9518 22.9341 56.2728L21.9426 56.4022L20.951 56.5317C21.0175 57.0414 21.4122 57.4973 21.982 57.5772L22.1209 56.5869ZM8.12718 54.3424L7.34622 53.7178C7.41797 53.6281 7.56458 53.5355 7.76302 53.5634L7.62412 54.5537L7.48522 55.544C8.06876 55.6258 8.59351 55.3603 8.90814 54.9669L8.12718 54.3424ZM27.2101 57.3007L27.349 56.3104C27.4497 56.3245 27.5236 56.3727 27.5657 56.4154C27.6045 56.4549 27.6206 56.4924 27.6274 56.5204L26.6556 56.7563L25.6838 56.9922C25.8245 57.5716 26.2976 58.1825 27.0712 58.291L27.2101 57.3007ZM27.8745 56.8665L26.9117 56.5963C26.9654 56.405 27.1523 56.2828 27.349 56.3104L27.2101 57.3007L27.0712 58.291C27.8659 58.4025 28.6205 57.9092 28.8373 57.1367L27.8745 56.8665ZM12.5828 55.2492L12.7217 54.2588C13.1032 54.3124 13.3548 54.6143 13.3967 54.9358L12.4051 55.0651L11.4135 55.1944C11.48 55.704 11.8746 56.1596 12.4439 56.2395L12.5828 55.2492ZM33.49 37.417L32.6766 36.8353C32.4119 37.2054 32.2405 37.6085 32.1307 37.9997L33.0935 38.2699L34.0563 38.5401C34.1173 38.323 34.2006 38.1425 34.3034 37.9988L33.49 37.417ZM22.3185 56.5011L21.5094 55.9135C21.6707 55.6914 21.9527 55.5535 22.2597 55.5966L22.1209 56.5869L21.982 57.5772C22.442 57.6418 22.8754 57.4359 23.1276 57.0888L22.3185 56.5011ZM12.7797 55.1637L11.9706 54.5761C12.1321 54.3537 12.4144 54.2157 12.7217 54.2588L12.5828 55.2492L12.4439 56.2395C12.9037 56.304 13.3369 56.0982 13.5889 55.7513L12.7797 55.1637ZM35.1858 34.0484L35.0468 35.0387C35.0289 35.0361 34.9013 35.0054 34.7978 34.8633C34.7059 34.737 34.7115 34.6295 34.7123 34.62C34.7131 34.61 34.7109 34.6426 34.6764 34.7027C34.6438 34.7596 34.5972 34.8145 34.5448 34.8557L35.1625 35.6421L35.7802 36.4285C36.2832 36.0335 36.6537 35.4203 36.7056 34.7824C36.7327 34.4504 36.6755 34.0443 36.4147 33.6862C36.1425 33.3123 35.7401 33.1164 35.3249 33.0581L35.1858 34.0484Z" fill="#858B9A" mask="url(#path-6-inside-1_9865_7003)"/>
+<path d="M46.7891 16.3251C50.2668 10.6158 57.8428 8.88513 63.7107 12.4594C69.5785 16.0337 71.5161 23.5595 68.0384 29.2688C67.2469 30.5682 66.2424 31.6606 65.0947 32.5322L69.2679 40.1693C69.7552 41.0611 69.4277 42.1788 68.5359 42.6662C67.6441 43.1535 66.5258 42.8257 66.0385 41.9338L61.8566 34.2807C58.4508 35.4925 54.4999 35.1952 51.1168 33.1344C45.249 29.5601 43.3114 22.0343 46.7891 16.3251Z" fill="#858B9A"/>
+<rect x="60.7104" y="32.1833" width="3.68032" height="12.9515" rx="1.84016" transform="rotate(-28.653 60.7104 32.1833)" fill="#858B9A"/>
+<path d="M61.9828 33.0571C61.6803 32.5035 61.8838 31.8095 62.4374 31.507C62.991 31.2045 63.685 31.408 63.9875 31.9616L68.6415 40.4789C68.944 41.0325 68.7405 41.7265 68.1869 42.029C67.6333 42.3315 66.9393 42.1279 66.6368 41.5743L61.9828 33.0571Z" fill="#858B9A"/>
+<path opacity="0.5" d="M63.6483 34.5481C63.4853 34.25 63.595 33.8762 63.8931 33.7133C64.1913 33.5504 64.565 33.66 64.7279 33.9582L67.9093 39.7804C68.0722 40.0786 67.9626 40.4523 67.6644 40.6152C67.3663 40.7781 66.9925 40.6685 66.8296 40.3704L63.6483 34.5481Z" fill="white"/>
+<ellipse cx="57.4139" cy="22.797" rx="12.1043" ry="12.4406" transform="rotate(-1.76248 57.4139 22.797)" fill="#858B9A"/>
+<circle cx="57.4036" cy="22.4609" r="11.4319" transform="rotate(-1.76248 57.4036 22.4609)" fill="#858B9A"/>
+<circle cx="57.4036" cy="22.4609" r="11.4319" transform="rotate(-1.76248 57.4036 22.4609)" fill="white"/>
+<mask id="mask0_9865_7003" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="45" y="10" width="24" height="25">
+<circle cx="57.4042" cy="22.4607" r="11.0626" transform="rotate(-1.76248 57.4042 22.4607)" fill="white" stroke="#B7BBC8" stroke-opacity="0.4"/>
+</mask>
+<g mask="url(#mask0_9865_7003)">
+<g opacity="0.6" filter="url(#filter1_f_9865_7003)">
+<path d="M42.6663 66.036L13.8468 61.9939L29.9666 15.0375C30.1962 14.3687 30.8616 13.9505 31.5637 14.0347L60.8868 17.5519C61.4673 17.6215 62.005 17.8922 62.4065 18.3172L63.7125 19.6995C64.0766 20.085 64.2105 20.6346 64.0641 21.1442L53.1163 59.2508C51.8095 63.7999 47.3535 66.6934 42.6663 66.036Z" fill="#858B9A" stroke="#858B9A"/>
+<path d="M43.4683 63.5449L12.8994 59.2574L25.8946 14.3014C26.1002 13.59 26.7946 13.1346 27.5289 13.2299L61.5693 17.6493C62.4797 17.7675 63.0716 18.6688 62.8182 19.5512L51.719 58.1887C50.6872 61.78 47.1687 64.0639 43.4683 63.5449Z" fill="white" stroke="#858B9A"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_9865_7003" x="9.88867" y="61.2256" width="54.0203" height="16.2886" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="2.5" result="effect1_foregroundBlur_9865_7003"/>
+</filter>
+<filter id="filter1_f_9865_7003" x="-19.1599" y="11.7178" width="84.782" height="64.3257" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.5" result="effect1_foregroundBlur_9865_7003"/>
+</filter>
+</defs>
+</svg>
diff --git a/app/util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types.ts b/app/util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types.ts
index 1fcc390639e9..cbaf19b3cc4a 100644
--- a/app/util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types.ts
+++ b/app/util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types.ts
@@ -19,6 +19,7 @@ export enum UserProfileProperty {
   REWARDS_REFERRED = 'rewards_referred',
   REWARDS_REFERRAL_CODE_USED = 'rewards_referral_code_used',
   REWARD_ENABLED_ACCOUNTS_COUNT = 'reward_enabled_accounts_count',
+  CREATED_POLYMARKET_ACCOUNT_VIA_MM = 'created_polymarket_account_via_mm',
 }
 
 export interface UserProfileMetaData {
@@ -38,4 +39,5 @@ export interface UserProfileMetaData {
   [UserProfileProperty.REWARDS_REFERRED]?: boolean;
   [UserProfileProperty.REWARDS_REFERRAL_CODE_USED]?: string;
   [UserProfileProperty.REWARD_ENABLED_ACCOUNTS_COUNT]?: number;
+  [UserProfileProperty.CREATED_POLYMARKET_ACCOUNT_VIA_MM]?: boolean;
 }
diff --git a/locales/languages/en.json b/locales/languages/en.json
index d81c232f9cd0..cd12f146dab1 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -1333,10 +1333,10 @@
       "orderLeverageReductionFailed": "You cannot reduce your leverage",
       "connectionTimeout": "Connection timed out. Please check your network and try again.",
       "connectionFailed": {
-        "title": "Perps is temporarily offline",
+        "title": "Couldn't connect to perps",
         "description": "We're working to get it back online soon.",
-        "retry": "Retry",
-        "go_back": "Go Back"
+        "retry": "Try again",
+        "go_back": "Go back"
       },
       "networkError": {
         "title": "Network Error",
@@ -1419,7 +1419,7 @@
       "orders": "Orders",
       "go_to_activity": "Go to your activity",
       "trading_24_7": "This asset may be traded 24/7",
-      "expect_more_volatility": "Expect more volatility outside of regular market hours",
+      "expect_more_volatility": "Expect more volatility outside of market hours",
       "after_hours_trading_banner": "After-hours trading",
       "pay_attention_to_volatility": "Pay attention to volatility and slippage",
       "badge": {
@@ -1831,6 +1831,8 @@
     },
     "search_placeholder": "Search prediction markets",
     "search_cancel": "Cancel",
+    "search_empty_state": "No {{category}} markets available",
+    "search_no_markets_found": "No results found for \"{{q}}\"",
     "claim_button": "Claim",
     "markets_won": "Markets won",
     "won_markets_text": "Won {{count}} market{{s}}",
@@ -5839,7 +5841,8 @@
     "transaction": "Transaction",
     "available_balance": "Available: ",
     "edit_amount_done": "Done",
-    "deposit_edit_amount_done": "Add funds"
+    "deposit_edit_amount_done": "Add funds",
+    "deposit_edit_amount_predict_withdraw": "Withdraw"
   },
   "change_in_simulation_modal": {
     "title": "Results have changed",
@@ -6839,7 +6842,9 @@
   "transaction_details": {
     "title": {
       "perps_deposit": "Funded Perps account",
+      "predict_claim": "Claimed winnings",
       "predict_deposit": "Funded Predict account",
+      "predict_withdraw": "Withdrawal",
       "default": "Transaction details"
     },
     "label": {
@@ -6847,7 +6852,9 @@
       "network_fee": "Network fee",
       "paid_with": "Paid with",
       "retry_button": "Try again",
-      "total": "Total"
+      "total": "Total",
+      "account": "Account",
+      "received_total": "Received total"
     },
     "summary_title": {
       "bridge_approval": "Approve {{approveSymbol}}",
diff --git a/package.json b/package.json
index 74c91e382d35..7938352f9634 100644
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
     "@scure/bip32": "1.7.0",
     "@metamask/snaps-sdk": "^10.0.0",
     "react-native@0.76.9": "patch:react-native@npm%3A0.76.9#./.yarn/patches/react-native-npm-0.76.9-1c25352097.patch",
-    "@metamask/transaction-controller@npm:^61.1.0": "patch:@metamask/transaction-controller@npm%3A61.0.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch"
+    "@metamask/transaction-controller@npm:^61.3.0": "patch:@metamask/transaction-controller@npm%3A61.3.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch"
   },
   "dependencies": {
     "@config-plugins/detox": "^9.0.0",
@@ -285,8 +285,8 @@
     "@metamask/swappable-obj-proxy": "^2.1.0",
     "@metamask/swaps-controller": "^15.0.0",
     "@metamask/token-search-discovery-controller": "^4.0.0",
-    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A61.1.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch",
-    "@metamask/transaction-pay-controller": "^5.0.0",
+    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A61.3.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch",
+    "@metamask/transaction-pay-controller": "^6.0.0",
     "@metamask/tron-wallet-snap": "^1.7.2",
     "@metamask/utils": "^11.8.1",
     "@ngraveio/bc-ur": "^1.1.6",
diff --git a/yarn.lock b/yarn.lock
index 8767ee8306a3..470e908ecba8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8833,9 +8833,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:61.1.0, @metamask/transaction-controller@npm:^61.0.0":
-  version: 61.1.0
-  resolution: "@metamask/transaction-controller@npm:61.1.0"
+"@metamask/transaction-controller@npm:61.3.0, @metamask/transaction-controller@npm:^61.0.0":
+  version: 61.3.0
+  resolution: "@metamask/transaction-controller@npm:61.3.0"
   dependencies:
     "@ethereumjs/common": "npm:^4.4.0"
     "@ethereumjs/tx": "npm:^5.4.0"
@@ -8853,6 +8853,7 @@ __metadata:
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/utils": "npm:^11.8.1"
     async-mutex: "npm:^0.5.0"
+    bignumber.js: "npm:^9.1.2"
     bn.js: "npm:^5.2.1"
     eth-method-registry: "npm:^4.0.0"
     fast-json-patch: "npm:^3.1.1"
@@ -8866,13 +8867,13 @@ __metadata:
     "@metamask/gas-fee-controller": ^25.0.0
     "@metamask/network-controller": ^25.0.0
     "@metamask/remote-feature-flag-controller": ^2.0.0
-  checksum: 10/120112436d6f4d703adafb58e7670579df4dc3e2b35f3536eb6979ec5efb0623e72f690b042af00dc7695e15a803f937088fb4cddd06864a1f5dcb6e85d81eb5
+  checksum: 10/99bbf130b33d0c8f241d2d79006281a2ddc5910ee0b0d6efa806339533ed191430013c1eb29de082b89f002ee0cfd33626b39fbd9cff77a5fe79731e258f47d3
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A61.1.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch":
-  version: 61.1.0
-  resolution: "@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A61.1.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch::version=61.1.0&hash=1a3342"
+"@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A61.3.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch":
+  version: 61.3.0
+  resolution: "@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A61.3.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch::version=61.3.0&hash=1a3342"
   dependencies:
     "@ethereumjs/common": "npm:^4.4.0"
     "@ethereumjs/tx": "npm:^5.4.0"
@@ -8890,6 +8891,7 @@ __metadata:
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/utils": "npm:^11.8.1"
     async-mutex: "npm:^0.5.0"
+    bignumber.js: "npm:^9.1.2"
     bn.js: "npm:^5.2.1"
     eth-method-registry: "npm:^4.0.0"
     fast-json-patch: "npm:^3.1.1"
@@ -8903,13 +8905,13 @@ __metadata:
     "@metamask/gas-fee-controller": ^25.0.0
     "@metamask/network-controller": ^25.0.0
     "@metamask/remote-feature-flag-controller": ^2.0.0
-  checksum: 10/a39ee64664eeb0591d52ff8d2e353bcaadc152e4bda919ad920a3550957f5d295454d19c9de6914acd4e1c9de0e53330c1efc2e6eaafdd3994c1dcba0ace4d98
+  checksum: 10/35f8076c3180cf4f6fca14b26b96051f5ce040ba5a8c15c7f09035a3723acef305c336fae4b56ed1e210213fa5d7f5c92bea122237a835009be78633e69388a9
   languageName: node
   linkType: hard
 
-"@metamask/transaction-pay-controller@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@metamask/transaction-pay-controller@npm:5.0.0"
+"@metamask/transaction-pay-controller@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "@metamask/transaction-pay-controller@npm:6.0.0"
   dependencies:
     "@ethersproject/abi": "npm:^5.7.0"
     "@ethersproject/contracts": "npm:^5.7.0"
@@ -8930,7 +8932,7 @@ __metadata:
     "@metamask/network-controller": ^25.0.0
     "@metamask/remote-feature-flag-controller": ^2.0.0
     "@metamask/transaction-controller": ^61.0.0
-  checksum: 10/877cc270a9ce1fb85dc078483695244c8d0b48779c15ee062e9c6712af8434f184a30c7efabdb7780eb08c2e42e6397b3eb537426a35e0bf1cd747185a541f59
+  checksum: 10/ee31e630c1f436d2daf225e9f974f5428c52e8f3b905702000889079d21f41b7bf131b572f0b41862fe07e92ab05c29f73b1ebad19f602ee71d9a67b2c596569
   languageName: node
   linkType: hard
 
@@ -34408,8 +34410,8 @@ __metadata:
     "@metamask/test-dapp-multichain": "npm:^0.17.1"
     "@metamask/test-dapp-solana": "npm:^0.3.0"
     "@metamask/token-search-discovery-controller": "npm:^4.0.0"
-    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A61.1.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch"
-    "@metamask/transaction-pay-controller": "npm:^5.0.0"
+    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A61.3.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch"
+    "@metamask/transaction-pay-controller": "npm:^6.0.0"
     "@metamask/tron-wallet-snap": "npm:^1.7.2"
     "@metamask/utils": "npm:^11.8.1"
     "@ngraveio/bc-ur": "npm:^1.1.6"